Skip to content

Commit d97c90c

Browse files
committed
[fix](flight-sql) Keep parameter binding compatible with Java 8
1 parent 5690018 commit d97c90c

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
import org.apache.doris.transaction.TransactionStatus;
8888

8989
import com.google.common.base.Strings;
90+
import com.google.common.collect.ImmutableList;
9091
import com.google.common.collect.Lists;
9192
import com.google.common.collect.Maps;
9293
import lombok.Getter;
@@ -1009,8 +1010,8 @@ public void setPreparedQueryParameters(String id, List<Literal> parameters, Sche
10091010
}
10101011
flightParameterBytes += bytes - query.parameterBytes;
10111012
query.parameterBytes = bytes;
1012-
// Retain detached immutable values, never vectors owned and reused by the Flight stream.
1013-
query.parameters = parameters == null ? null : List.copyOf(parameters);
1013+
// Keep a detached immutable snapshot using a Java 8-compatible copy implementation.
1014+
query.parameters = parameters == null ? null : ImmutableList.copyOf(parameters);
10141015
query.schema = schema;
10151016
}
10161017
}

‎fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/FlightSqlPreparedQueryTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.apache.doris.service.arrowflight.sessions.FlightSqlConnectContext;
3333
import org.apache.doris.utframe.TestWithFeService;
3434

35+
import com.google.common.base.Strings;
3536
import com.google.protobuf.Any;
3637
import com.google.protobuf.ByteString;
3738
import org.apache.arrow.flight.Action;
@@ -355,8 +356,9 @@ public void validatesWholeUploadInsteadOfUsingFirstBatch() {
355356
@Test
356357
public void limitsRetainedParametersAcrossHandlesAndReleasesTheirBudget() {
357358
ConnectContext connection = new ConnectContext();
359+
// Test sources also target Java 8, where String.repeat is unavailable.
358360
List<Literal> parameters = Arrays.asList(
359-
new StringLiteral("x".repeat(512 * 1024)));
361+
new StringLiteral(Strings.repeat("x", 512 * 1024)));
360362
for (int i = 0; i < 15; i++) {
361363
connection.addPreparedQuery("p" + i, "SELECT ?", null, 1);
362364
connection.setPreparedQueryParameters("p" + i, parameters, null);

0 commit comments

Comments
 (0)