Skip to content

Commit c2c9a0e

Browse files
authored
refactor(jdbc): decouple from databend-client.
refactor(jdbc): decouple from databend-client.
2 parents f451d85 + 8f75e1e commit c2c9a0e

98 files changed

Lines changed: 4029 additions & 1348 deletions

File tree

Some content is hidden

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

databend-jdbc/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
<packaging>jar</packaging>
1616

1717
<dependencies>
18-
<dependency>
19-
<groupId>com.databend</groupId>
20-
<artifactId>databend-client</artifactId>
21-
<version>0.4.6</version>
22-
</dependency>
2318
<dependency>
2419
<groupId>com.squareup.okhttp3</groupId>
2520
<artifactId>okhttp</artifactId>
@@ -38,6 +33,10 @@
3833
<groupId>com.fasterxml.jackson.core</groupId>
3934
<artifactId>jackson-databind</artifactId>
4035
</dependency>
36+
<dependency>
37+
<groupId>com.fasterxml.jackson.datatype</groupId>
38+
<artifactId>jackson-datatype-jdk8</artifactId>
39+
</dependency>
4140
<dependency>
4241
<groupId>com.vdurmont</groupId>
4342
<artifactId>semver4j</artifactId>

databend-jdbc/src/main/java/com/databend/jdbc/AbstractDatabendResultSet.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.databend.jdbc;
22

3-
import com.databend.client.QueryResults;
4-
import com.databend.client.QueryRowField;
5-
import com.databend.client.data.DatabendDataType;
6-
import com.databend.client.data.DatabendRawType;
7-
import com.databend.client.data.DatabendTypes;
8-
import com.databend.client.errors.QueryErrors;
3+
import com.databend.jdbc.internal.data.DatabendDataType;
4+
import com.databend.jdbc.internal.data.DatabendRawType;
5+
import com.databend.jdbc.internal.data.DatabendTypes;
6+
import com.databend.jdbc.internal.data.IntervalCodec;
7+
import com.databend.jdbc.internal.error.QueryError;
8+
import com.databend.jdbc.internal.query.QueryResults;
9+
import com.databend.jdbc.internal.query.QueryRowField;
910
import com.databend.jdbc.annotation.NotImplemented;
10-
import com.databend.jdbc.exception.DatabendUnsupportedOperationException;
1111
import com.databend.jdbc.exception.DatabendSQLException;
1212
import com.google.common.collect.ImmutableList;
1313
import com.google.common.collect.ImmutableMap;
@@ -150,7 +150,7 @@ private static BigDecimal parseBigDecimal(String value)
150150
}
151151

152152
static SQLException resultsException(QueryResults results, String originalSQL) {
153-
QueryErrors error = requireNonNull(results.getError());
153+
QueryError error = requireNonNull(results.getError());
154154
String message = format("SQL: (%s) Query failed (query_id=%s): %s", originalSQL, results.getQueryId(), error.getMessage());
155155
return new SQLException(message, String.valueOf(error.getCode()));
156156
}
@@ -724,7 +724,7 @@ public Object getObject(int columnIndex)
724724
if (!(value instanceof String)) {
725725
throw new SQLDataException("Interval value is not textual: " + value.getClass().getName());
726726
}
727-
return Interval.decode((String) value);
727+
return IntervalCodec.decode((String) value);
728728
}
729729
return value;
730730
}
@@ -1411,7 +1411,7 @@ public void updateRowId(String columnLabel, RowId x)
14111411
@Override
14121412
@NotImplemented
14131413
public int getHoldability() throws SQLException {
1414-
throw new DatabendUnsupportedOperationException();
1414+
throw new SQLFeatureNotSupportedException("getHoldability");
14151415
}
14161416

14171417
@Override

databend-jdbc/src/main/java/com/databend/jdbc/ConnectionProperties.java

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

3-
import com.databend.client.PaginationOptions;
3+
import com.databend.jdbc.internal.session.PaginationOptions;
44
import com.google.common.collect.ImmutableMap;
55
import com.google.common.collect.ImmutableSet;
66

databend-jdbc/src/main/java/com/databend/jdbc/DatabendColumnInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.databend.jdbc;
22

3-
import com.databend.client.data.DatabendRawType;
4-
import com.databend.client.data.DatabendTypes;
3+
import com.databend.jdbc.internal.data.DatabendRawType;
4+
import com.databend.jdbc.internal.data.DatabendTypes;
55
import com.google.common.base.Preconditions;
66
import com.google.common.base.Strings;
77
import com.google.common.collect.ImmutableList;

0 commit comments

Comments
 (0)