Skip to content

Fix Pinot client scheme property merge #18607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wolfkill wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Pinot client scheme property merge #18607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...lient/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ public JsonAsyncHttpPinotClientTransportFactory withConnectionProperties(Propert
_headers = ConnectionUtils.getHeadersFromProperties(properties);
}

String scheme = properties.getProperty("scheme", CommonConstants.HTTP_PROTOCOL);
if (_scheme == null || !_scheme.contentEquals(scheme)) {
_scheme = scheme;
_scheme = properties.getProperty("scheme", _scheme);
if (_scheme == null) {
_scheme = CommonConstants.HTTP_PROTOCOL;
}

if (_sslContext == null && _scheme.contentEquals(CommonConstants.HTTPS_PROTOCOL)) {
Expand Down
33 changes: 33 additions & 0 deletions ...a-client/src/test/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.Properties;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.pinot.spi.utils.CommonConstants;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
Expand Down Expand Up @@ -140,6 +141,38 @@ public void serverResponseExceedsBrokerReadTimeoutThreshold() {
}
}

@Test
public void withConnectionPropertiesRetainsConfiguredSchemeWhenSchemePropertyIsAbsent() {
JsonAsyncHttpPinotClientTransportFactory factory = new JsonAsyncHttpPinotClientTransportFactory();
factory.setScheme(CommonConstants.HTTPS_PROTOCOL);

factory.withConnectionProperties(new Properties());

assertEquals(factory.getScheme(), CommonConstants.HTTPS_PROTOCOL);
}

@Test
public void withConnectionPropertiesOverridesConfiguredSchemeWhenSchemePropertyIsPresent() {
JsonAsyncHttpPinotClientTransportFactory factory = new JsonAsyncHttpPinotClientTransportFactory();
factory.setScheme(CommonConstants.HTTP_PROTOCOL);
Properties connectionProps = new Properties();
connectionProps.setProperty("scheme", CommonConstants.HTTPS_PROTOCOL);

factory.withConnectionProperties(connectionProps);

assertEquals(factory.getScheme(), CommonConstants.HTTPS_PROTOCOL);
}

@Test
public void withConnectionPropertiesFallsBackToHttpWhenConfiguredSchemeIsNull() {
JsonAsyncHttpPinotClientTransportFactory factory = new JsonAsyncHttpPinotClientTransportFactory();
factory.setScheme(null);

factory.withConnectionProperties(new Properties());

assertEquals(factory.getScheme(), CommonConstants.HTTP_PROTOCOL);
}

// Cursor-related tests
@Test
public void testExecuteQueryWithCursor() {
Expand Down
Loading