diff options
| -rw-r--r-- | repo/repo.go | 24 | ||||
| -rw-r--r-- | repo/testdata/repo_8k_zlib/00000/files | bin | 114 -> 169 bytes | |||
| -rw-r--r-- | repo/testdata/repo_8k_zlib/00000/hashes | bin | 570 -> 570 bytes | |||
| -rw-r--r-- | repo/testdata/repo_8k_zlib/00000/recipe | bin | 2084 -> 2095 bytes |
4 files changed, 7 insertions, 17 deletions
diff --git a/repo/repo.go b/repo/repo.go index 27df54e..b8c07f2 100644 --- a/repo/repo.go +++ b/repo/repo.go @@ -337,14 +337,7 @@ func storeDelta(prevRaw []byte, curr interface{}, dest string, differ delta.Diff var encoder *gob.Encoder var err error - if len(prevRaw) == 0 { - encoder = gob.NewEncoder(&prevBuff) - if err = encoder.EncodeValue(reflect.ValueOf(curr)); err != nil { - logger.Panic(err) - } - } else { - prevBuff = *bytes.NewBuffer(prevRaw) - } + prevBuff = *bytes.NewBuffer(prevRaw) encoder = gob.NewEncoder(&currBuff) if err = encoder.Encode(curr); err != nil { logger.Panic(err) @@ -366,16 +359,10 @@ func storeDelta(prevRaw []byte, curr interface{}, dest string, differ delta.Diff } } -func loadDeltas(target interface{}, versions []string, patcher delta.Patcher, wrapper utils.ReadWrapper, name string) []byte { +func loadDeltas(target interface{}, versions []string, patcher delta.Patcher, wrapper utils.ReadWrapper, name string) (ret []byte) { var prev bytes.Buffer - var encoder *gob.Encoder var err error - encoder = gob.NewEncoder(&prev) - if err = encoder.Encode(target); err != nil { - logger.Panic(err) - } - for _, v := range versions { var curr bytes.Buffer path := filepath.Join(v, name) @@ -398,12 +385,15 @@ func loadDeltas(target interface{}, versions []string, patcher delta.Patcher, wr logger.Panic(err) } } - ret := prev.Bytes() + ret = prev.Bytes() + if len(ret) == 0 { + return + } decoder := gob.NewDecoder(&prev) if err = decoder.Decode(target); err != nil { logger.Panic(err) } - return ret + return } // storeFileList stores the given list in the repo dir as a delta against the diff --git a/repo/testdata/repo_8k_zlib/00000/files b/repo/testdata/repo_8k_zlib/00000/files Binary files differindex e9bb403..98a7a44 100644 --- a/repo/testdata/repo_8k_zlib/00000/files +++ b/repo/testdata/repo_8k_zlib/00000/files diff --git a/repo/testdata/repo_8k_zlib/00000/hashes b/repo/testdata/repo_8k_zlib/00000/hashes Binary files differindex 8c6a857..ec622b2 100644 --- a/repo/testdata/repo_8k_zlib/00000/hashes +++ b/repo/testdata/repo_8k_zlib/00000/hashes diff --git a/repo/testdata/repo_8k_zlib/00000/recipe b/repo/testdata/repo_8k_zlib/00000/recipe Binary files differindex 7d33a6a..ef8e6d1 100644 --- a/repo/testdata/repo_8k_zlib/00000/recipe +++ b/repo/testdata/repo_8k_zlib/00000/recipe |