Merge branch 'main' into java/integ_acarbo_jedi_threadpool

.editorconfig

@@ -5,6 +5,8 @@ root = true
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
+indent_size = 4
+tab_width = 4
 
 # Xml files
 [*.xml]
@@ -16,8 +18,6 @@ indent_size = 2
 #### Core EditorConfig Options ####
 
 # Indentation and spacing
-indent_size = 4
-tab_width = 4
 
 # New line preferences
 end_of_line = lf

.github/workflows/csharp.yml

@@ -28,6 +28,9 @@ jobs:
                 redis:
                     - 6.2.14
                     - 7.2.3
+                dotnet:
+                    - 6.0
+                    - 8.0
 
         steps:
             - uses: actions/checkout@v4
@@ -44,10 +47,10 @@ jobs:
               with:
                   version: "25.1"
 
-            - name: Set up dotnet
+            - name: Set up dotnet ${{ matrix.dotnet }}
               uses: actions/setup-dotnet@v3
               with:
-                  dotnet-version: 6.0.x
+                  dotnet-version: ${{ matrix.dotnet }}
 
             - name: Start redis server
               run: redis-server &
@@ -56,9 +59,9 @@ jobs:
               working-directory: ./csharp
               run: dotnet format --verify-no-changes --verbosity diagnostic
 
-            - name: Test
+            - name: Test dotnet ${{ matrix.dotnet }}
               working-directory: ./csharp
-              run: dotnet test --framework net6.0 /warnaserror
+              run: dotnet test --framework net${{ matrix.dotnet }} /warnaserror
 
             - uses: ./.github/workflows/test-benchmark
               with:

.github/workflows/go.yml

@@ -0,0 +1,178 @@
+name: Go CI
+
+on:
+    workflow_dispatch:
+    push:
+        branches: [ "main" ]
+        paths:
+            - glide-core/**
+            - submodules/**
+            - go/**
+            - .github/workflows/go.yml
+    pull_request:
+        paths:
+            - glide-core/**
+            - submodules/**
+            - go/**
+            - .github/workflows/go.yml
+
+# Run only the latest job on a branch and cancel previous ones
+concurrency:
+    group: ${{ github.head_ref || github.ref }}
+    cancel-in-progress: true
+
+jobs:
+    build-and-test-go-client:
+        timeout-minutes: 20
+        strategy:
+            # Run all jobs
+            fail-fast: false
+            matrix:
+                go:
+                    - '1.18'
+                    - '1.21'
+                redis:
+                    - 6.2.14
+                    - 7.2.3
+                os:
+                    - ubuntu-latest
+                    - macos-latest
+
+        runs-on: ${{ matrix.os }}
+
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Set up Go ${{ matrix.go }}
+              uses: actions/setup-go@v5
+              with:
+                  go-version: ${{ matrix.go }}
+                  cache-dependency-path: go/go.sum
+
+            - name: Install shared software dependencies
+              uses: ./.github/workflows/install-shared-dependencies
+              with:
+                  os: ${{ matrix.os }}
+                  target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Install redis
+              # TODO: make this step macos compatible: https://github.com/aws/glide-for-redis/issues/781
+              if: ${{ matrix.os == 'ubuntu-latest' }}
+              uses: ./.github/workflows/install-redis
+              with:
+                  redis-version: ${{ matrix.redis }}
+
+            - name: Install client dependencies
+              working-directory: ./go
+              run: make install-tools
+
+            - name: Build client
+              working-directory: ./go
+              run: make build
+
+            - name: Run linters
+              working-directory: ./go
+              run: make lint
+
+            - name: Run unit tests
+              working-directory: ./go
+              run: make unit-test-report
+
+            - name: Upload test reports
+              if: always()
+              continue-on-error: true
+              uses: actions/upload-artifact@v4
+              with:
+                  name: test-reports-go-${{ matrix.go }}-redis-${{ matrix.redis }}-${{ matrix.os }}
+                  path: |
+                      go/reports/unit-test-report.html
+
+    build-amazonlinux-latest:
+        if: github.repository_owner == 'aws'
+        strategy:
+            # Run all jobs
+            fail-fast: false
+            matrix:
+                go:
+                    - 1.18.10
+                    - 1.21.6
+        runs-on: ubuntu-latest
+        container: amazonlinux:latest
+        timeout-minutes: 15
+        steps:
+            - name: Install git
+              run: |
+                  yum -y remove git
+                  yum -y remove git-*
+                  yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
+                  yum update
+                  yum install -y git
+                  git --version
+
+            - uses: actions/checkout@v4
+
+            - name: Checkout submodules
+              run: |
+                  git config --global --add safe.directory "$GITHUB_WORKSPACE"
+                  git submodule update --init --recursive
+
+            - name: Install shared software dependencies
+              uses: ./.github/workflows/install-shared-dependencies
+              with:
+                  os: "amazon-linux"
+                  target: "x86_64-unknown-linux-gnu"
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Create a symbolic Link for redis6 binaries
+              run: |
+                  ln -s /usr/bin/redis6-server /usr/bin/redis-server
+                  ln -s /usr/bin/redis6-cli /usr/bin/redis-cli
+
+            - name: Install Go
+              run: |
+                  yum -y install wget
+                  yum -y install tar
+                  wget https://go.dev/dl/go${{ matrix.go }}.linux-amd64.tar.gz
+                  tar -C /usr/local -xzf go${{ matrix.go }}.linux-amd64.tar.gz
+                  echo "/usr/local/go/bin" >> $GITHUB_PATH
+                  echo "$HOME/go/bin" >> $GITHUB_PATH
+
+            - name: Install client dependencies
+              working-directory: ./go
+              run: make install-tools
+
+            - name: Build client
+              working-directory: ./go
+              run: make build
+
+            - name: Run linters
+              working-directory: ./go
+              run: make lint
+
+            - name: Run unit tests
+              working-directory: ./go
+              run: make unit-test-report
+
+            - name: Upload test reports
+              if: always()
+              continue-on-error: true
+              uses: actions/upload-artifact@v4
+              with:
+                  name: test-reports-go-${{ matrix.go }}-amazon-linux-latest
+                  path: go/reports/unit-test-report.html
+
+    lint-rust:
+        timeout-minutes: 15
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - uses: ./.github/workflows/lint-rust
+              with:
+                  cargo-toml-folder: ./go
+              name: lint go rust

.github/workflows/java.yml

@@ -68,6 +68,10 @@ jobs:
               working-directory: java
               run: ./gradlew --continue build
 
+            - name: Ensure no skipped files by linter
+              working-directory: java
+              run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files'
+
             - name: Upload test reports
               if: always()
               continue-on-error: true

.github/workflows/ort.yml

@@ -19,6 +19,7 @@ on:
           required: true
 jobs:
     run-ort:
+        if: github.repository_owner == 'aws'
         name: Create attribution files
         runs-on: ubuntu-latest
         strategy:
@@ -47,7 +48,7 @@ jobs:
                   ref: ${{ env.BASE_BRANCH }}
 
             - name: Set up JDK 11 for the ORT package
-              uses: actions/setup-java@v3
+              uses: actions/setup-java@v4
               with:
                   distribution: "temurin"
                   java-version: 11
@@ -103,7 +104,7 @@ jobs:
           ### NodeJS ###
 
             - name: Set up Node.js 16.x
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: 16.x
 
@@ -133,7 +134,7 @@ jobs:
           ### Python ###
 
             - name: Set up Python 3.10
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: "3.10"
 

CHANGELOG.md

@@ -1,14 +1,17 @@
 ## 0.2.0 (2024-02-11)
 
 #### Changes
-* Python, Node: Added ZCARD command ([#877](https://github.com/aws/glide-for-redis/pull/885), [#885](https://github.com/aws/glide-for-redis/pull/885))
+* Python, Node: Added ZCARD command ([#871](https://github.com/aws/glide-for-redis/pull/871), [#885](https://github.com/aws/glide-for-redis/pull/885))
 * Python, Node: Added ZADD and ZADDINCR commands ([#814](https://github.com/aws/glide-for-redis/pull/814), [#830](https://github.com/aws/glide-for-redis/pull/830))
 * Python, Node: Added ZREM command ([#834](https://github.com/aws/glide-for-redis/pull/834), [#831](https://github.com/aws/glide-for-redis/pull/831))
-* Python, Node: Added ZSCORE command ([#885](https://github.com/aws/glide-for-redis/pull/885), [#871](https://github.com/aws/glide-for-redis/pull/871))
+* Python, Node: Added ZSCORE command ([#877](https://github.com/aws/glide-for-redis/pull/877), [#889](https://github.com/aws/glide-for-redis/pull/889))
 * Use jemalloc as default allocator. ([#847](https://github.com/aws/glide-for-redis/pull/847))
 * Python, Node: Added RPOPCOUNT and LPOPCOUNT to transaction ([#874](https://github.com/aws/glide-for-redis/pull/874))
 * Standalone client: Improve connection errors. ([#854](https://github.com/aws/glide-for-redis/pull/854))
 * Python, Node: When recieving LPOP/RPOP with count, convert result to Array. ([#811](https://github.com/aws/glide-for-redis/pull/811))
+* Python: Added TYPE command ([#945](https://github.com/aws/glide-for-redis/pull/945))
+* Python: Added HLEN command ([#944](https://github.com/aws/glide-for-redis/pull/944))
+* Node: Added ZCOUNT command ([#909](https://github.com/aws/glide-for-redis/pull/909))
 
 #### Features
 * Python, Node: Added support in Lua Scripts ([#775](https://github.com/aws/glide-for-redis/pull/775), [#860](https://github.com/aws/glide-for-redis/pull/860))

benchmarks/install_and_test.sh

@@ -69,6 +69,7 @@ function runCSharpBenchmark(){
   dotnet clean
   dotnet build --configuration Release /warnaserror
   dotnet run --framework net6.0 --configuration Release --resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --clientCount $clientCount $tlsFlag $portFlag $minimalFlag
+  dotnet run --framework net8.0 --configuration Release --resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --clientCount $clientCount $tlsFlag $portFlag $minimalFlag
 }
 
 function runJavaBenchmark(){