Fix data race on stream resultsets

alex268 · Oct 16, 2024 · 263c846 · 263c846
1 parent 1ac976e
commit 263c846
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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<Result<LazyResultSet>> 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<LazyResultSet> res = future.join();