From 6e62cfe1348a41d91846ab7594538b27e842c496 Mon Sep 17 00:00:00 2001 From: Gabor Szarnyas Date: Tue, 24 Sep 2024 22:41:05 +0200 Subject: [PATCH 1/4] Bump DuckDB version --- duckdb/pom.xml | 2 +- duckdb/scripts/vars.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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/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 From 27e1ea30e19da95860aa919b52b4e163dccfc2fd Mon Sep 17 00:00:00 2001 From: Gabor Szarnyas Date: Tue, 24 Sep 2024 23:14:29 +0200 Subject: [PATCH 2/4] DuckDB: Use a single connection --- .../duckdb/DuckDbConnectionState.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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); +// } +// } } } From 812faca5a957ecf597e7d87aa015100fdb7b9a44 Mon Sep 17 00:00:00 2001 From: Gabor Szarnyas Date: Tue, 24 Sep 2024 23:15:27 +0200 Subject: [PATCH 3/4] Resolve ambiguity in query --- duckdb/queries/interactive-complex-7.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ; From bd3644b6726f4a44db5c6da7d96894072cc1afd0 Mon Sep 17 00:00:00 2001 From: Gabor Szarnyas Date: Thu, 26 Mar 2026 16:04:38 +0100 Subject: [PATCH 4/4] Bump version --- duckdb/pom.xml | 2 +- duckdb/scripts/vars.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/duckdb/pom.xml b/duckdb/pom.xml index d0f4f44c0..2a708b319 100644 --- a/duckdb/pom.xml +++ b/duckdb/pom.xml @@ -21,7 +21,7 @@ org.duckdb duckdb_jdbc - 1.1.0 + 1.5.1.0 diff --git a/duckdb/scripts/vars.sh b/duckdb/scripts/vars.sh index ec2eeda22..5f1c7f808 100644 --- a/duckdb/scripts/vars.sh +++ b/duckdb/scripts/vars.sh @@ -1,2 +1 @@ - -DUCKDB_VERSION=1.1.0 +DUCKDB_VERSION=1.5.1