Skip to content

Commit 79d1dc3

Browse files
Repackaging source files (commit 3) (#413)
Move thrift generated models to `com.databricks.jdbc.model.client.thrift.generated`.
1 parent 2dfc00b commit 79d1dc3

File tree

148 files changed

+292
-385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+292
-385
lines changed

src/main/java/com/databricks/jdbc/api/impl/ArrowResultChunk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import com.databricks.jdbc.common.util.DecompressionUtil;
1010
import com.databricks.jdbc.common.util.LoggingUtil;
1111
import com.databricks.jdbc.dbclient.IDatabricksHttpClient;
12-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TSparkArrowResultLink;
1312
import com.databricks.jdbc.exception.DatabricksHttpException;
1413
import com.databricks.jdbc.exception.DatabricksParsingException;
1514
import com.databricks.jdbc.exception.DatabricksSQLException;
15+
import com.databricks.jdbc.model.client.thrift.generated.TSparkArrowResultLink;
1616
import com.databricks.jdbc.model.core.ExternalLink;
1717
import com.databricks.sdk.service.sql.BaseChunkInfo;
1818
import com.google.common.annotations.VisibleForTesting;

src/main/java/com/databricks/jdbc/api/impl/ArrowStreamResult.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import com.databricks.jdbc.api.IDatabricksSession;
66
import com.databricks.jdbc.api.impl.converters.ArrowToJavaObjectConverter;
77
import com.databricks.jdbc.dbclient.IDatabricksHttpClient;
8-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TColumnDesc;
9-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TGetResultSetMetadataResp;
10-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TRowSet;
118
import com.databricks.jdbc.exception.DatabricksParsingException;
129
import com.databricks.jdbc.exception.DatabricksSQLException;
10+
import com.databricks.jdbc.model.client.thrift.generated.TColumnDesc;
11+
import com.databricks.jdbc.model.client.thrift.generated.TGetResultSetMetadataResp;
12+
import com.databricks.jdbc.model.client.thrift.generated.TRowSet;
1313
import com.databricks.jdbc.model.core.ResultData;
1414
import com.databricks.jdbc.model.core.ResultManifest;
1515
import com.databricks.sdk.service.sql.ColumnInfo;

src/main/java/com/databricks/jdbc/api/impl/ChunkDownloader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import com.databricks.jdbc.common.util.LoggingUtil;
99
import com.databricks.jdbc.dbclient.IDatabricksHttpClient;
1010
import com.databricks.jdbc.dbclient.impl.http.DatabricksHttpClient;
11-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TRowSet;
12-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TSparkArrowResultLink;
1311
import com.databricks.jdbc.exception.DatabricksSQLException;
12+
import com.databricks.jdbc.model.client.thrift.generated.TRowSet;
13+
import com.databricks.jdbc.model.client.thrift.generated.TSparkArrowResultLink;
1414
import com.databricks.jdbc.model.core.ExternalLink;
1515
import com.databricks.jdbc.model.core.ResultData;
1616
import com.databricks.jdbc.model.core.ResultManifest;

src/main/java/com/databricks/jdbc/api/impl/ChunkExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import com.databricks.jdbc.common.CompressionType;
66
import com.databricks.jdbc.common.LogLevel;
77
import com.databricks.jdbc.common.util.LoggingUtil;
8-
import com.databricks.jdbc.dbclient.impl.thrift.generated.*;
98
import com.databricks.jdbc.exception.DatabricksParsingException;
109
import com.databricks.jdbc.exception.DatabricksSQLException;
10+
import com.databricks.jdbc.model.client.thrift.generated.*;
1111
import com.google.common.annotations.VisibleForTesting;
1212
import java.io.ByteArrayInputStream;
1313
import java.io.ByteArrayOutputStream;

src/main/java/com/databricks/jdbc/api/impl/DatabricksResultSet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import com.databricks.jdbc.common.StatementType;
1212
import com.databricks.jdbc.common.util.LoggingUtil;
1313
import com.databricks.jdbc.common.util.WarningUtil;
14-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TGetResultSetMetadataResp;
15-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TRowSet;
16-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TStatus;
1714
import com.databricks.jdbc.exception.DatabricksSQLException;
1815
import com.databricks.jdbc.exception.DatabricksSQLFeatureNotSupportedException;
16+
import com.databricks.jdbc.model.client.thrift.generated.TGetResultSetMetadataResp;
17+
import com.databricks.jdbc.model.client.thrift.generated.TRowSet;
18+
import com.databricks.jdbc.model.client.thrift.generated.TStatus;
1919
import com.databricks.jdbc.model.core.ResultData;
2020
import com.databricks.jdbc.model.core.ResultManifest;
2121
import com.databricks.sdk.service.sql.StatementState;

src/main/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaData.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import com.databricks.jdbc.common.util.DatabricksTypeUtil;
1111
import com.databricks.jdbc.common.util.LoggingUtil;
1212
import com.databricks.jdbc.common.util.WrapperUtil;
13-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TColumnDesc;
14-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TGetResultSetMetadataResp;
15-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TTypeEntry;
16-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TTypeQualifierValue;
13+
import com.databricks.jdbc.model.client.thrift.generated.TColumnDesc;
14+
import com.databricks.jdbc.model.client.thrift.generated.TGetResultSetMetadataResp;
15+
import com.databricks.jdbc.model.client.thrift.generated.TTypeEntry;
16+
import com.databricks.jdbc.model.client.thrift.generated.TTypeQualifierValue;
1717
import com.databricks.jdbc.model.core.ResultManifest;
1818
import com.databricks.sdk.service.sql.ColumnInfo;
1919
import com.databricks.sdk.service.sql.ColumnInfoTypeName;

src/main/java/com/databricks/jdbc/api/impl/ExecutionResultFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import com.databricks.jdbc.api.IDatabricksSession;
77
import com.databricks.jdbc.api.IDatabricksStatement;
88
import com.databricks.jdbc.common.util.DatabricksThriftUtil;
9-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TGetResultSetMetadataResp;
10-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TRowSet;
119
import com.databricks.jdbc.exception.DatabricksSQLException;
1210
import com.databricks.jdbc.exception.DatabricksSQLFeatureNotImplementedException;
1311
import com.databricks.jdbc.exception.DatabricksSQLFeatureNotSupportedException;
12+
import com.databricks.jdbc.model.client.thrift.generated.TGetResultSetMetadataResp;
13+
import com.databricks.jdbc.model.client.thrift.generated.TRowSet;
1414
import com.databricks.jdbc.model.core.ResultData;
1515
import com.databricks.jdbc.model.core.ResultManifest;
1616
import java.util.List;

src/main/java/com/databricks/jdbc/api/impl/SessionInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.databricks.jdbc.api.impl;
22

33
import com.databricks.jdbc.common.IDatabricksComputeResource;
4-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TSessionHandle;
4+
import com.databricks.jdbc.model.client.thrift.generated.TSessionHandle;
55
import javax.annotation.Nullable;
66
import org.immutables.value.Value;
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.databricks.jdbc.common;
22

3-
import com.databricks.jdbc.dbclient.impl.thrift.generated.TProtocolVersion;
3+
import com.databricks.jdbc.model.client.thrift.generated.TProtocolVersion;
44

55
public final class EnvironmentVariables {
66
public static final int DEFAULT_STATEMENT_TIMEOUT_SECONDS = 300; // Timeout of 5 minutes

src/main/java/com/databricks/jdbc/common/util/DatabricksThriftUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import static com.databricks.jdbc.common.util.DatabricksTypeUtil.*;
55

66
import com.databricks.jdbc.common.LogLevel;
7-
import com.databricks.jdbc.dbclient.impl.thrift.generated.*;
87
import com.databricks.jdbc.exception.DatabricksHttpException;
8+
import com.databricks.jdbc.model.client.thrift.generated.*;
99
import com.databricks.jdbc.model.core.ExternalLink;
1010
import com.databricks.sdk.service.sql.ColumnInfoTypeName;
1111
import java.nio.ByteBuffer;

0 commit comments

Comments
 (0)