Skip to content

Bump DuckDB version #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Bump DuckDB version #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e62cfe
Bump DuckDB version
szarnyasg Sep 24, 2024
27e1ea3
DuckDB: Use a single connection
szarnyasg Sep 24, 2024
812faca
Resolve ambiguity in query
szarnyasg Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion duckdb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>org.duckdb</groupId>
<artifactId>duckdb_jdbc</artifactId>
<version>0.3.1</version>
<version>1.1.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion duckdb/queries/interactive-complex-7.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
;
3 changes: 2 additions & 1 deletion duckdb/scripts/vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DUCKDB_VERSION=0.3.3

DUCKDB_VERSION=1.1.0
24 changes: 12 additions & 12 deletions duckdb/src/main/java/org/ldbcouncil/snb/impls/workloads/duckdb/DuckDbConnectionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@

public class DuckDbConnectionState<TDbQueryStore extends QueryStore> extends BaseDbConnectionState<TDbQueryStore> {

protected Connection connection;
protected static Connection connection;

public DuckDbConnectionState(Map<String, String> 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 {
Expand All @@ -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);
// }
// }
}
}