chore: bump dependencies, fix tests, and resolve golangci-lint errors

- Updated all dependencies to their latest versions. - Fixed failing test cases. - Resolved golangci-lint errors. Signed-off-by: Gao Hongtao <[email protected]>
SkyAPM · Nov 7, 2024 · 73d06af · 73d06af
1 parent 90488e1
commit 73d06af
Show file tree

Hide file tree

Showing 17 changed files with 180 additions and 223 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,6 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3.2.0
+        uses: golangci/golangci-lint-action@v6.1.1
         with:
-          version: v1.45.2
+          version: v1.61.0
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,16 +8,16 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.17.x, 1.18.x]
+        go-version: [1.23.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Test
       run: |
         go version

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,107 +1,90 @@
 linters-settings:
-  depguard:
-    list-type: blacklist
-    packages:
-      # logging is allowed only by logutils.Log, logrus
-      # is allowed to use only in logutils package
-      - github.com/sirupsen/logrus
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
   dupl:
     threshold: 100
   funlen:
     lines: 100
-    statements: 50
+    statements: 60
   goconst:
     min-len: 2
     min-occurrences: 2
   gocritic:
     enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
+    - diagnostic
+    - experimental
+    - opinionated
+    - performance
+    - style
     disabled-checks:
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - ifElseChain
-      - octalLiteral
-      - whyNoLint
-      - wrapperFunc
+    - dupImport # https://github.com/go-critic/go-critic/issues/845
+    - ifElseChain
+    - octalLiteral
+    - whyNoLint
+    - wrapperFunc
   gocyclo:
     min-complexity: 20 # increased from 15 to get us going, but not make things worse
   goimports:
     local-prefixes: github.com/golangci/golangci-lint
-  golint:
-    min-confidence: 0
-  gomnd:
-    settings:
-      mnd:
-        # don't include the "operation" and "assign"
-        checks: argument,case,condition,return
+  mnd:
+    # don't include the "operation" and "assign"
+    checks:
+    - argument
+    - case
+    - condition
+    - return
   govet:
-    check-shadowing: true
     settings:
       printf:
         funcs:
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+        - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+        - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+        - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+        - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
   lll:
     line-length: 140
-  maligned:
-    suggest-new: true
   misspell:
     locale: US
   nolintlint:
-    allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
     allow-unused: false # report any unused nolint directives
     require-explanation: false # don't require an explanation for nolint directives
     require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+  gosec:
+    excludes:
+    - G115 # integer overflow conversion (TODO: verify these)
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
-    - bodyclose
-    - deadcode
-    - depguard
-    - dogsled
-    - dupl
-    - errcheck
-    - funlen
-    - gochecknoinits
-    - goconst
-    - gocritic
-    - gocyclo
-    - gofmt
-    - goimports
-    - golint
-    - gomnd
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - interfacer
-    - lll
-    - misspell
-    - nakedret
-    - nolintlint
-    - rowserrcheck
-    - scopelint
-    - staticcheck
-    - structcheck
-    - stylecheck
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
-    - varcheck
-    - whitespace
-
+  - bodyclose
+  - dogsled
+  - dupl
+  - errcheck
+  - funlen
+  - gochecknoinits
+  - goconst
+  - gocritic
+  - gocyclo
+  - gofmt
+  - goimports
+  - mnd
+  - goprintffuncname
+  - gosec
+  - gosimple
+  - govet
+  - ineffassign
+  - lll
+  - misspell
+  - nakedret
+  - nolintlint
+  - rowserrcheck
+  - staticcheck
+  - stylecheck
+  - typecheck
+  - unconvert
+  - unparam
+  - unused
+  - whitespace
   # don't enable:
   # - asciicheck
   # - gochecknoglobals
@@ -118,31 +101,17 @@ linters:
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source
   exclude-rules:
-    - path: _test\.go
-      linters:
-        - gomnd
-    - path: cmd/ice/cmd
-      linters:
-        - gochecknoinits
-    - path: sizes.go
-      linters:
-        - gochecknoinits
-
-    # https://github.com/go-critic/go-critic/issues/926
-    - linters:
-        - gocritic
-      text: "unnecessaryDefer:"
-
-run:
-  skip-dirs:
-    - test/testdata_etc
-    - internal/cache
-    - internal/renameio
-    - internal/robustio
+  - path: _test\.go
+    linters:
+    - mnd
+  - path: cmd/ice/cmd
+    linters:
+    - gochecknoinits
+  - path: sizes.go
+    linters:
+    - gochecknoinits
 
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
-service:
-  golangci-lint-version: 1.23.x # use the fixed version to not introduce new linters unexpectedly
-  prepare:
-    - echo "here I can run custom commands, but no preparation needed for this repo"
+  # https://github.com/go-critic/go-critic/issues/926
+  - linters:
+    - gocritic
+    text: "unnecessaryDefer:"
diff --git a/contentcoder.go b/contentcoder.go
@@ -176,7 +176,6 @@ func (c *chunkedContentCoder) Add(docNum uint64, vals []byte) error {
 //
 // | ..... data ..... | chunk offsets (varints)
 // | position of chunk offsets (uint64) | number of offsets (uint64) |
-//
 func (c *chunkedContentCoder) Write() (int, error) {
 	var tw int
 

diff --git a/contentcoder_test.go b/contentcoder_test.go
@@ -34,10 +34,10 @@ func TestChunkedContentCoder(t *testing.T) {
 			vals:      [][]byte{[]byte("bluge")},
 			// 1 chunk, chunk-0 length 11(b), value
 			expected: []byte{
-				0x1, 0x0, 0x5, 0x28, 0xb5, 0x2f, 0xfd, 0x4, 0x0, 0x29, 0x0, 0x0,
-				'b', 'l', 'u', 'g', 'e',
-				0x7e, 0xde, 0xed, 0x4a, 0x15, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-				0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+				0x1, 0x0, 0x5, 0x5, 0x10,
+				'b', 'l', 'u', 'g', 'e', 0xa,
+				0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+				0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
 			},
 		},
 		{
@@ -49,13 +49,9 @@ func TestChunkedContentCoder(t *testing.T) {
 				[]byte("scorch"),
 			},
 
-			expected: []byte{
-				0x1, 0x0, 0x6, 0x28, 0xb5, 0x2f, 0xfd, 0x4, 0x0, 0x31, 0x0, 0x0,
-				0x75, 0x70, 0x73, 0x69, 0x64, 0x65, 0x35, 0x89, 0x5a, 0xd,
-				0x1, 0x1, 0x6, 0x28, 0xb5, 0x2f, 0xfd, 0x4, 0x0, 0x31, 0x0, 0x0,
-				0x73, 0x63, 0x6f, 0x72, 0x63, 0x68, 0xc4, 0x46, 0x89, 0x39, 0x16, 0x2c,
-				0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2,
-			},
+			expected: []byte{0x1, 0x0, 0x6, 0x6, 0x14, 0x75, 0x70, 0x73, 0x69, 0x64, 0x65, 0x1,
+				0x1, 0x6, 0x6, 0x14, 0x73, 0x63, 0x6f, 0x72, 0x63, 0x68, 0xb, 0x16, 0x0, 0x0,
+				0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2},
 		},
 	}
 

diff --git a/documentcoder_test.go b/documentcoder_test.go
@@ -19,26 +19,18 @@ func TestChunkedDocumentCoder(t *testing.T) {
 			docNums:   []uint64{0},
 			metas:     [][]byte{{0}},
 			datas:     [][]byte{[]byte("bluge")},
-			expected: []byte{
-				0x28, 0xb5, 0x2f, 0xfd, 0x4, 0x0, 0x41,
-				0x0, 0x0, 0x1, 0x5, 0x0, 0x62, 0x6c, 0x75, 0x67, 0x65, 0x2b, 0x30, 0x97, 0x33, 0x0, 0x15, 0x15,
-				0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x3,
-			},
+			expected: []byte{0x8, 0x1c, 0x1, 0x5, 0x0, 0x62, 0x6c, 0x75, 0x67, 0x65,
+				0x0, 0xa, 0xa, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x3},
 			expectedChunkNum: 3, // left, chunk, right
 		},
 		{
 			chunkSize: 1,
 			docNums:   []uint64{0, 1},
 			metas:     [][]byte{{0}, {1}},
 			datas:     [][]byte{[]byte("upside"), []byte("scorch")},
-			expected: []byte{
-				0x28, 0xb5, 0x2f, 0xfd, 0x4, 0x0, 0x49,
-				0x0, 0x0, 0x1, 0x6, 0x0, 0x75, 0x70, 0x73, 0x69, 0x64, 0x65,
-				0x36, 0x6e, 0x7e, 0x39, 0x28, 0xb5, 0x2f, 0xfd, 0x4, 0x0, 0x49,
-				0x0, 0x0, 0x1, 0x6, 0x1, 0x73, 0x63, 0x6f, 0x72, 0x63, 0x68,
-				0x8f, 0x83, 0xa3, 0x37, 0x0, 0x16, 0x2c, 0x2c,
-				0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x4,
-			},
+			expected: []byte{0x9, 0x20, 0x1, 0x6, 0x0, 0x75, 0x70, 0x73, 0x69, 0x64,
+				0x65, 0x9, 0x20, 0x1, 0x6, 0x1, 0x73, 0x63, 0x6f, 0x72, 0x63, 0x68,
+				0x0, 0xb, 0x16, 0x16, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x4},
 			expectedChunkNum: 4, // left, chunk, chunk, right
 		},
 	}

diff --git a/go.mod b/go.mod
@@ -1,14 +1,24 @@
 module github.com/blugelabs/ice
 
-go 1.16
+go 1.23
+
+toolchain go1.23.1
 
 require (
-	github.com/RoaringBitmap/roaring v0.9.4
+	github.com/RoaringBitmap/roaring v1.9.4
 	github.com/blevesearch/mmap-go v1.0.4
-	github.com/blevesearch/vellum v1.0.7
+	github.com/blevesearch/vellum v1.0.10
 	github.com/blugelabs/bluge_segment_api v0.2.0
-	github.com/klauspost/compress v1.15.2
-	github.com/spf13/cobra v0.0.5
+	github.com/klauspost/compress v1.17.11
+	github.com/spf13/cobra v1.8.1
+)
+
+require (
+	github.com/bits-and-blooms/bitset v1.14.3 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/mschoch/smat v0.2.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/sys v0.26.0 // indirect
 )
 
 replace github.com/blugelabs/bluge_segment_api => github.com/zinclabs/bluge_segment_api v1.0.0