Skip to content

Commit bda478c

Browse files
authored
Hybrid Results are enabled by default in SEA Mode (#771)
* Made Hybrid results default * Fixed unit test * Added Fake service stubs * Added stubs for Default hybrid mode * Reverted to old stubs * Reverted stubs * Fix
1 parent e742574 commit bda478c

4 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/main/java/com/databricks/jdbc/common/DatabricksJdbcUrlParams.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public enum DatabricksJdbcUrlParams {
9191
ENABLE_REQUEST_TRACING("EnableRequestTracing", "flag to enable request tracing", "0"),
9292
HTTP_CONNECTION_POOL_SIZE("HttpConnectionPoolSize", "Maximum HTTP connection pool size", "100"),
9393
ENABLE_SQL_EXEC_HYBRID_RESULTS(
94-
"EnableSQLExecHybridResults", "flag to enable hybrid results", "0"),
94+
"EnableSQLExecHybridResults", "flag to enable hybrid results", "1"),
9595
ENABLE_COMPLEX_DATATYPE_SUPPORT(
9696
"EnableComplexDatatypeSupport",
9797
"flag to enable native support of complex data types as java objects",

src/test/java/com/databricks/jdbc/dbclient/impl/sqlexec/DatabricksSdkClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private void setupClientMocks(boolean includeResults, boolean async) {
8686
.setSessionId(SESSION_ID)
8787
.setWarehouseId(WAREHOUSE_ID)
8888
.setStatement(STATEMENT)
89-
.setDisposition(Disposition.EXTERNAL_LINKS)
89+
.setDisposition(Disposition.INLINE_OR_EXTERNAL_LINKS)
9090
.setFormat(Format.ARROW_STREAM)
9191
.setRowLimit(100L)
9292
.setParameters(params);

src/test/java/com/databricks/jdbc/integration/IntegrationTestUtil.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ public static Connection getValidJDBCConnection() throws SQLException {
171171
Properties connectionProperties = new Properties();
172172
connectionProperties.put(DatabricksJdbcUrlParams.USER.getParamName(), getDatabricksUser());
173173
connectionProperties.put(DatabricksJdbcUrlParams.PASSWORD.getParamName(), getDatabricksToken());
174+
connectionProperties.put(
175+
DatabricksJdbcUrlParams.ENABLE_SQL_EXEC_HYBRID_RESULTS.getParamName(), '0');
174176

175177
if (DriverUtil.isRunningAgainstFake()) {
176178
connectionProperties.put(
@@ -202,6 +204,8 @@ public static Connection getValidJDBCConnection(Properties connectionProperties)
202204
throws SQLException {
203205
connectionProperties.put(DatabricksJdbcUrlParams.USER.getParamName(), getDatabricksUser());
204206
connectionProperties.put(DatabricksJdbcUrlParams.PASSWORD.getParamName(), getDatabricksToken());
207+
connectionProperties.put(
208+
DatabricksJdbcUrlParams.ENABLE_SQL_EXEC_HYBRID_RESULTS.getParamName(), '0');
205209

206210
if (DriverUtil.isRunningAgainstFake()) {
207211
connectionProperties.put(

src/test/java/com/databricks/jdbc/integration/fakeservice/tests/UCVolumeIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ private Connection getConnection() throws SQLException {
355355
Properties connProps = new Properties();
356356
connProps.put(DatabricksJdbcUrlParams.USER.getParamName(), getDatabricksUser());
357357
connProps.put(DatabricksJdbcUrlParams.PASSWORD.getParamName(), getDatabricksToken());
358+
connProps.put(DatabricksJdbcUrlParams.ENABLE_SQL_EXEC_HYBRID_RESULTS.getParamName(), '0');
358359
connProps.put(
359360
DatabricksJdbcUrlParams.CONN_CATALOG.getParamName(),
360361
FakeServiceConfigLoader.getProperty(DatabricksJdbcUrlParams.CONN_CATALOG.getParamName()));

0 commit comments

Comments
 (0)