diff --git a/be/src/runtime/buffer_control_block.cpp b/be/src/runtime/buffer_control_block.cpp index 7513dc46e7b863..e16cad020bf09d 100644 --- a/be/src/runtime/buffer_control_block.cpp +++ b/be/src/runtime/buffer_control_block.cpp @@ -232,7 +232,7 @@ Status BufferControlBlock::get_arrow_batch(std::shared_ptr* if (_is_close) { return Status::OK(); } - return Status::InternalError("Abnormal Ending"); + return Status::InternalError("Get Arrow Batch Abnormal Ending"); } Status BufferControlBlock::close(Status exec_status) { diff --git a/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp b/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp index d2b45a0b77c6ef..a07e479d759be7 100644 --- a/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp +++ b/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp @@ -43,7 +43,7 @@ arrow::Result> ArrowFlightBatchReader::C auto schema = ExecEnv::GetInstance()->result_mgr()->find_arrow_schema(statement_->query_id); if (schema == nullptr) { ARROW_RETURN_NOT_OK(arrow::Status::Invalid(fmt::format( - "not found arrow flight schema, maybe query has been canceled, queryid: {}", + "Client not found arrow flight schema, maybe query has been canceled, queryid: {}", print_id(statement_->query_id)))); } std::shared_ptr result(new ArrowFlightBatchReader(statement_, schema)); diff --git a/be/src/service/internal_service.cpp b/be/src/service/internal_service.cpp index f4831d08d2959e..c831193eea9d2a 100644 --- a/be/src/service/internal_service.cpp +++ b/be/src/service/internal_service.cpp @@ -851,9 +851,9 @@ void PInternalServiceImpl::fetch_arrow_flight_schema(google::protobuf::RpcContro ExecEnv::GetInstance()->result_mgr()->find_arrow_schema( UniqueId(request->finst_id()).to_thrift()); if (schema == nullptr) { - LOG(INFO) << "not found arrow flight schema, maybe query has been canceled"; + LOG(INFO) << "FE not found arrow flight schema, maybe query has been canceled"; auto st = Status::NotFound( - "not found arrow flight schema, maybe query has been canceled"); + "FE not found arrow flight schema, maybe query has been canceled"); st.to_protobuf(result->mutable_status()); return; } diff --git a/regression-test/conf/regression-conf.groovy b/regression-test/conf/regression-conf.groovy index 5dde9df043df0f..61c520864a01d5 100644 --- a/regression-test/conf/regression-conf.groovy +++ b/regression-test/conf/regression-conf.groovy @@ -198,7 +198,7 @@ s3Region = "ap-hongkong" //arrow flight sql test config extArrowFlightSqlHost = "127.0.0.1" -extArrowFlightSqlPort = 9090 +extArrowFlightSqlPort = 8080 extArrowFlightSqlUser = "root" extArrowFlightSqlPassword= "" diff --git a/regression-test/pipeline/p0/conf/fe.conf b/regression-test/pipeline/p0/conf/fe.conf index 80fd1d84af68e0..0b313cb4c5b687 100644 --- a/regression-test/pipeline/p0/conf/fe.conf +++ b/regression-test/pipeline/p0/conf/fe.conf @@ -34,7 +34,7 @@ JAVA_OPTS="-Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx4096m -XX: JAVA_OPTS_FOR_JDK_9="-Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$DORIS_HOME/log/fe.jmap -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:$DORIS_HOME/log/fe.gc.log.$CUR_DATE -Dlog4j2.formatMsgNoLookups=true" # For jdk 17+, this JAVA_OPTS will be used as default JVM options -JAVA_OPTS_FOR_JDK_17="-Djavax.security.auth.useSubjectCredsOnly=false -Xmx8192m -Xms8192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$DORIS_HOME/log/ -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$CUR_DATE:time" +JAVA_OPTS_FOR_JDK_17="-Djavax.security.auth.useSubjectCredsOnly=false -Xmx8192m -Xms8192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$DORIS_HOME/log/ -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$CUR_DATE:time --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED" ## ## the lowercase properties are read by main program. @@ -43,7 +43,7 @@ JAVA_OPTS_FOR_JDK_17="-Djavax.security.auth.useSubjectCredsOnly=false -Xmx8192m # INFO, WARN, ERROR, FATAL sys_log_level = INFO -arrow_flight_sql_port = 8080 +arrow_flight_sql_port = 8081 # store metadata, must be created before start FE. # Default value is ${DORIS_HOME}/doris-meta diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy b/regression-test/pipeline/p0/conf/regression-conf.groovy index 98b8520194a4fa..97541c9ccf1573 100644 --- a/regression-test/pipeline/p0/conf/regression-conf.groovy +++ b/regression-test/pipeline/p0/conf/regression-conf.groovy @@ -136,6 +136,12 @@ s3Endpoint = "cos.ap-hongkong.myqcloud.com" s3BucketName = "doris-build-hk-1308700295" s3Region = "ap-hongkong" +//arrow flight sql test config +extArrowFlightSqlHost = "127.0.0.1" +extArrowFlightSqlPort = 8081 +extArrowFlightSqlUser = "root" +extArrowFlightSqlPassword= "" + max_failure_num=50 externalEnvIp="127.0.0.1"