Skip to content

Commit 0c69d12

Browse files
committed
Fix query progress test (1.3)
This is a backport of the PR duckdb#292 to `v1.3-ossivalis` stable branch. This change makes the query progress test to be compatible with the CTE changes done in #duckdb/duckdb#17459, see #duckdb/duckdb#18017 for details.
1 parent 3a3047f commit 0c69d12

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

src/test/java/org/duckdb/TestDuckDBJDBC.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3451,34 +3451,32 @@ public static void test_query_progress() throws Exception {
34513451
stmt.execute("SET enable_progress_bar = true");
34523452

34533453
ExecutorService executorService = Executors.newSingleThreadExecutor();
3454-
Future<QueryProgress> future = executorService.submit(new Callable<QueryProgress>() {
3455-
@Override
3456-
public QueryProgress call() throws Exception {
3457-
try {
3458-
Thread.sleep(2500);
3459-
QueryProgress qp = stmt.getQueryProgress();
3460-
stmt.cancel();
3461-
return qp;
3462-
} catch (Exception e) {
3463-
e.printStackTrace();
3464-
return null;
3465-
}
3454+
Future<QueryProgress> future = executorService.submit(() -> {
3455+
try {
3456+
Thread.sleep(2500);
3457+
QueryProgress qp = stmt.getQueryProgress();
3458+
stmt.cancel();
3459+
return qp;
3460+
} catch (Exception e) {
3461+
e.printStackTrace();
3462+
return null;
34663463
}
34673464
});
34683465
assertThrows(
34693466
()
34703467
-> stmt.executeQuery(
3471-
"WITH RECURSIVE cte AS ("
3468+
"WITH RECURSIVE cte AS NOT MATERIALIZED ("
34723469
+
34733470
"SELECT * from test_fib1 UNION ALL SELECT cte.i + 1, cte.f, cte.p + cte.f from cte WHERE cte.i < 150000) "
34743471
+ "SELECT avg(f) FROM cte"),
34753472
SQLException.class);
34763473

34773474
QueryProgress qpRunning = future.get();
34783475
assertNotNull(qpRunning);
3479-
assertEquals(qpRunning.getPercentage(), (double) 25);
3476+
assertTrue(qpRunning.getPercentage() > 0.09);
3477+
assertTrue(qpRunning.getPercentage() < 0.1);
34803478
assertEquals(qpRunning.getRowsProcessed(), 1L);
3481-
assertEquals(qpRunning.getTotalRowsToProcess(), 4L);
3479+
assertEquals(qpRunning.getTotalRowsToProcess(), 1004L);
34823480

34833481
assertThrows(stmt::getQueryProgress, SQLException.class);
34843482
}

0 commit comments

Comments
 (0)