This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5694f1b04b [fix](conf) revert changes in `regression-conf.groovy` in
#23702 and fix BE compile error (#23788)
5694f1b04b is described below
commit 5694f1b04b319a2a2488089ae4e1cd8130647445
Author: bobhan1 <[email protected]>
AuthorDate: Sat Sep 2 22:31:49 2023 +0800
[fix](conf) revert changes in `regression-conf.groovy` in #23702 and fix BE
compile error (#23788)
---
be/src/service/backend_service.cpp | 4 ++--
regression-test/conf/regression-conf.groovy | 17 ++++++++++++-----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/be/src/service/backend_service.cpp
b/be/src/service/backend_service.cpp
index c674e3e421..53dce649b9 100644
--- a/be/src/service/backend_service.cpp
+++ b/be/src/service/backend_service.cpp
@@ -705,8 +705,8 @@ void BackendService::ingest_binlog(TIngestBinlogResult&
result,
if (local_tablet->enable_unique_key_merge_on_write()) {
StorageEngine::instance()->txn_manager()->set_txn_related_delete_bitmap(
- partition_id, txn_id, local_tablet_id,
local_tablet->schema_hash(),
- local_tablet->tablet_uid(), true, delete_bitmap,
pre_rowset_ids);
+ partition_id, txn_id, local_tablet_id,
local_tablet->tablet_uid(), true,
+ delete_bitmap, pre_rowset_ids);
}
tstatus.__set_status_code(TStatusCode::OK);
diff --git a/regression-test/conf/regression-conf.groovy
b/regression-test/conf/regression-conf.groovy
index d9c22bc04e..01e61e64f9 100644
--- a/regression-test/conf/regression-conf.groovy
+++ b/regression-test/conf/regression-conf.groovy
@@ -24,17 +24,18 @@ defaultDb = "regression_test"
// init cmd like: select @@session.tx_read_only
// at each time we connect.
// add allowLoadLocalInfile so that the jdbc can execute mysql load data from
client.
-jdbcUrl =
"jdbc:mysql://127.0.0.1:9134/?useLocalSessionState=true&allowLoadLocalInfile=true"
-targetJdbcUrl =
"jdbc:mysql://127.0.0.1:9134/?useLocalSessionState=true&allowLoadLocalInfile=true"
+jdbcUrl =
"jdbc:mysql://127.0.0.1:9030/?useLocalSessionState=true&allowLoadLocalInfile=true"
+targetJdbcUrl =
"jdbc:mysql://127.0.0.1:9030/?useLocalSessionState=true&allowLoadLocalInfile=true"
jdbcUser = "root"
jdbcPassword = ""
-feSourceThriftAddress = "127.0.0.1:9124"
-feTargetThriftAddress = "127.0.0.1:9124"
+feSourceThriftAddress = "127.0.0.1:9020"
+feTargetThriftAddress = "127.0.0.1:9020"
+syncerAddress = "127.0.0.1:9190"
feSyncerUser = "root"
feSyncerPassword = ""
-feHttpAddress = "127.0.0.1:8134"
+feHttpAddress = "127.0.0.1:8030"
feHttpUser = "root"
feHttpPassword = ""
@@ -84,6 +85,7 @@ pg_14_port=5442
oracle_11_port=1521
sqlserver_2022_port=1433
clickhouse_22_port=8123
+doris_port=9030
// hive catalog test config
// To enable hive test, you need first start hive container.
@@ -108,6 +110,9 @@ extHdfsPort = 4007
extHiveHmsUser = "****"
extHiveHmsPassword= "***********"
+//paimon catalog test config for bigdata
+enableExternalPaimonTest = false
+
//mysql jdbc connector test config for bigdata
enableExternalMysqlTest = false
extMysqlHost = "***.**.**.**"
@@ -140,3 +145,5 @@ max_failure_num=0
// used for exporting test
s3ExportBucketName = ""
+
+externalEnvIp="127.0.0.1"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
