Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature][Connector-V2][Jdbc] support gbase 8a #3026

Merged
merged 27 commits into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
eb44fc4
gbase 8a connector
liugddx Oct 8, 2022
e8a1ecc
Merge remote-tracking branch 'upstream/dev' into jdbc-gbase8a
liugddx Oct 9, 2022
74928f9
add gbase8a e2e test
liugddx Oct 10, 2022
9971e65
add gbase8a e2e test
liugddx Oct 10, 2022
c1c86a7
fix some error
liugddx Oct 10, 2022
6582058
fix some error
liugddx Oct 11, 2022
f524864
FIX time type error
liugddx Oct 11, 2022
106db76
FIX time type error
liugddx Oct 11, 2022
186418b
FIX time type error
liugddx Oct 11, 2022
cc26aa8
FIX time type error
liugddx Oct 11, 2022
6f979b6
add gbase8a doc
liugddx Oct 11, 2022
1df87b6
Merge remote-tracking branch 'upstream/dev' into jdbc-gbase8a
liugddx Oct 12, 2022
f7845c4
reslove merge error
liugddx Oct 12, 2022
f13c34f
fix oracle connector error
liugddx Oct 12, 2022
373e8f9
fix oracle connector error
liugddx Oct 12, 2022
d4fb795
fix oracle float precision problem
liugddx Oct 13, 2022
e13d2d5
Merge remote-tracking branch 'upstream/dev' into jdbc-gbase8a
liugddx Oct 13, 2022
271e968
fix some error
liugddx Oct 13, 2022
ec75d10
fix some error
liugddx Oct 13, 2022
51f05c6
Merge remote-tracking branch 'upstream/dev' into jdbc-gbase8a
liugddx Oct 14, 2022
b14234c
Update seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apach…
liugddx Oct 16, 2022
d0430dd
Merge branch 'dev' into jdbc-gbase8a
Hisoka-X Oct 18, 2022
52a0de4
fix jdbc e2e test error
liugddx Oct 18, 2022
179aa2f
revert gbase8a date type.
liugddx Oct 18, 2022
84eef7e
modify gbase8a e2e test
liugddx Oct 18, 2022
fe7f505
fix jdbc connector e2e bug
liugddx Oct 19, 2022
b3b1779
revert code
liugddx Oct 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/en/connector-v2/sink/Jdbc.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ there are some reference value for params above.
| phoenix | org.apache.phoenix.queryserver.client.Driver | jdbc:phoenix:thin:url=http://localhost:8765;serialization=PROTOBUF | / | https://mvnrepository.com/artifact/com.aliyun.phoenix/ali-phoenix-shaded-thin-client |
| sqlserver | com.microsoft.sqlserver.jdbc.SQLServerDriver | jdbc:microsoft:sqlserver://localhost:1433 | com.microsoft.sqlserver.jdbc.SQLServerXADataSource | https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc |
| oracle | oracle.jdbc.OracleDriver | jdbc:oracle:thin:@localhost:1521/xepdb1 | oracle.jdbc.xa.OracleXADataSource | https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc8 |
| gbase8a | com.gbase.jdbc.Driver | jdbc:gbase://e2e_gbase8aDb:5258/test | / | https://www.gbase8.cn/wp-content/uploads/2020/10/gbase-connector-java-8.3.81.53-build55.5.7-bin_min_mix.jar |

## Example

Expand Down
1 change: 1 addition & 0 deletions docs/en/connector-v2/source/Jdbc.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ there are some reference value for params above.
| phoenix | org.apache.phoenix.queryserver.client.Driver | jdbc:phoenix:thin:url=http://localhost:8765;serialization=PROTOBUF | https://mvnrepository.com/artifact/com.aliyun.phoenix/ali-phoenix-shaded-thin-client |
| sqlserver | com.microsoft.sqlserver.jdbc.SQLServerDriver | jdbc:microsoft:sqlserver://localhost:1433 | https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc |
| oracle | oracle.jdbc.OracleDriver | jdbc:oracle:thin:@localhost:1521/xepdb1 | https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc8 |
| gbase8a | com.gbase.jdbc.Driver | jdbc:gbase://e2e_gbase8aDb:5258/test | https://www.gbase8.cn/wp-content/uploads/2020/10/gbase-connector-java-8.3.81.53-build55.5.7-bin_min_mix.jar |

## Example

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.seatunnel.api.table.type;

import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Objects;

public class SqlDateType<T> implements SeaTunnelDataType<T> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ashulin PTAL about add new SqlDateType.

Copy link
Member

@ashulin ashulin Oct 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, this is not necessary.
The same effect can be achieved using LocalTimeType.
Multiple time types can confuse developers/users

private static final long serialVersionUID = 2L;

public static final SqlDateType<Date> SQL_DATE_TYPE = new SqlDateType<>(Date.class, SqlType.DATE);
public static final SqlDateType<Time> SQL_TIME_TYPE = new SqlDateType<>(Time.class, SqlType.TIME);
public static final SqlDateType<Timestamp> SQL_DATE_TIME_TYPE = new SqlDateType<>(Timestamp.class, SqlType.TIMESTAMP);

private final Class<T> typeClass;
private final SqlType sqlType;

private SqlDateType(Class<T> typeClass, SqlType sqlType) {
this.typeClass = typeClass;
this.sqlType = sqlType;
}

@Override
public Class<T> getTypeClass() {
return typeClass;
}

@Override
public SqlType getSqlType() {
return this.sqlType;
}

@Override
public int hashCode() {
return Objects.hash(typeClass);
}

@Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
}
if (!(obj instanceof SqlDateType)) {
return false;
}
SqlDateType<?> that = (SqlDateType<?>) obj;
return Objects.equals(typeClass, that.typeClass);
}

@Override
public String toString() {
return sqlType.toString();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.gbase8a;

import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.JdbcRowConverter;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectTypeMapper;

public class Gbase8aDialect implements JdbcDialect {
@Override
public String dialectName() {
return "Gbase8a";
}

@Override
public JdbcRowConverter getRowConverter() {
return new Gbase8aJdbcRowConverter();
}

@Override
public JdbcDialectTypeMapper getJdbcDialectTypeMapper() {
return new Gbase8aTypeMapper();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.gbase8a;

import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectFactory;

import com.google.auto.service.AutoService;

@AutoService(JdbcDialectFactory.class)
public class Gbase8aDialectFactory implements JdbcDialectFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:gbase:");
}

@Override
public JdbcDialect create() {
return new Gbase8aDialect();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.gbase8a;

import org.apache.seatunnel.api.table.type.BasicType;
import org.apache.seatunnel.api.table.type.DecimalType;
import org.apache.seatunnel.api.table.type.PrimitiveByteArrayType;
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
import org.apache.seatunnel.api.table.type.SqlDateType;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.AbstractJdbcRowConverter;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;

public class Gbase8aJdbcRowConverter extends AbstractJdbcRowConverter {
@Override
public String converterName() {
return "Gbase8a";
}

@Override
public SeaTunnelRow toInternal(ResultSet rs, ResultSetMetaData metaData, SeaTunnelRowType typeInfo) throws SQLException {
List<Object> fields = new ArrayList<>();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gave a init length is better.

SeaTunnelDataType<?>[] seaTunnelDataTypes = typeInfo.getFieldTypes();

for (int i = 1; i <= seaTunnelDataTypes.length; i++) {
Object seatunnelField;
SeaTunnelDataType<?> seaTunnelDataType = seaTunnelDataTypes[i - 1];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use seaTunnelDataType.getSqlType() is better.

if (null == rs.getObject(i)) {
seatunnelField = null;
} else if (BasicType.BOOLEAN_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getBoolean(i);
} else if (BasicType.BYTE_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getByte(i);
} else if (BasicType.SHORT_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getShort(i);
} else if (BasicType.INT_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getInt(i);
} else if (BasicType.LONG_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getLong(i);
} else if (seaTunnelDataType instanceof DecimalType) {
Object value = rs.getObject(i);
seatunnelField = value instanceof BigInteger ?
new BigDecimal((BigInteger) value, 0)
: value;
} else if (BasicType.FLOAT_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getFloat(i);
} else if (BasicType.DOUBLE_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getDouble(i);
} else if (BasicType.STRING_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getString(i);
} else if (SqlDateType.SQL_TIME_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getTime(i);
} else if (SqlDateType.SQL_DATE_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getDate(i);
} else if (SqlDateType.SQL_DATE_TIME_TYPE.equals(seaTunnelDataType)) {
seatunnelField = rs.getTimestamp(i);
} else if (PrimitiveByteArrayType.INSTANCE.equals(seaTunnelDataType)) {
seatunnelField = rs.getBytes(i);
} else {
throw new IllegalStateException("Unexpected value: " + seaTunnelDataType);
}

fields.add(seatunnelField);
}

return new SeaTunnelRow(fields.toArray());
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.gbase8a;

import org.apache.seatunnel.api.table.type.BasicType;
import org.apache.seatunnel.api.table.type.DecimalType;
import org.apache.seatunnel.api.table.type.PrimitiveByteArrayType;
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
import org.apache.seatunnel.api.table.type.SqlDateType;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectTypeMapper;

import lombok.extern.slf4j.Slf4j;

import java.sql.ResultSetMetaData;
import java.sql.SQLException;

@Slf4j
public class Gbase8aTypeMapper implements JdbcDialectTypeMapper {

//ref http://www.gbase.cn/down/4419.html
// ============================data types=====================
private static final String GBASE8A_UNKNOWN = "UNKNOWN";

// -------------------------number----------------------------
private static final String GBASE8A_INT = "INT";
private static final String GBASE8A_TINYINT = "TINYINT";
private static final String GBASE8A_SMALLINT = "SMALLINT";
private static final String GBASE8A_BIGINT = "BIGINT";
private static final String GBASE8A_DECIMAL = "DECIMAL";
private static final String GBASE8A_FLOAT = "FLOAT";
private static final String GBASE8A_DOUBLE = "DOUBLE";

// -------------------------string----------------------------
private static final String GBASE8A_CHAR = "CHAR";
private static final String GBASE8A_VARCHAR = "VARCHAR";


// ------------------------------time-------------------------
private static final String GBASE8A_DATE = "DATE";
private static final String GBASE8A_TIME = "TIME";
private static final String GBASE8A_TIMESTAMP = "TIMESTAMP";
private static final String GBASE8A_DATETIME = "DATETIME";

// ------------------------------blob-------------------------
private static final String GBASE8A_BLOB = "BLOB";
private static final String GBASE8A_TEXT = "TEXT";

@SuppressWarnings("checkstyle:MagicNumber")
@Override
public SeaTunnelDataType<?> mapping(ResultSetMetaData metadata, int colIndex) throws SQLException {
String gbase8aType = metadata.getColumnTypeName(colIndex).toUpperCase();
int precision = metadata.getPrecision(colIndex);
int scale = metadata.getScale(colIndex);
switch (gbase8aType) {
case GBASE8A_TINYINT:
return BasicType.BYTE_TYPE;
case GBASE8A_SMALLINT:
return BasicType.SHORT_TYPE;
case GBASE8A_INT:
return BasicType.INT_TYPE;
case GBASE8A_BIGINT:
return BasicType.LONG_TYPE;
case GBASE8A_DECIMAL:
if (precision < 38) {
return new DecimalType(precision, scale);
}
return new DecimalType(38, 18);
case GBASE8A_DOUBLE:
return BasicType.DOUBLE_TYPE;
case GBASE8A_FLOAT:
return BasicType.FLOAT_TYPE;
case GBASE8A_CHAR:
case GBASE8A_VARCHAR:
return BasicType.STRING_TYPE;
case GBASE8A_DATE:
return SqlDateType.SQL_DATE_TYPE;
case GBASE8A_TIME:
return SqlDateType.SQL_TIME_TYPE;
case GBASE8A_TIMESTAMP:
case GBASE8A_DATETIME:
return SqlDateType.SQL_DATE_TIME_TYPE;
case GBASE8A_BLOB:
case GBASE8A_TEXT:
return PrimitiveByteArrayType.INSTANCE;
//Doesn't support yet
case GBASE8A_UNKNOWN:
default:
final String jdbcColumnName = metadata.getColumnName(colIndex);
throw new UnsupportedOperationException(
String.format(
"Doesn't support GBASE8A type '%s' on column '%s' yet.",
gbase8aType, jdbcColumnName));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,9 @@ public SeaTunnelDataType<?> mapping(ResultSetMetaData metadata, int colIndex) th
switch (oracleType) {
case ORACLE_INTEGER:
return BasicType.INT_TYPE;
case ORACLE_FLOAT:
case ORACLE_NUMBER:
if (precision < 38) {
return new DecimalType(precision, scale);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment about why delete this?

return new DecimalType(38, 18);
case ORACLE_FLOAT:
case ORACLE_BINARY_DOUBLE:
return BasicType.DOUBLE_TYPE;
case ORACLE_BINARY_FLOAT:
Expand Down
Loading