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](multi-catalog) support postgresql jdbc catalog #15570

Merged
merged 6 commits into from
Jan 6, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix 2
  • Loading branch information
BePPPower committed Jan 3, 2023
commit 9d6ca90d395f0504b60bf7d366dc0c249671c032
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ public Type postgresqlTypeToDoris(JdbcFieldSchema fieldSchema) {
case "bigserial":
return Type.BIGINT;
case "numeric": {
int precision = fieldSchema.getColumnSize() + 1;
int precision = fieldSchema.getColumnSize();
int scale = fieldSchema.getDecimalDigits();
if (precision <= ScalarType.MAX_DECIMAL128_PRECISION) {
if (!Config.enable_decimal_conversion && precision > ScalarType.MAX_DECIMALV2_PRECISION) {
Expand Down
16 changes: 8 additions & 8 deletions regression-test/conf/regression-conf.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ defaultDb = "regression_test"
// add useLocalSessionState so that the jdbc will not send
// init cmd like: select @@session.tx_read_only
// at each time we connect.
jdbcUrl = "jdbc:mysql://127.0.0.1:9030/?useLocalSessionState=true"
jdbcUrl = "jdbc:mysql://127.0.0.1:9139/?useLocalSessionState=true"
jdbcUser = "root"
jdbcPassword = ""

feHttpAddress = "127.0.0.1:8030"
feHttpAddress = "127.0.0.1:8139"
feHttpUser = "root"
feHttpPassword = ""

Expand Down Expand Up @@ -70,16 +70,16 @@ sk=""
// jdbc connector test config
// To enable jdbc test, you need first start mysql/pg container.
// See `docker/thirdparties/start-thirdparties-docker.sh`
enableJdbcTest=false
mysql_57_port=3316
pg_14_port=5442
enableJdbcTest=true
mysql_57_port=3359
pg_14_port=5449

// hive catalog test config
// To enable jdbc test, you need first start hive container.
// See `docker/thirdparties/start-thirdparties-docker.sh`
enableHiveTest=false
hms_port=9183
hdfs_port=8120
enableHiveTest=true
hms_port=9484
hdfs_port=8424

// elasticsearch catalog test config
// See `docker/thirdparties/start-thirdparties-docker.sh`
Expand Down