From 8ce37b68286f80185f191e166365e6d79d94fa14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 15:24:57 -0600 Subject: [PATCH 1/2] Bump actions/setup-java from 3 to 4 in /.github/workflows (#400) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/maven.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4036e97bf..291b849a2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} cache: 'maven' @@ -64,7 +64,7 @@ jobs: uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} cache: 'maven' @@ -105,7 +105,7 @@ jobs: rm -rf benchbase-sqlite.tgz - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} distribution: 'temurin' @@ -175,7 +175,7 @@ jobs: rm -rf benchbase-mariadb.tgz - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} distribution: 'temurin' @@ -243,7 +243,7 @@ jobs: rm -rf benchbase-mysql.tgz - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} distribution: 'temurin' @@ -310,7 +310,7 @@ jobs: rm -rf benchbase-postgres.tgz - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} distribution: 'temurin' @@ -370,7 +370,7 @@ jobs: rm -rf benchbase-cockroachdb.tgz - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} distribution: 'temurin' @@ -427,7 +427,7 @@ jobs: rm -rf benchbase-sqlserver.tgz - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{env.JAVA_VERSION}} distribution: 'temurin' From 1f57a5c996725a70c079adc9c1250fe8947f3ce8 Mon Sep 17 00:00:00 2001 From: Nguyen Nguyen Date: Sat, 2 Dec 2023 08:08:39 +1000 Subject: [PATCH 2/2] Splitting otmetrics fix from #379 (#396) * Splitting otmetrics close stmt from #379 * Add CONTRIBUTORS for traceable copyright attribution --------- Co-authored-by: Brian Kroth --- CONTRIBUTORS.md | 3 ++- .../benchmarks/otmetrics/procedures/GetSessionRange.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9a4cbeb43..f7b337852 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -19,4 +19,5 @@ We also acknowledge contributions from the following collaborators: + [Florian Funke](http://www3.in.tum.de/~funkef/) -+ [Michael Seibold](http://www3.in.tum.de/~seibold/) \ No newline at end of file ++ [Michael Seibold](http://www3.in.tum.de/~seibold/) ++ [Oracle](https://github.com/oracle) (Copyright (c) 2023, Oracle and/or its affiliates.) diff --git a/src/main/java/com/oltpbenchmark/benchmarks/otmetrics/procedures/GetSessionRange.java b/src/main/java/com/oltpbenchmark/benchmarks/otmetrics/procedures/GetSessionRange.java index 171d543db..e79877ba2 100644 --- a/src/main/java/com/oltpbenchmark/benchmarks/otmetrics/procedures/GetSessionRange.java +++ b/src/main/java/com/oltpbenchmark/benchmarks/otmetrics/procedures/GetSessionRange.java @@ -70,6 +70,8 @@ public List run(Connection conn, int source_id, int session_low, int s finalResults.add(arr); } } + stmt.close(); + return (finalResults); }