aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chunk.go4
-rw-r--r--repo.go21
-rw-r--r--repo_test.go60
-rw-r--r--sketch/sketch_test.go6
4 files changed, 45 insertions, 46 deletions
diff --git a/chunk.go b/chunk.go
index 14b8cfd..0d84040 100644
--- a/chunk.go
+++ b/chunk.go
@@ -4,7 +4,7 @@ import (
"bytes"
"fmt"
"io"
- "path"
+ "path/filepath"
)
type Chunk interface {
@@ -33,7 +33,7 @@ type ChunkId struct {
}
func (i *ChunkId) Path(repo string) string {
- return path.Join(repo, fmt.Sprintf(versionFmt, i.Ver), chunksName, fmt.Sprintf(chunkIdFmt, i.Idx))
+ return filepath.Join(repo, fmt.Sprintf(versionFmt, i.Ver), chunksName, fmt.Sprintf(chunkIdFmt, i.Idx))
}
func NewLoadedChunk(id *ChunkId, value []byte) *LoadedChunk {
diff --git a/repo.go b/repo.go
index 2940313..07eb5ea 100644
--- a/repo.go
+++ b/repo.go
@@ -34,7 +34,6 @@ import (
"io/fs"
"log"
"os"
- "path"
"path/filepath"
"reflect"
"strings"
@@ -108,10 +107,10 @@ func (r *Repo) Commit(source string) {
source = utils.TrimTrailingSeparator(source)
versions := r.loadVersions()
newVersion := len(versions) // TODO: add newVersion functino
- newPath := path.Join(r.path, fmt.Sprintf(versionFmt, newVersion))
- newChunkPath := path.Join(newPath, chunksName)
- newFilesPath := path.Join(newPath, filesName)
- newRecipePath := path.Join(newPath, recipeName)
+ newPath := filepath.Join(r.path, fmt.Sprintf(versionFmt, newVersion))
+ newChunkPath := filepath.Join(newPath, chunksName)
+ newFilesPath := filepath.Join(newPath, filesName)
+ newRecipePath := filepath.Join(newPath, recipeName)
os.Mkdir(newPath, 0775) // TODO: handle errors
os.Mkdir(newChunkPath, 0775) // TODO: handle errors
reader, writer := io.Pipe()
@@ -129,15 +128,15 @@ func (r *Repo) Commit(source string) {
func (r *Repo) Restore(destination string) {
versions := r.loadVersions()
latest := versions[len(versions)-1]
- latestFilesPath := path.Join(latest, filesName)
- latestRecipePath := path.Join(latest, recipeName)
+ latestFilesPath := filepath.Join(latest, filesName)
+ latestRecipePath := filepath.Join(latest, recipeName)
files := loadFileList(latestFilesPath)
recipe := loadRecipe(latestRecipePath)
reader, writer := io.Pipe()
go r.restoreStream(writer, recipe)
bufReader := bufio.NewReaderSize(reader, r.chunkSize*2)
for _, file := range files {
- filePath := path.Join(destination, file.Path)
+ filePath := filepath.Join(destination, file.Path)
dir := filepath.Dir(filePath)
os.MkdirAll(dir, 0775) // TODO: handle errors
f, _ := os.Create(filePath) // TODO: handle errors
@@ -158,7 +157,7 @@ func (r *Repo) loadVersions() []string {
if !f.IsDir() {
continue
}
- versions = append(versions, path.Join(r.path, f.Name()))
+ versions = append(versions, filepath.Join(r.path, f.Name()))
}
return versions
}
@@ -285,7 +284,7 @@ func (r *Repo) LoadChunkContent(id *ChunkId) *bytes.Reader {
// TODO: use atoi for chunkid
func (r *Repo) loadChunks(versions []string, chunks chan<- IdentifiedChunk) {
for i, v := range versions {
- p := path.Join(v, chunksName)
+ p := filepath.Join(v, chunksName)
entries, err := os.ReadDir(p)
if err != nil {
log.Printf("Error reading version '%05d' in '%s' chunks: %s", i, v, err)
@@ -294,7 +293,7 @@ func (r *Repo) loadChunks(versions []string, chunks chan<- IdentifiedChunk) {
if e.IsDir() {
continue
}
- f := path.Join(p, e.Name())
+ f := filepath.Join(p, e.Name())
buff, err := os.ReadFile(f)
if err != nil {
log.Printf("Error reading chunk '%s': %s", f, err.Error())
diff --git a/repo_test.go b/repo_test.go
index 1a19157..174c398 100644
--- a/repo_test.go
+++ b/repo_test.go
@@ -7,7 +7,7 @@ import (
"io/ioutil"
"log"
"os"
- "path"
+ "path/filepath"
"reflect"
"testing"
@@ -24,7 +24,7 @@ func chunkCompare(t *testing.T, dataDir string, repo *Repo, testFiles []string,
offset := 0
buff := make([]byte, repo.chunkSize*chunkCount)
for _, f := range testFiles {
- content, err := os.ReadFile(path.Join(dataDir, f))
+ content, err := os.ReadFile(filepath.Join(dataDir, f))
if err != nil {
t.Error("Error reading test data file")
}
@@ -86,7 +86,7 @@ func (r *Repo) chunkStream(stream io.Reader, chunks chan<- []byte) {
func storeChunks(dest string, chunks <-chan []byte) {
i := 0
for c := range chunks {
- path := path.Join(dest, fmt.Sprintf(chunkIdFmt, i))
+ path := filepath.Join(dest, fmt.Sprintf(chunkIdFmt, i))
err := os.WriteFile(path, c, 0664)
if err != nil {
log.Println(err)
@@ -99,7 +99,7 @@ func TestReadFiles1(t *testing.T) {
tmpDir := t.TempDir()
repo := NewRepo(tmpDir)
chunkCount := 590/repo.chunkSize + 1
- dataDir := path.Join("testdata", "logs", "1")
+ dataDir := filepath.Join("testdata", "logs", "1")
files := []string{"logTest.log"}
chunkCompare(t, dataDir, repo, files, chunkCount)
}
@@ -108,7 +108,7 @@ func TestReadFiles2(t *testing.T) {
tmpDir := t.TempDir()
repo := NewRepo(tmpDir)
chunkCount := 22899/repo.chunkSize + 1
- dataDir := path.Join("testdata", "logs", "2")
+ dataDir := filepath.Join("testdata", "logs", "2")
files := []string{"csvParserTest.log", "slipdb.log"}
chunkCompare(t, dataDir, repo, files, chunkCount)
}
@@ -117,22 +117,22 @@ func TestReadFiles3(t *testing.T) {
tmpDir := t.TempDir()
repo := NewRepo(tmpDir)
chunkCount := 119398/repo.chunkSize + 1
- dataDir := path.Join("testdata", "logs")
+ dataDir := filepath.Join("testdata", "logs")
files := []string{
- path.Join("1", "logTest.log"),
- path.Join("2", "csvParserTest.log"),
- path.Join("2", "slipdb.log"),
- path.Join("3", "indexingTreeTest.log"),
+ filepath.Join("1", "logTest.log"),
+ filepath.Join("2", "csvParserTest.log"),
+ filepath.Join("2", "slipdb.log"),
+ filepath.Join("3", "indexingTreeTest.log"),
}
chunkCompare(t, dataDir, repo, files, chunkCount)
}
func TestLoadChunks(t *testing.T) {
resultDir := t.TempDir()
- dataDir := path.Join("testdata", "logs")
+ dataDir := filepath.Join("testdata", "logs")
repo := NewRepo(resultDir)
- resultVersion := path.Join(resultDir, "00000")
- resultChunks := path.Join(resultVersion, chunksName)
+ resultVersion := filepath.Join(resultDir, "00000")
+ resultChunks := filepath.Join(resultVersion, chunksName)
os.MkdirAll(resultChunks, 0775)
reader1, writer1 := io.Pipe()
reader2, writer2 := io.Pipe()
@@ -166,8 +166,8 @@ func TestLoadChunks(t *testing.T) {
func TestStoreLoadFiles(t *testing.T) {
resultDir := t.TempDir()
- dataDir := path.Join("testdata", "logs")
- resultFiles := path.Join(resultDir, filesName)
+ dataDir := filepath.Join("testdata", "logs")
+ resultFiles := filepath.Join(resultDir, filesName)
files1 := listFiles(dataDir)
storeFileList(resultFiles, files1)
files2 := loadFileList(resultFiles)
@@ -182,8 +182,8 @@ func TestStoreLoadFiles(t *testing.T) {
}
func prepareChunks(dataDir string, repo *Repo, streamFunc func([]File, io.WriteCloser)) {
- resultVersion := path.Join(repo.path, "00000")
- resultChunks := path.Join(resultVersion, chunksName)
+ resultVersion := filepath.Join(repo.path, "00000")
+ resultChunks := filepath.Join(resultVersion, chunksName)
os.MkdirAll(resultChunks, 0775)
reader := getDataStream(dataDir, streamFunc)
chunks := make(chan []byte, 16)
@@ -209,9 +209,9 @@ func dummyWriter(w io.Writer) io.WriteCloser {
func TestBsdiff(t *testing.T) {
resultDir := t.TempDir()
repo := NewRepo(resultDir)
- dataDir := path.Join("testdata", "logs")
- addedFile1 := path.Join(dataDir, "2", "slogTest.log")
- addedFile2 := path.Join(dataDir, "3", "slogTest.log")
+ dataDir := filepath.Join("testdata", "logs")
+ addedFile1 := filepath.Join(dataDir, "2", "slogTest.log")
+ addedFile2 := filepath.Join(dataDir, "3", "slogTest.log")
// Store initial chunks
prepareChunks(dataDir, repo, concatFiles)
@@ -247,8 +247,8 @@ func TestBsdiff(t *testing.T) {
func TestCommit(t *testing.T) {
dest := t.TempDir()
- source := path.Join("testdata", "logs")
- expected := path.Join("testdata", "repo_8k")
+ source := filepath.Join("testdata", "logs")
+ expected := filepath.Join("testdata", "repo_8k")
repo := NewRepo(dest)
repo.chunkReadWrapper = dummyReader
repo.chunkWriteWrapper = dummyWriter
@@ -259,8 +259,8 @@ func TestCommit(t *testing.T) {
func TestCommitZlib(t *testing.T) {
dest := t.TempDir()
- source := path.Join("testdata", "logs")
- expected := path.Join("testdata", "repo_8k_zlib")
+ source := filepath.Join("testdata", "logs")
+ expected := filepath.Join("testdata", "repo_8k_zlib")
repo := NewRepo(dest)
repo.chunkReadWrapper = utils.ZlibReader
repo.chunkWriteWrapper = utils.ZlibWriter
@@ -271,8 +271,8 @@ func TestCommitZlib(t *testing.T) {
func TestRestore(t *testing.T) {
dest := t.TempDir()
- source := path.Join("testdata", "repo_8k")
- expected := path.Join("testdata", "logs")
+ source := filepath.Join("testdata", "repo_8k")
+ expected := filepath.Join("testdata", "logs")
repo := NewRepo(source)
repo.chunkReadWrapper = dummyReader
repo.chunkWriteWrapper = dummyWriter
@@ -283,8 +283,8 @@ func TestRestore(t *testing.T) {
func TestRestoreZlib(t *testing.T) {
dest := t.TempDir()
- source := path.Join("testdata", "repo_8k_zlib")
- expected := path.Join("testdata", "logs")
+ source := filepath.Join("testdata", "repo_8k_zlib")
+ expected := filepath.Join("testdata", "logs")
repo := NewRepo(source)
repo.chunkReadWrapper = utils.ZlibReader
repo.chunkWriteWrapper = utils.ZlibWriter
@@ -316,7 +316,7 @@ func assertSameTree(t *testing.T, apply func(t *testing.T, expected string, actu
}
func assertCompatibleRepoFile(t *testing.T, expected string, actual string, prefix string) {
- if path.Base(expected) == filesName {
+ if filepath.Base(expected) == filesName {
eFiles := loadFileList(expected)
aFiles := loadFileList(actual)
assertLen(t, len(eFiles), aFiles, prefix)
@@ -325,7 +325,7 @@ func assertCompatibleRepoFile(t *testing.T, expected string, actual string, pref
t.Fatal(prefix, "file entry do not match:", aFiles[i], ", expected:", eFiles[i])
}
}
- } else if path.Base(expected) == recipeName {
+ } else if filepath.Base(expected) == recipeName {
// TODO: check recipies equality
} else {
assertSameFile(t, expected, actual, prefix)
diff --git a/sketch/sketch_test.go b/sketch/sketch_test.go
index df35514..851320c 100644
--- a/sketch/sketch_test.go
+++ b/sketch/sketch_test.go
@@ -2,7 +2,7 @@ package sketch
import (
"os"
- "path"
+ "path/filepath"
"reflect"
"testing"
@@ -18,7 +18,7 @@ func TestSketchChunk(t *testing.T) {
t.Fatal(err)
}
- c0, err := os.Open(path.Join(dataDir, "000000000000000"))
+ c0, err := os.Open(filepath.Join(dataDir, "000000000000000"))
if err != nil {
t.Fatal(err)
}
@@ -31,7 +31,7 @@ func TestSketchChunk(t *testing.T) {
t.Errorf("Sketch does not match, expected: %d, actual: %d", expected, sketch)
}
- c14, err := os.Open(path.Join(dataDir, "000000000000014"))
+ c14, err := os.Open(filepath.Join(dataDir, "000000000000014"))
sketch, err = SketchChunk(c14, pol, 8<<10, 32, 3, 4)
if err != nil {
t.Error(err)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 22:33:22 +0000