Merge branch 'main' into feature/templated-distributions

cmu-db · Dec 1, 2023 · 3d3c9b2 · 3d3c9b2
2 parents c12e60a + 1f57a5c
commit 3d3c9b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git 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'

diff --git 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/)
++ [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
@@ -70,6 +70,8 @@ public List<Object[]> run(Connection conn, int source_id, int session_low, int s
                 finalResults.add(arr);
             }
         }
+	    stmt.close();
+
         return (finalResults);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     finalResults.add(arr);
                 }
             }
+    	    stmt.close();
             return (finalResults);
         }
@@ Expand Down @@