Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
Yury-Fridlyand committed Oct 2, 2024
1 parent 82c42a1 commit 2f26179
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 25 deletions.
23 changes: 3 additions & 20 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,26 +197,17 @@ jobs:
name: lint java rust

test-modules:
needs: [load-engine-matrix]
if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
name: Running Module Tests
runs-on: ${{ matrix.host.RUNNER }}
runs-on: arm64-linux
timeout-minutes: 35
strategy:
fail-fast: false
matrix:
engine: ${{ fromJson(needs.load-engine-matrix.outputs.matrix) }}
java: [ 17 ]
host:
- {
OS: "ubuntu",
NAMED_OS: "linux",
RUNNER: ["self-hosted", "Linux", "ARM64"],
TARGET: "aarch64-unknown-linux-gnu",
}

steps:
- name: Setup self-hosted runner access
if: ${{ contains(matrix.host.RUNNER, 'self-hosted') }}
run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/valkey-glide

- uses: actions/checkout@v4
Expand All @@ -229,14 +220,6 @@ jobs:
distribution: "temurin"
java-version: ${{ matrix.java }}

- name: Install shared software dependencies
uses: ./.github/workflows/install-shared-dependencies
with:
os: ${{ matrix.host.OS }}
target: ${{ matrix.host.TARGET }}
github-token: ${{ secrets.GITHUB_TOKEN }}
engine-version: ${{ matrix.engine.version }}

- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
Expand All @@ -252,6 +235,6 @@ jobs:
continue-on-error: true
uses: actions/upload-artifact@v4
with:
name: test-reports-java-${{ matrix.java }}-${{ matrix.engine.type }}-${{ matrix.engine.version }}-modules
name: test-reports-java-${{ matrix.java }}-modules
path: |
java/integTest/build/reports/**
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void ft_create(BaseClient client) {
IndexType.HASH,
new String[0],
new FieldInfo[] {
new FieldInfo("vec", "vec", VectorFieldHnsw.builder(DistanceMetric.L2, 2).build())
new FieldInfo("vec", "VEC", VectorFieldHnsw.builder(DistanceMetric.L2, 2).build())
})
.get());
assertEquals(
Expand Down Expand Up @@ -305,14 +305,14 @@ public void ft_drop(BaseClient client) {
var before =
client instanceof GlideClient
? Set.of(
(String[]) ((GlideClient) client).customCommand(new String[] {"FT._LIST"}).get())
(Object[]) ((GlideClient) client).customCommand(new String[] {"FT._LIST"}).get())
: ((GlideClusterClient) client)
.customCommand(new String[] {"FT._LIST"}, ALL_PRIMARIES)
.get()
.getMultiValue()
.values()
.stream()
.flatMap(s -> Arrays.stream((String[]) s))
.flatMap(s -> Arrays.stream((Object[]) s))
.collect(Collectors.toSet());

assertEquals(OK, client.ftdrop(index).get());
Expand All @@ -321,15 +321,15 @@ public void ft_drop(BaseClient client) {
client instanceof GlideClient
? new HashSet<>(
Set.of(
(String[])
(Object[])
((GlideClient) client).customCommand(new String[] {"FT._LIST"}).get()))
: ((GlideClusterClient) client)
.customCommand(new String[] {"FT._LIST"}, ALL_PRIMARIES)
.get()
.getMultiValue()
.values()
.stream()
.flatMap(s -> Arrays.stream((String[]) s))
.flatMap(s -> Arrays.stream((Object[]) s))
.collect(Collectors.toSet());

assertFalse(after.contains(index));
Expand Down

0 comments on commit 2f26179

Please sign in to comment.