From e640e4fce0c1a7fb2b1bd0c72dd13b5e9bb2e843 Mon Sep 17 00:00:00 2001 From: VRDighe Date: Fri, 16 Sep 2022 10:19:44 +0530 Subject: [PATCH] Replaced zstd package --- go.mod | 1 + go.sum | 2 ++ src/compress/compress.go | 14 ++++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index f68a0df..e0ee10b 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/denisbrodbeck/machineid v1.0.1 github.com/kalafut/imohash v1.0.2 + github.com/klauspost/compress v1.15.9 github.com/schollz/cli/v2 v2.2.1 github.com/schollz/logger v1.2.0 github.com/schollz/mnemonicode v1.0.1 diff --git a/go.sum b/go.sum index c04c635..1e6bfbe 100644 --- a/go.sum +++ b/go.sum @@ -17,6 +17,8 @@ github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbj github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= github.com/kalafut/imohash v1.0.2 h1:j/cUPa15YvXv7abJlM+kdJIycbBMpmO7WqhPl4YB76I= github.com/kalafut/imohash v1.0.2/go.mod h1:PjHBF0vpo1q7zMqiTn0qwSTQU2wDn5QIe8S8sFQuZS8= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= diff --git a/src/compress/compress.go b/src/compress/compress.go index 6964c78..e78757e 100644 --- a/src/compress/compress.go +++ b/src/compress/compress.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/DataDog/zstd" + "github.com/klauspost/compress/zstd" log "github.com/schollz/logger" ) @@ -33,8 +33,11 @@ func Decompress(src []byte) []byte { // compress uses zstd to compress a byte slice to a corresponding level func compress(src []byte, dest io.Writer, level int) { - compressor := zstd.NewWriterLevel(dest, level) - if _, err := compressor.Write(src); err != nil { + compressor, err := zstd.NewWriter(dest, zstd.WithEncoderLevel(zstd.EncoderLevelFromZstd(level))) + if err != nil { + panic(err) + } + if _, err = compressor.Write(src); err != nil { log.Debugf("error writing data: %v", err) } compressor.Close() @@ -42,7 +45,10 @@ func compress(src []byte, dest io.Writer, level int) { // decompress uses zstd to decompress an io.Reader func decompress(src io.Reader, dest io.Writer) { - decompressor := zstd.NewReader(src) + decompressor, err := zstd.NewReader(src) + if err != nil { + panic(err) + } if _, err := io.Copy(dest, decompressor); err != nil { log.Debugf("error copying data: %v", err) }