mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-18 06:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make CreateSignature byte oriented

Browse Source
This commit is contained in:
Kovid Goyal
2023-07-02 22:08:22 +05:30
parent 71a1050b9f
commit c28f6a7bf4
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/rsync/algorithm.go
View File

@@ -86,12 +86,12 @@ type BlockHash struct {
WeakHash uint32 WeakHash uint32
} }
func (self BlockHash) Serialize() string { func (self BlockHash) Serialize() []byte {
ans := make([]byte, 12+len(self.StrongHash)) ans := make([]byte, 12+len(self.StrongHash))
bin.PutUint64(ans, self.Index) bin.PutUint64(ans, self.Index)
bin.PutUint32(ans[8:], self.WeakHash) bin.PutUint32(ans[8:], self.WeakHash)
copy(ans[12:], self.StrongHash) copy(ans[12:], self.StrongHash)
return utils.UnsafeBytesToString(ans) return ans
} }
func (self BlockHash) Unserialize(data []byte, hash_size int) (err error) { func (self BlockHash) Unserialize(data []byte, hash_size int) (err error) {

40
tools/rsync/api.go
View File

@@ -17,6 +17,8 @@ import (
var _ = fmt.Print var _ = fmt.Print
const MaxBlockSize int = 256 * 1024 const MaxBlockSize int = 256 * 1024
const DefaultStrongHash string = "xxh3"
const DefaultWeakHash string = "beta"
type Api struct { type Api struct {
rsync RSync rsync RSync
@@ -57,14 +59,14 @@ func (self *Api) read_signature_header(data []byte) (consumed int, err error) {
} }
self.rsync.BlockSize = h.Block_size self.rsync.BlockSize = h.Block_size
self.rsync.MaxDataOp = 10 * h.Block_size self.rsync.MaxDataOp = 10 * h.Block_size
if h.Weak_hash_name != "" && h.Weak_hash_name != "beta" { if h.Weak_hash_name != "" && h.Weak_hash_name != DefaultWeakHash {
return consumed, fmt.Errorf("rsync signature header has unknown weak hash algorithm: %#v", h.Weak_hash_name) return consumed, fmt.Errorf("rsync signature header has unknown weak hash algorithm: %#v", h.Weak_hash_name)
} }
self.Weak_hash_name = h.Weak_hash_name self.Weak_hash_name = h.Weak_hash_name
switch h.Strong_hash_name { switch h.Strong_hash_name {
case "", "xxh3": case "", DefaultStrongHash:
self.rsync.UniqueHasher = xxh3.New() self.rsync.UniqueHasher = xxh3.New()
self.Strong_hash_name = "xxh3" self.Strong_hash_name = DefaultStrongHash
default: default:
return consumed, fmt.Errorf("rsync signature header has unknown strong hash algorithm: %#v", h.Strong_hash_name) return consumed, fmt.Errorf("rsync signature header has unknown strong hash algorithm: %#v", h.Strong_hash_name)
} }
@@ -156,17 +158,31 @@ func (self *Api) CreateDelta(src io.Reader, output_callback func(string) error)
} }
// Create a signature for the data source in src // Create a signature for the data source in src
func (self *Api) CreateSignature(src io.Reader) (signature []BlockHash, err error) { func (self *Api) CreateSignature(src io.Reader, callback func([]byte) error) (err error) {
if self.expected_input_size_for_signature_generation > 0 { sh := SignatureHeader{Strong_hash_name: self.Strong_hash_name, Weak_hash_name: self.Weak_hash_name, Block_size: self.rsync.BlockSize}
signature = make([]BlockHash, 0, self.rsync.BlockHashCount(self.expected_input_size_for_signature_generation)) if sh.Strong_hash_name == DefaultStrongHash {
} else { sh.Strong_hash_name = ""
signature = make([]BlockHash, 0, 1024)
} }
err = self.rsync.CreateSignature(src, func(bl BlockHash) error { if sh.Weak_hash_name == DefaultWeakHash {
signature = append(signature, bl) sh.Weak_hash_name = ""
}
if b, err := json.Marshal(&sh); err != nil {
return err
} else if err = callback(b); err != nil {
return err
}
if self.expected_input_size_for_signature_generation > 0 {
self.signature = make([]BlockHash, 0, self.rsync.BlockHashCount(self.expected_input_size_for_signature_generation))
} else {
self.signature = make([]BlockHash, 0, 1024)
}
return self.rsync.CreateSignature(src, func(bl BlockHash) error {
if err = callback(bl.Serialize()); err != nil {
return err
}
self.signature = append(self.signature, bl)
return nil return nil
}) })
return
} }
// Add more external signature data // Add more external signature data
@@ -218,7 +234,7 @@ func NewToCreateSignature(expected_input_size int64) (ans *Api, err error) {
if sz > 0 { if sz > 0 {
bs = int(math.Round(math.Sqrt(float64(sz)))) bs = int(math.Round(math.Sqrt(float64(sz))))
} }
ans = &Api{Weak_hash_name: "beta", Strong_hash_name: "xxh3"} ans = &Api{Weak_hash_name: DefaultWeakHash, Strong_hash_name: DefaultStrongHash}
ans.rsync.BlockSize = utils.Min(bs, MaxBlockSize) ans.rsync.BlockSize = utils.Min(bs, MaxBlockSize)
ans.rsync.UniqueHasher = xxh3.New() ans.rsync.UniqueHasher = xxh3.New()