An attempt to fix compilation errors for Java7 oltpbenchmark#6

ammolitor · Dec 7, 2012 · a41e0db · a41e0db
1 parent 6b0b34d
commit a41e0db
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/com/oltpbenchmark/benchmarks/tpcc/TPCCLoader.java b/src/com/oltpbenchmark/benchmarks/tpcc/TPCCLoader.java
@@ -681,6 +681,14 @@ public boolean isWrapperFor(Class<?> arg0) throws SQLException {
 		public <T> T unwrap(Class<T> arg0) throws SQLException {
 			throw new NotImplementedException();
 		}
+
+		// Java7 Fixes
+		public void closeOnCompletion() throws SQLException {
+		    throw new SQLException();
+		}
+		public boolean isCloseOnCompletion() throws SQLException {
+		    throw new SQLException();
+		}
 
 	}
 
@@ -1851,11 +1859,9 @@ public void load() throws SQLException {
 		LOG.debug("------------- LoadJDBC Statistics --------------------");
 		LOG.debug("     Start Time = " + startDate);
 		LOG.debug("       End Time = " + endDate);
-		LOG.debug("       Run Time = " + (int) runTimeMS / 1000
-				+ " Seconds");
+		LOG.debug("       Run Time = " + (int) runTimeMS / 1000 + " Seconds");
 		LOG.debug("    Rows Loaded = " + totalRows + " Rows");
-		LOG.debug("Rows Per Second = "
-				+ (totalRows / (runTimeMS / 1000)) + " Rows/Sec");
+		LOG.debug("Rows Per Second = " + (totalRows / (runTimeMS / 1000)) + " Rows/Sec");
 		LOG.debug("------------------------------------------------------");
 
 	}

diff --git a/src/com/oltpbenchmark/jdbc/AutoIncrementPreparedStatement.java b/src/com/oltpbenchmark/jdbc/AutoIncrementPreparedStatement.java
@@ -533,6 +533,14 @@ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLExcep
     public void setNClob(int parameterIndex, Reader reader) throws SQLException {
         this.stmt.setNClob(parameterIndex, reader);
     }
+
+    // Java7 Fixes
+    public void closeOnCompletion() throws SQLException {
+        throw new SQLException();
+    }
+    public boolean isCloseOnCompletion() throws SQLException {
+        throw new SQLException();
+    }
 
 
 }