diff --git a/fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/TypeConversion.java b/fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/TypeConversion.java index dd5704c563..f4dad95271 100644 --- a/fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/TypeConversion.java +++ b/fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/TypeConversion.java @@ -581,8 +581,6 @@ public static Continuation.Reason toReason(RpcContinuationReason reason) { @SuppressWarnings("unchecked") static com.apple.foundationdb.relational.jdbc.grpc.v1.Options.Builder toProtobuf(@Nonnull Options options) throws SQLException { final var builder = com.apple.foundationdb.relational.jdbc.grpc.v1.Options.newBuilder(); - // Switched-on by default on JDBC driver until the option is deprecated and removed. - builder.setContinuationsContainCompiledStatements(true); for (Map.Entry entry : options.entries()) { switch (entry.getKey()) { case MAX_ROWS: @@ -802,9 +800,6 @@ public static Options fromProtobuf(com.apple.foundationdb.relational.jdbc.grpc.v if (protoOptions.hasValidPlanHashModes()) { builder.withOption(Options.Name.VALID_PLAN_HASH_MODES, protoOptions.getValidPlanHashModes()); } - if (protoOptions.hasContinuationsContainCompiledStatements() && !protoOptions.getContinuationsContainCompiledStatements()) { - throw new RelationalException("Option CONTINUATIONS_CONTAIN_COMPILED_STATEMENTS=false not supported anymore!", ErrorCode.UNSUPPORTED_OPERATION).toUncheckedWrappedException(); - } if (protoOptions.hasAsyncOperationsTimeoutMillis()) { builder.withOption(Options.Name.ASYNC_OPERATIONS_TIMEOUT_MILLIS, protoOptions.getAsyncOperationsTimeoutMillis()); } diff --git a/fdb-relational-grpc/src/main/proto/grpc/relational/jdbc/v1/jdbc.proto b/fdb-relational-grpc/src/main/proto/grpc/relational/jdbc/v1/jdbc.proto index 342c9b3104..995a798cb1 100644 --- a/fdb-relational-grpc/src/main/proto/grpc/relational/jdbc/v1/jdbc.proto +++ b/fdb-relational-grpc/src/main/proto/grpc/relational/jdbc/v1/jdbc.proto @@ -145,7 +145,7 @@ message Options { optional bool case_sensitive_identifiers = 22; optional string current_plan_hash_mode = 23; optional string valid_plan_hash_modes = 24; - optional bool continuations_contain_compiled_statements = 25; + optional bool continuations_contain_compiled_statements = 25 [deprecated = true]; optional int64 async_operations_timeout_millis = 26; optional bool encrypt_when_serializing = 27; optional string encryption_key_store = 28;