This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 810e33a475 NIFI-14345 Update QuestDB to 8.3.1 and adjusting client
usage
810e33a475 is described below
commit 810e33a475db886e56296fce315ad5a3c1f1324c
Author: Bence Simon <[email protected]>
AuthorDate: Wed May 14 16:33:15 2025 +0200
NIFI-14345 Update QuestDB to 8.3.1 and adjusting client usage
Signed-off-by: Pierre Villard <[email protected]>
This closes #9947.
---
.../nifi-questdb-bundle/nifi-questdb/pom.xml | 2 +-
.../org/apache/nifi/questdb/embedded/EmbeddedClient.java | 7 +++----
.../nifi/questdb/embedded/EmbeddedDatabaseManager.java | 14 +++++++++++++-
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml
b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml
index d060e751e2..c4e73aa419 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.questdb</groupId>
<artifactId>questdb</artifactId>
- <version>8.1.4</version>
+ <version>8.3.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedClient.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedClient.java
index 807a42249f..ef019fb015 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedClient.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedClient.java
@@ -54,10 +54,9 @@ final class EmbeddedClient implements Client {
public void execute(final String query) throws DatabaseException {
checkConnectionState();
- try (final SqlCompiler compiler = getCompiler()) {
- final CompiledQuery compile = compiler.compile(query,
getSqlExecutionContext());
- compile.execute(new SCSequence(new TimeoutBlockingWaitStrategy(5,
TimeUnit.SECONDS)));
- } catch (final SqlException | CairoError e) {
+ try {
+ engine.get().execute(query, getSqlExecutionContext(), new
SCSequence(new TimeoutBlockingWaitStrategy(5, TimeUnit.SECONDS)));
+ } catch (SqlException e) {
throw new DatabaseException(e);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedDatabaseManager.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedDatabaseManager.java
index 6d6f0cbe31..4b9bebd2ff 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedDatabaseManager.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedDatabaseManager.java
@@ -25,6 +25,8 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.apache.nifi.questdb.Client;
import org.apache.nifi.questdb.DatabaseException;
import org.apache.nifi.questdb.DatabaseManager;
+import org.apache.nifi.questdb.QueryResultProcessor;
+import org.apache.nifi.questdb.QueryRowContext;
import org.apache.nifi.util.file.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -183,7 +185,17 @@ final class EmbeddedDatabaseManager implements
DatabaseManager {
metadata.close();
}
- client.execute(String.format("SELECT * FROM %S LIMIT 1",
tableDefinition.getName()));
+ client.query(String.format("SELECT * FROM %S LIMIT 1",
tableDefinition.getName()), new QueryResultProcessor<>() {
+ @Override
+ public void processRow(final QueryRowContext context) {
+ // Nothing to do, checking for successful execution
+ }
+
+ @Override
+ public Object getResult() {
+ return null;
+ }
+ });
} catch (final Exception e) {
throw new CorruptedDatabaseException(e);
}