diff --git a/jdbc/src/main/java/tech/ydb/jdbc/context/StreamQueryResult.java b/jdbc/src/main/java/tech/ydb/jdbc/context/StreamQueryResult.java index 7870d96..d7167d3 100644 --- a/jdbc/src/main/java/tech/ydb/jdbc/context/StreamQueryResult.java +++ b/jdbc/src/main/java/tech/ydb/jdbc/context/StreamQueryResult.java @@ -80,9 +80,14 @@ public StreamQueryResult(String msg, YdbStatement statement, YdbQuery query, Run public void onStreamResultSet(int index, ResultSetReader rsr) { CompletableFuture> future = resultFutures.get(index); + if (!future.isDone()) { ColumnInfo[] columns = ColumnInfo.fromResultSetReader(rsr); - future.complete(Result.success(new LazyResultSet(statement, columns))); + LazyResultSet rs = new LazyResultSet(statement, columns); + rs.addResultSet(rsr); + if (future.complete(Result.success(rs))) { + return; + } } Result res = future.join();