Skip to content

Commit 6ea132d

Browse files
committed
update code
1 parent 1cc9e1a commit 6ea132d

File tree

6 files changed

+2
-15
lines changed

6 files changed

+2
-15
lines changed

fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/ClickHouseJdbcExecutor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ protected Object getColumnValue(int columnIndex, ColumnType type, String[] repla
8888
return resultSet.getObject(columnIndex + 1, String.class);
8989
case ARRAY:
9090
return convertArrayToList(resultSet.getArray(columnIndex + 1).getArray());
91-
case VARBINARY:
92-
return resultSet.getObject(columnIndex + 1, byte[].class);
9391
default:
9492
throw new IllegalArgumentException("Unsupported column type: " + type.getType());
9593
}

fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/GbaseJdbcExecutor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ protected Object getColumnValue(int columnIndex, ColumnType type, String[] repla
7373
case STRING:
7474
String stringVal = (String) resultSet.getObject(columnIndex + 1);
7575
return resultSet.wasNull() ? null : stringVal;
76-
case VARBINARY:
77-
byte[] bytesVal = resultSet.getBytes(columnIndex + 1);
78-
return resultSet.wasNull() ? null : bytesVal;
7976
default:
8077
throw new IllegalArgumentException("Unsupported column type: " + type.getType());
8178
}

fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/SapHanaJdbcExecutor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ protected Object getColumnValue(int columnIndex, ColumnType type, String[] repla
9393
case VARCHAR:
9494
case STRING:
9595
return resultSet.getObject(columnIndex + 1);
96-
case VARBINARY:
97-
return resultSet.getObject(columnIndex + 1, byte[].class);
9896
default:
9997
throw new IllegalArgumentException("Unsupported column type: " + type.getType());
10098
}

fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcGbaseClient.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ protected Type jdbcTypeToDoris(JdbcFieldSchema fieldSchema) {
147147
case Types.VARCHAR:
148148
case Types.LONGVARCHAR:
149149
return ScalarType.createStringType();
150-
case Types.BINARY:
151-
case Types.VARBINARY:
152-
return enableMappingVarbinary ? ScalarType.createVarbinaryType(fieldSchema.requiredColumnSize())
153-
: ScalarType.createStringType();
154150
default:
155151
return Type.UNSUPPORTED;
156152
}

fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcSapHanaClient.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,9 @@ protected Type jdbcTypeToDoris(JdbcFieldSchema fieldSchema) {
8989
case "NCLOB":
9090
case "TEXT":
9191
case "BINTEXT":
92-
return ScalarType.createStringType();
9392
case "BINARY":
9493
case "VARBINARY":
95-
return enableMappingVarbinary ? ScalarType.createVarbinaryType(fieldSchema.requiredColumnSize())
96-
: ScalarType.createStringType();
94+
return ScalarType.createStringType();
9795
case "BLOB":
9896
case "ST_GEOMETRY":
9997
case "ST_POINT":

regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ suite("test_sqlserver_jdbc_catalog", "p0,external,sqlserver,external_docker,exte
108108
"jdbc_url" = "jdbc:sqlserver://${externalEnvIp}:${sqlserver_port};encrypt=false;databaseName=doris_test;trustServerCertificate=false",
109109
"driver_url" = "${driver_url}",
110110
"driver_class" = "com.microsoft.sqlserver.jdbc.SQLServerDriver",
111-
"enable.mapping.binary" = "true"
111+
"enable.mapping.varbinary" = "true"
112112
);"""
113113
sql """ switch test_sqlserver_jdbc_catalog_binary """
114114
sql """ use ${ex_db_name} """

0 commit comments

Comments
 (0)