From df59446d55f23f4480457a8ae223a895d9d570d8 Mon Sep 17 00:00:00 2001
From: Rajesh Balamohan <rbalamohan@apache.org>
Date: Mon, 15 May 2023 14:20:44 +0530
Subject: [PATCH] Support for JDK 1.8. Fixed minor issues related to exception
 handling

---
 pom.xml                                         | 17 +++++++++++++----
 .../lst_bench/common/LSTBenchmarkExecutor.java  | 17 +++++++++--------
 .../lst_bench/sql/ConnectionManager.java        |  5 +++++
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c287c7e..66ef3891 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
     <version>0.1-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -66,6 +66,12 @@
             <artifactId>duckdb_jdbc</artifactId>
             <version>0.7.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.2.7</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
@@ -166,7 +172,8 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.36.0</version>
+                <!-- To support JDK 1.8 -->
+                <version>2.30.0</version>
                 <configuration>
                     <java>
                         <includes>
@@ -186,6 +193,7 @@
                             <file>${project.basedir}/src/main/resources/license-header</file>
                         </licenseHeader>
                     </java>
+                    <!--
                     <json>
                         <includes>
                             <include>src/main/resources/**/*.json</include>
@@ -193,7 +201,8 @@
                         <jackson>
                             <version>2.14.2</version>
                         </jackson>
-                    </json>
+			        </json>
+		            -->
                     <sql>
                         <includes>
                             <include>src/main/resources/**/*.sql</include>
diff --git a/src/main/java/com/microsoft/lst_bench/common/LSTBenchmarkExecutor.java b/src/main/java/com/microsoft/lst_bench/common/LSTBenchmarkExecutor.java
index 8d56f569..76e0fa63 100644
--- a/src/main/java/com/microsoft/lst_bench/common/LSTBenchmarkExecutor.java
+++ b/src/main/java/com/microsoft/lst_bench/common/LSTBenchmarkExecutor.java
@@ -115,7 +115,7 @@ public void execute() throws Exception {
             checkResults(executor.invokeAll(threads));
             eventInfo = writePhaseEvent(phaseStartTime, phase.getId(), Status.SUCCESS);
           } catch (Exception e) {
-            LOGGER.error("Exception executing phase: " + phase.getId());
+            LOGGER.error("Exception executing phase: " + phase.getId(), e);
             writePhaseEvent(phaseStartTime, phase.getId(), Status.FAILURE);
             throw e;
           }
@@ -136,7 +136,7 @@ public void execute() throws Exception {
             Status.SUCCESS,
             new ObjectMapper().writeValueAsString(experimentMetadata));
       } catch (Exception e) {
-        LOGGER.error("Exception executing experiment: " + config.getId());
+        LOGGER.error("Exception executing experiment: " + config.getId(), e);
         writeExperimentEvent(
             repetitionStartTime,
             config.getId(),
@@ -232,14 +232,14 @@ public Boolean call() throws SQLException {
             Map<String, Object> values = getRuntimeParameterValues(task);
             executeTask(connection, task, values);
           } catch (Exception e) {
-            LOGGER.error("Exception executing task: " + task.getId());
+            LOGGER.error("Exception executing task: " + task.getId(), e);
             writeTaskEvent(taskStartTime, task.getId(), Status.FAILURE);
             throw e;
           }
           writeTaskEvent(taskStartTime, task.getId(), Status.SUCCESS);
         }
       } catch (Exception e) {
-        LOGGER.error("Exception executing session: " + session.getId());
+        LOGGER.error("Exception executing session: " + session.getId(), e);
         writeSessionEvent(sessionStartTime, session.getId(), Status.FAILURE);
         throw e;
       }
@@ -255,8 +255,9 @@ private void executeTask(Connection connection, TaskExec task, Map<String, Objec
           for (StatementExec statement : file.getStatements()) {
             Instant statementStartTime = Instant.now();
             try (Statement s = connection.createStatement()) {
-              boolean hasResults =
-                  s.execute(StringUtils.replaceParameters(statement, values).getStatement());
+              String sqlStr = StringUtils.replaceParameters(statement, values).getStatement();
+              LOGGER.debug("Executing query: {}", sqlStr);
+              boolean hasResults = s.execute(sqlStr);
               if (hasResults) {
                 ResultSet rs = s.getResultSet();
                 while (rs.next()) {
@@ -264,14 +265,14 @@ private void executeTask(Connection connection, TaskExec task, Map<String, Objec
                 }
               }
             } catch (Exception e) {
-              LOGGER.error("Exception executing statement: " + statement.getId());
+              LOGGER.error("Exception executing statement: " + statement.getId(), e);
               writeStatementEvent(statementStartTime, statement.getId(), Status.FAILURE);
               throw e;
             }
             writeStatementEvent(statementStartTime, statement.getId(), Status.SUCCESS);
           }
         } catch (Exception e) {
-          LOGGER.error("Exception executing file: " + file.getId());
+          LOGGER.error("Exception executing file: " + file.getId(), e);
           writeFileEvent(fileStartTime, file.getId(), Status.FAILURE);
           throw e;
         }
diff --git a/src/main/java/com/microsoft/lst_bench/sql/ConnectionManager.java b/src/main/java/com/microsoft/lst_bench/sql/ConnectionManager.java
index f661145a..61bae24f 100644
--- a/src/main/java/com/microsoft/lst_bench/sql/ConnectionManager.java
+++ b/src/main/java/com/microsoft/lst_bench/sql/ConnectionManager.java
@@ -21,10 +21,13 @@
 import java.sql.SQLException;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Simple JDBC connection manager. */
 public class ConnectionManager {
 
+  private static final Logger LOG = LoggerFactory.getLogger(ConnectionManager.class);
   private final String url;
 
   @Nullable private final String username;
@@ -38,6 +41,7 @@ private ConnectionManager(String url, String username, String password) {
   }
 
   public Connection createConnection() throws SQLException {
+    LOG.info("Creating connection: url: {}, username:{}", url, username);
     if (StringUtils.isEmpty(username)) {
       return DriverManager.getConnection(url);
     } else {
@@ -47,6 +51,7 @@ public Connection createConnection() throws SQLException {
 
   public static ConnectionManager from(ConnectionConfig connectionConfig) {
     try {
+      LOG.info("Loading driver: {}", connectionConfig.getDriver());
       Class.forName(connectionConfig.getDriver());
     } catch (ClassNotFoundException e) {
       throw new IllegalArgumentException(