[fix](protocol) Prevent Connector/J cursor fetch from hanging on empty results #67520
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.mysql; | ||
|
|
||
| import com.google.common.collect.ImmutableSet; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** Resolves the incompatible cursor result-set behavior used by Connector/J releases. */ | ||
| public final class MysqlCursorFetchCompatibility { | ||
| private static final Set<String> MYSQL_CONNECTOR_J_CLIENT_NAMES = ImmutableSet.of( | ||
| "MySQL Connector/J", "MySQL Connector Java"); | ||
| private static final Pattern CONSUMES_METADATA_TERMINATOR = | ||
| Pattern.compile("^(?:(?:5|6|8)\\.|9\\.[0-4](?:\\.|$))"); | ||
| private static final Pattern VERSION = Pattern.compile("^\\d+(?:\\.\\d+)+(?:[-+].*)?$"); | ||
|
|
||
| public enum Behavior { | ||
| CONSUMES_METADATA_TERMINATOR, | ||
| STANDARD, | ||
| UNKNOWN | ||
| } | ||
|
|
||
| private MysqlCursorFetchCompatibility() { | ||
| } | ||
|
|
||
| public static Behavior resolve(Map<String, String> connectAttributes) { | ||
| String clientName = connectAttributes.get("_client_name"); | ||
| if (clientName == null) { | ||
| return Behavior.UNKNOWN; | ||
| } | ||
| if (!MYSQL_CONNECTOR_J_CLIENT_NAMES.contains(clientName)) { | ||
| return Behavior.STANDARD; | ||
| } | ||
|
|
||
| String clientVersion = connectAttributes.get("_client_version"); | ||
| if (clientVersion == null || !VERSION.matcher(clientVersion).matches()) { | ||
| return Behavior.UNKNOWN; | ||
| } | ||
| if (CONSUMES_METADATA_TERMINATOR.matcher(clientVersion).find()) { | ||
| return Behavior.CONSUMES_METADATA_TERMINATOR; | ||
| } | ||
| return Behavior.STANDARD; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.mysql; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| public class MysqlCursorFetchCompatibilityTest { | ||
| @Test | ||
| public void testConnectorJBehaviorBoundaries() { | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.CONSUMES_METADATA_TERMINATOR, | ||
| resolve("MySQL Connector Java", "5.1.49")); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.CONSUMES_METADATA_TERMINATOR, | ||
| resolve("MySQL Connector/J", "6.0.6")); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.CONSUMES_METADATA_TERMINATOR, | ||
| resolve("MySQL Connector/J", "8.2.0")); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.CONSUMES_METADATA_TERMINATOR, | ||
| resolve("MySQL Connector/J", "9.4.0")); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.STANDARD, | ||
| resolve("MySQL Connector/J", "9.5.0")); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.STANDARD, | ||
| resolve("MySQL Connector/J", "9.6.0")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUnknownAndOtherClients() { | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.UNKNOWN, | ||
| MysqlCursorFetchCompatibility.resolve(Collections.emptyMap())); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.UNKNOWN, | ||
| MysqlCursorFetchCompatibility.resolve(ImmutableMap.of("_client_name", "MySQL Connector/J"))); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.UNKNOWN, | ||
| resolve("MySQL Connector/J", "custom")); | ||
| Assert.assertEquals(MysqlCursorFetchCompatibility.Behavior.STANDARD, | ||
| resolve("MariaDB Connector/J", "3.5.6")); | ||
| } | ||
|
|
||
| private MysqlCursorFetchCompatibility.Behavior resolve(String clientName, String clientVersion) { | ||
| return MysqlCursorFetchCompatibility.resolve(ImmutableMap.of( | ||
| "_client_name", clientName, "_client_version", clientVersion)); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[P2] Read the negotiated EOF capability here
This condition is false in the new unit test, but it remains true for real legacy-EOF connections.
MysqlProto.negotiaterecords the client's bit only inMysqlChannel, then sets the serializer capability tocontext.getServerCapability(); that default mask always includesCLIENT_DEPRECATE_EOF.ProxyMysqlChannelstarts with the same default as well. Consequently an authenticated client that did not negotiate the flag still gets the trailing zero byte this change intends to remove. Please key this from the negotiated/channel capability, and propagate it to proxy serialization, or store the negotiated mask in the serializer, with a handshake-level test.