Skip to content

Commit 53934b6

Browse files
authored
Merge branch 'master' into fix/rm_undolog
2 parents 559945f + 774046b commit 53934b6

File tree

10 files changed

+1379
-15
lines changed

10 files changed

+1379
-15
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,5 @@ jobs:
5757
with:
5858
version: v1.51.0
5959
args: --timeout=10m
60-
skip-go-installation: true
6160
skip-cache: true
6261
skip-pkg-cache: true

pkg/compressor/zip_compress.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ func (z Zip) Decompress(data []byte) ([]byte, error) {
5555
}
5656

5757
func (z Zip) GetCompressorType() CompressorType {
58-
return CompressorZstd
58+
return CompressorZip
5959
}

pkg/compressor/zip_compress_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ func TestZipCompress(t *testing.T) {
3232
assert.NoError(t, err)
3333
t.Logf("compress res: %v", string(compressRes))
3434

35+
assert.EqualValues(t, CompressorZip, g.GetCompressorType())
36+
3537
decompressRes, err := g.Decompress(compressRes)
3638
assert.NoError(t, err)
3739
t.Logf("decompress res: %v", string(decompressRes))

0 commit comments

Comments
 (0)