Skip to content

Commit 810e33a

Browse files
simonbencepvillard31
authored andcommitted
NIFI-14345 Update QuestDB to 8.3.1 and adjusting client usage
Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com> This closes apache#9947.
1 parent ddeac22 commit 810e33a

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.questdb</groupId>
3737
<artifactId>questdb</artifactId>
38-
<version>8.1.4</version>
38+
<version>8.3.1</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.springframework</groupId>

nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedClient.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ final class EmbeddedClient implements Client {
5454
public void execute(final String query) throws DatabaseException {
5555
checkConnectionState();
5656

57-
try (final SqlCompiler compiler = getCompiler()) {
58-
final CompiledQuery compile = compiler.compile(query, getSqlExecutionContext());
59-
compile.execute(new SCSequence(new TimeoutBlockingWaitStrategy(5, TimeUnit.SECONDS)));
60-
} catch (final SqlException | CairoError e) {
57+
try {
58+
engine.get().execute(query, getSqlExecutionContext(), new SCSequence(new TimeoutBlockingWaitStrategy(5, TimeUnit.SECONDS)));
59+
} catch (SqlException e) {
6160
throw new DatabaseException(e);
6261
}
6362
}

nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/EmbeddedDatabaseManager.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.apache.nifi.questdb.Client;
2626
import org.apache.nifi.questdb.DatabaseException;
2727
import org.apache.nifi.questdb.DatabaseManager;
28+
import org.apache.nifi.questdb.QueryResultProcessor;
29+
import org.apache.nifi.questdb.QueryRowContext;
2830
import org.apache.nifi.util.file.FileUtils;
2931
import org.slf4j.Logger;
3032
import org.slf4j.LoggerFactory;
@@ -183,7 +185,17 @@ private void ensureTablesAreInPlaceAndHealthy() throws CorruptedDatabaseExceptio
183185
metadata.close();
184186
}
185187

186-
client.execute(String.format("SELECT * FROM %S LIMIT 1", tableDefinition.getName()));
188+
client.query(String.format("SELECT * FROM %S LIMIT 1", tableDefinition.getName()), new QueryResultProcessor<>() {
189+
@Override
190+
public void processRow(final QueryRowContext context) {
191+
// Nothing to do, checking for successful execution
192+
}
193+
194+
@Override
195+
public Object getResult() {
196+
return null;
197+
}
198+
});
187199
} catch (final Exception e) {
188200
throw new CorruptedDatabaseException(e);
189201
}

0 commit comments

Comments
 (0)