diff --git a/duckdb/pom.xml b/duckdb/pom.xml index 2a1e7db14..d0f4f44c0 100644 --- a/duckdb/pom.xml +++ b/duckdb/pom.xml @@ -21,7 +21,7 @@ org.duckdb duckdb_jdbc - 0.3.1 + 1.1.0 diff --git a/duckdb/queries/interactive-complex-7.sql b/duckdb/queries/interactive-complex-7.sql index 463bd040d..a8187cea1 100644 --- a/duckdb/queries/interactive-complex-7.sql +++ b/duckdb/queries/interactive-complex-7.sql @@ -17,5 +17,5 @@ where tmp.l_personid = l.l_personid and tmp.l_creationdate = l.l_creationdate and l.l_messageid = m_messageid -order by l_creationdate desc, p_personid asc +order by l.l_creationdate desc, p_personid asc ; diff --git a/duckdb/scripts/vars.sh b/duckdb/scripts/vars.sh index ab7bacc26..ec2eeda22 100644 --- a/duckdb/scripts/vars.sh +++ b/duckdb/scripts/vars.sh @@ -1 +1,2 @@ -DUCKDB_VERSION=0.3.3 + +DUCKDB_VERSION=1.1.0 diff --git a/duckdb/src/main/java/org/ldbcouncil/snb/impls/workloads/duckdb/DuckDbConnectionState.java b/duckdb/src/main/java/org/ldbcouncil/snb/impls/workloads/duckdb/DuckDbConnectionState.java index 773d72104..b7f24acae 100644 --- a/duckdb/src/main/java/org/ldbcouncil/snb/impls/workloads/duckdb/DuckDbConnectionState.java +++ b/duckdb/src/main/java/org/ldbcouncil/snb/impls/workloads/duckdb/DuckDbConnectionState.java @@ -13,14 +13,14 @@ public class DuckDbConnectionState extends BaseDbConnectionState { - protected Connection connection; + protected static Connection connection; public DuckDbConnectionState(Map properties, TDbQueryStore store) throws ClassNotFoundException, SQLException { super(properties, store); - TimeZone.setDefault(TimeZone.getTimeZone("Etc/GMT+0")); - connection = DriverManager.getConnection("jdbc:duckdb:scratch/ldbc.duckdb"); - Statement statement = connection.createStatement(); - statement.execute("PRAGMA threads=1;"); + if (connection == null) { + // TimeZone.setDefault(TimeZone.getTimeZone("Etc/GMT+0")); + connection = DriverManager.getConnection("jdbc:duckdb:scratch/ldbc.duckdb"); + } } public Connection getConnection() throws DbException { @@ -29,12 +29,12 @@ public Connection getConnection() throws DbException { @Override public void close() { - if (connection != null) { - try { - connection.close(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } +// if (connection != null) { +// try { +// connection.close(); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } +// } } }