Skip to content

Commit b7594dd

Browse files
authored
Merge pull request #379 from databricks/thrift-metadata-changes-for-test
Thrift metadata changes for universe tests
2 parents b9849d6 + 8dabae2 commit b7594dd

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/main/java/com/databricks/jdbc/client/impl/helper/MetadataResultConstants.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class MetadataResultConstants {
4848
private static final ResultColumn COLUMN_TYPE_COLUMN =
4949
new ResultColumn("TYPE_NAME", "columnType", Types.VARCHAR);
5050
private static final ResultColumn BUFFER_LENGTH_COLUMN =
51-
new ResultColumn("BUFFER_LENGTH", "bufferLength", Types.INTEGER);
51+
new ResultColumn("BUFFER_LENGTH", "bufferLength", Types.SMALLINT);
5252
private static final ResultColumn COLUMN_SIZE_COLUMN =
5353
new ResultColumn("COLUMN_SIZE", "columnSize", Types.INTEGER);
5454
private static final ResultColumn PRECISION_COLUMN =
@@ -234,8 +234,8 @@ public class MetadataResultConstants {
234234
SCHEMA_COLUMN,
235235
TABLE_NAME_COLUMN,
236236
COLUMN_NAME_COLUMN,
237+
DATA_TYPE_COLUMN,
237238
COLUMN_TYPE_COLUMN,
238-
TYPE_NAME_COLUMN,
239239
COLUMN_SIZE_COLUMN,
240240
BUFFER_LENGTH_COLUMN,
241241
DECIMAL_DIGITS_COLUMN,
@@ -249,7 +249,6 @@ public class MetadataResultConstants {
249249
ORDINAL_POSITION_COLUMN,
250250
IS_NULLABLE_COLUMN,
251251
IS_AUTO_INCREMENT_COLUMN,
252-
USER_DATA_TYPE_COLUMN,
253252
IS_GENERATED_COLUMN);
254253
public static String NULL_STRING = "NULL";
255254

src/main/java/com/databricks/jdbc/client/impl/thrift/DatabricksThriftServiceClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public DatabricksResultSet listFunctions(
307307
TFetchResultsResp response =
308308
(TFetchResultsResp)
309309
thriftAccessor.getThriftResponse(request, CommandName.LIST_FUNCTIONS, null);
310-
return getFunctionsResult(extractValues(response.getResults().getColumns()));
310+
return getFunctionsResult(extractValuesColumnar(response.getResults().getColumns()));
311311
}
312312

313313
@Override

0 commit comments

Comments
 (0)