Skip to content

Commit 1dc2483

Browse files
acarbonettoacarbonetto
committed
Merge branch 'main' into java/integ_acarbo_jedi_threadpool
2 parents ad10c52 + 26e7a0b commit 1dc2483

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2876
-580
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ root = true
55
trim_trailing_whitespace = true
66
insert_final_newline = true
77
indent_style = space
8+
indent_size = 4
9+
tab_width = 4
810

911
# Xml files
1012
[*.xml]
@@ -16,8 +18,6 @@ indent_size = 2
1618
#### Core EditorConfig Options ####
1719

1820
# Indentation and spacing
19-
indent_size = 4
20-
tab_width = 4
2121

2222
# New line preferences
2323
end_of_line = lf

‎.github/workflows/csharp.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
redis:
2929
- 6.2.14
3030
- 7.2.3
31+
dotnet:
32+
- 6.0
33+
- 8.0
3134

3235
steps:
3336
- uses: actions/checkout@v4
@@ -44,10 +47,10 @@ jobs:
4447
with:
4548
version: "25.1"
4649

47-
- name: Set up dotnet
50+
- name: Set up dotnet ${{ matrix.dotnet }}
4851
uses: actions/setup-dotnet@v3
4952
with:
50-
dotnet-version: 6.0.x
53+
dotnet-version: ${{ matrix.dotnet }}
5154

5255
- name: Start redis server
5356
run: redis-server &
@@ -56,9 +59,9 @@ jobs:
5659
working-directory: ./csharp
5760
run: dotnet format --verify-no-changes --verbosity diagnostic
5861

59-
- name: Test
62+
- name: Test dotnet ${{ matrix.dotnet }}
6063
working-directory: ./csharp
61-
run: dotnet test --framework net6.0 /warnaserror
64+
run: dotnet test --framework net${{ matrix.dotnet }} /warnaserror
6265

6366
- uses: ./.github/workflows/test-benchmark
6467
with:

‎.github/workflows/go.yml‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
name: Go CI
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: [ "main" ]
7+
paths:
8+
- glide-core/**
9+
- submodules/**
10+
- go/**
11+
- .github/workflows/go.yml
12+
pull_request:
13+
paths:
14+
- glide-core/**
15+
- submodules/**
16+
- go/**
17+
- .github/workflows/go.yml
18+
19+
# Run only the latest job on a branch and cancel previous ones
20+
concurrency:
21+
group: ${{ github.head_ref || github.ref }}
22+
cancel-in-progress: true
23+
24+
jobs:
25+
build-and-test-go-client:
26+
timeout-minutes: 20
27+
strategy:
28+
# Run all jobs
29+
fail-fast: false
30+
matrix:
31+
go:
32+
- '1.18'
33+
- '1.21'
34+
redis:
35+
- 6.2.14
36+
- 7.2.3
37+
os:
38+
- ubuntu-latest
39+
- macos-latest
40+
41+
runs-on: ${{ matrix.os }}
42+
43+
steps:
44+
- uses: actions/checkout@v4
45+
with:
46+
submodules: recursive
47+
48+
- name: Set up Go ${{ matrix.go }}
49+
uses: actions/setup-go@v5
50+
with:
51+
go-version: ${{ matrix.go }}
52+
cache-dependency-path: go/go.sum
53+
54+
- name: Install shared software dependencies
55+
uses: ./.github/workflows/install-shared-dependencies
56+
with:
57+
os: ${{ matrix.os }}
58+
target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
59+
github-token: ${{ secrets.GITHUB_TOKEN }}
60+
61+
- name: Install redis
62+
# TODO: make this step macos compatible: https://github.com/aws/glide-for-redis/issues/781
63+
if: ${{ matrix.os == 'ubuntu-latest' }}
64+
uses: ./.github/workflows/install-redis
65+
with:
66+
redis-version: ${{ matrix.redis }}
67+
68+
- name: Install client dependencies
69+
working-directory: ./go
70+
run: make install-tools
71+
72+
- name: Build client
73+
working-directory: ./go
74+
run: make build
75+
76+
- name: Run linters
77+
working-directory: ./go
78+
run: make lint
79+
80+
- name: Run unit tests
81+
working-directory: ./go
82+
run: make unit-test-report
83+
84+
- name: Upload test reports
85+
if: always()
86+
continue-on-error: true
87+
uses: actions/upload-artifact@v4
88+
with:
89+
name: test-reports-go-${{ matrix.go }}-redis-${{ matrix.redis }}-${{ matrix.os }}
90+
path: |
91+
go/reports/unit-test-report.html
92+
93+
build-amazonlinux-latest:
94+
if: github.repository_owner == 'aws'
95+
strategy:
96+
# Run all jobs
97+
fail-fast: false
98+
matrix:
99+
go:
100+
- 1.18.10
101+
- 1.21.6
102+
runs-on: ubuntu-latest
103+
container: amazonlinux:latest
104+
timeout-minutes: 15
105+
steps:
106+
- name: Install git
107+
run: |
108+
yum -y remove git
109+
yum -y remove git-*
110+
yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
111+
yum update
112+
yum install -y git
113+
git --version
114+
115+
- uses: actions/checkout@v4
116+
117+
- name: Checkout submodules
118+
run: |
119+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
120+
git submodule update --init --recursive
121+
122+
- name: Install shared software dependencies
123+
uses: ./.github/workflows/install-shared-dependencies
124+
with:
125+
os: "amazon-linux"
126+
target: "x86_64-unknown-linux-gnu"
127+
github-token: ${{ secrets.GITHUB_TOKEN }}
128+
129+
- name: Create a symbolic Link for redis6 binaries
130+
run: |
131+
ln -s /usr/bin/redis6-server /usr/bin/redis-server
132+
ln -s /usr/bin/redis6-cli /usr/bin/redis-cli
133+
134+
- name: Install Go
135+
run: |
136+
yum -y install wget
137+
yum -y install tar
138+
wget https://go.dev/dl/go${{ matrix.go }}.linux-amd64.tar.gz
139+
tar -C /usr/local -xzf go${{ matrix.go }}.linux-amd64.tar.gz
140+
echo "/usr/local/go/bin" >> $GITHUB_PATH
141+
echo "$HOME/go/bin" >> $GITHUB_PATH
142+
143+
- name: Install client dependencies
144+
working-directory: ./go
145+
run: make install-tools
146+
147+
- name: Build client
148+
working-directory: ./go
149+
run: make build
150+
151+
- name: Run linters
152+
working-directory: ./go
153+
run: make lint
154+
155+
- name: Run unit tests
156+
working-directory: ./go
157+
run: make unit-test-report
158+
159+
- name: Upload test reports
160+
if: always()
161+
continue-on-error: true
162+
uses: actions/upload-artifact@v4
163+
with:
164+
name: test-reports-go-${{ matrix.go }}-amazon-linux-latest
165+
path: go/reports/unit-test-report.html
166+
167+
lint-rust:
168+
timeout-minutes: 15
169+
runs-on: ubuntu-latest
170+
steps:
171+
- uses: actions/checkout@v4
172+
with:
173+
submodules: recursive
174+
175+
- uses: ./.github/workflows/lint-rust
176+
with:
177+
cargo-toml-folder: ./go
178+
name: lint go rust

‎.github/workflows/java.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ jobs:
6868
working-directory: java
6969
run: ./gradlew --continue build
7070

71+
- name: Ensure no skipped files by linter
72+
working-directory: java
73+
run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files'
74+
7175
- name: Upload test reports
7276
if: always()
7377
continue-on-error: true

‎.github/workflows/ort.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
required: true
2020
jobs:
2121
run-ort:
22+
if: github.repository_owner == 'aws'
2223
name: Create attribution files
2324
runs-on: ubuntu-latest
2425
strategy:
@@ -47,7 +48,7 @@ jobs:
4748
ref: ${{ env.BASE_BRANCH }}
4849

4950
- name: Set up JDK 11 for the ORT package
50-
uses: actions/setup-java@v3
51+
uses: actions/setup-java@v4
5152
with:
5253
distribution: "temurin"
5354
java-version: 11
@@ -103,7 +104,7 @@ jobs:
103104
### NodeJS ###
104105

105106
- name: Set up Node.js 16.x
106-
uses: actions/setup-node@v3
107+
uses: actions/setup-node@v4
107108
with:
108109
node-version: 16.x
109110

@@ -133,7 +134,7 @@ jobs:
133134
### Python ###
134135

135136
- name: Set up Python 3.10
136-
uses: actions/setup-python@v4
137+
uses: actions/setup-python@v5
137138
with:
138139
python-version: "3.10"
139140

‎CHANGELOG.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
## 0.2.0 (2024-02-11)
22

33
#### Changes
4-
* 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))
4+
* 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))
55
* 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))
66
* 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))
7-
* 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))
7+
* 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))
88
* Use jemalloc as default allocator. ([#847](https://github.com/aws/glide-for-redis/pull/847))
99
* Python, Node: Added RPOPCOUNT and LPOPCOUNT to transaction ([#874](https://github.com/aws/glide-for-redis/pull/874))
1010
* Standalone client: Improve connection errors. ([#854](https://github.com/aws/glide-for-redis/pull/854))
1111
* Python, Node: When recieving LPOP/RPOP with count, convert result to Array. ([#811](https://github.com/aws/glide-for-redis/pull/811))
12+
* Python: Added TYPE command ([#945](https://github.com/aws/glide-for-redis/pull/945))
13+
* Python: Added HLEN command ([#944](https://github.com/aws/glide-for-redis/pull/944))
14+
* Node: Added ZCOUNT command ([#909](https://github.com/aws/glide-for-redis/pull/909))
1215

1316
#### Features
1417
* 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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ function runCSharpBenchmark(){
6969
dotnet clean
7070
dotnet build --configuration Release /warnaserror
7171
dotnet run --framework net6.0 --configuration Release --resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --clientCount $clientCount $tlsFlag $portFlag $minimalFlag
72+
dotnet run --framework net8.0 --configuration Release --resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --clientCount $clientCount $tlsFlag $portFlag $minimalFlag
7273
}
7374

7475
function runJavaBenchmark(){

0 commit comments

Comments
 (0)