diff --git a/be/src/pipeline/exec/result_sink_operator.cpp b/be/src/pipeline/exec/result_sink_operator.cpp index 73409bada12f75..62fcc50fbd46b6 100644 --- a/be/src/pipeline/exec/result_sink_operator.cpp +++ b/be/src/pipeline/exec/result_sink_operator.cpp @@ -56,14 +56,14 @@ Status ResultSinkLocalState::init(RuntimeState* state, LocalSinkStateInfo& info) _sender = _parent->cast()._sender; } else { std::shared_ptr arrow_schema; - if (p._sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCAL) { + if (p._sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCOL) { RETURN_IF_ERROR(get_arrow_schema_from_expr_ctxs(_output_vexpr_ctxs, &arrow_schema, state->timezone())); } VLOG_DEBUG << "create sender in INIT with instance id " << fragment_instance_id; RETURN_IF_ERROR(state->exec_env()->result_mgr()->create_sender( fragment_instance_id, p._result_sink_buffer_size_rows, &_sender, state, - p._sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCAL, arrow_schema)); + p._sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCOL, arrow_schema)); } _sender->set_dependency(fragment_instance_id, _dependency->shared_from_this()); return Status::OK(); @@ -76,7 +76,7 @@ Status ResultSinkLocalState::open(RuntimeState* state) { auto& p = _parent->cast(); // create writer based on sink type switch (p._sink_type) { - case TResultSinkType::MYSQL_PROTOCAL: { + case TResultSinkType::MYSQL_PROTOCOL: { if (state->mysql_row_binary_format()) { _writer.reset(new (std::nothrow) vectorized::VMysqlResultWriter( _sender, _output_vexpr_ctxs, custom_profile())); @@ -86,7 +86,7 @@ Status ResultSinkLocalState::open(RuntimeState* state) { } break; } - case TResultSinkType::ARROW_FLIGHT_PROTOCAL: { + case TResultSinkType::ARROW_FLIGHT_PROTOCOL: { _writer.reset(new (std::nothrow) vectorized::VArrowFlightResultWriter( _sender, _output_vexpr_ctxs, custom_profile())); break; @@ -104,10 +104,10 @@ ResultSinkOperatorX::ResultSinkOperatorX(int operator_id, const RowDescriptor& r const TResultSink& sink) : DataSinkOperatorX(operator_id, std::numeric_limits::max(), std::numeric_limits::max()), - _sink_type(!sink.__isset.type || sink.type == TResultSinkType::MYSQL_PROTOCAL - ? TResultSinkType::MYSQL_PROTOCAL + _sink_type(!sink.__isset.type || sink.type == TResultSinkType::MYSQL_PROTOCOL + ? TResultSinkType::MYSQL_PROTOCOL : sink.type), - _result_sink_buffer_size_rows(_sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCAL + _result_sink_buffer_size_rows(_sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCOL ? config::arrow_flight_result_sink_buffer_size_rows : RESULT_SINK_BUFFER_SIZE), _row_desc(row_desc), @@ -132,14 +132,14 @@ Status ResultSinkOperatorX::prepare(RuntimeState* state) { if (state->query_options().enable_parallel_result_sink) { std::shared_ptr arrow_schema; - if (_sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCAL) { + if (_sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCOL) { RETURN_IF_ERROR(get_arrow_schema_from_expr_ctxs(_output_vexpr_ctxs, &arrow_schema, state->timezone())); } VLOG_DEBUG << "create sender in prepare with query id " << state->query_id(); RETURN_IF_ERROR(state->exec_env()->result_mgr()->create_sender( state->query_id(), _result_sink_buffer_size_rows, &_sender, state, - _sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCAL, arrow_schema)); + _sink_type == TResultSinkType::ARROW_FLIGHT_PROTOCOL, arrow_schema)); } return vectorized::VExpr::open(_output_vexpr_ctxs, state); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java index 34494aa4296468..9edcd1c82eea85 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java @@ -114,7 +114,7 @@ public MysqlChannel(StreamConnection connection, ConnectContext context) { this.remoteIp = ""; this.conn = connection; - // if proxy protocal is enabled, the remote address will be got from proxy protocal header + // if proxy protocol is enabled, the remote address will be got from proxy protocol header // and overwrite the original remote address. if (connection.getPeerAddress() instanceof InetSocketAddress) { InetSocketAddress address = (InetSocketAddress) connection.getPeerAddress(); @@ -638,7 +638,7 @@ private boolean handleUnwrapResult(SSLEngineResult sslEngineResult) { } } - // for proxy protocal only + // for proxy protocol only public void setRemoteAddr(String ip, int port) { this.remoteIp = ip; this.remoteHostPortString = NetUtils.getHostPortInAccessibleFormat(ip, port); diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java index 2803ec446aa25c..c3e2c37d54c754 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java @@ -157,7 +157,7 @@ public class PlanFragment extends TreeNode { protected boolean hasColocatePlanNode = false; protected final Supplier hasBucketShuffleJoin; - private TResultSinkType resultSinkType = TResultSinkType.MYSQL_PROTOCAL; + private TResultSinkType resultSinkType = TResultSinkType.MYSQL_PROTOCOL; public Optional> specifyInstances = Optional.empty(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ResultSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ResultSink.java index 1b0b745223caa9..25e72ed7598621 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/ResultSink.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ResultSink.java @@ -34,7 +34,7 @@ public class ResultSink extends DataSink { // Two phase fetch option private TFetchOption fetchOption; - private TResultSinkType resultSinkType = TResultSinkType.MYSQL_PROTOCAL; + private TResultSinkType resultSinkType = TResultSinkType.MYSQL_PROTOCOL; public ResultSink(PlanNodeId exchNodeId) { this.exchNodeId = exchNodeId; diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java index df8d695534ed5f..607ccf693f478d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java @@ -240,7 +240,7 @@ public enum ConnectType { private String workloadGroupName = ""; private boolean isGroupCommit; - private TResultSinkType resultSinkType = TResultSinkType.MYSQL_PROTOCAL; + private TResultSinkType resultSinkType = TResultSinkType.MYSQL_PROTOCOL; private Map> dbToTempTableNamesMap = new HashMap<>(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectContext.java b/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectContext.java index 111a79745e1f03..75f1c0ee4bf65b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectContext.java +++ b/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectContext.java @@ -41,7 +41,7 @@ public FlightSqlConnectContext(String peerIdentity) { this.peerIdentity = peerIdentity; mysqlChannel = null; // Use of MysqlChannel is not expected flightSqlChannel = new FlightSqlChannel(); - setResultSinkType(TResultSinkType.ARROW_FLIGHT_PROTOCAL); + setResultSinkType(TResultSinkType.ARROW_FLIGHT_PROTOCOL); init(); } diff --git a/gensrc/thrift/DataSinks.thrift b/gensrc/thrift/DataSinks.thrift index ac68c75ffd623e..dcb62ea4159d1d 100644 --- a/gensrc/thrift/DataSinks.thrift +++ b/gensrc/thrift/DataSinks.thrift @@ -44,8 +44,8 @@ enum TDataSinkType { } enum TResultSinkType { - MYSQL_PROTOCAL = 0, - ARROW_FLIGHT_PROTOCAL = 1, + MYSQL_PROTOCOL = 0, + ARROW_FLIGHT_PROTOCOL = 1, FILE = 2, // deprecated, should not be used any more. FileResultSink is covered by TRESULT_FILE_SINK for concurrent purpose. } diff --git a/regression-test/suites/nereids_tpch_p0/tpch/push_topn_to_agg.groovy b/regression-test/suites/nereids_tpch_p0/tpch/push_topn_to_agg.groovy index 4655ca6b06943d..06975eef5eaa29 100644 --- a/regression-test/suites/nereids_tpch_p0/tpch/push_topn_to_agg.groovy +++ b/regression-test/suites/nereids_tpch_p0/tpch/push_topn_to_agg.groovy @@ -124,7 +124,7 @@ suite("push_topn_to_agg") { | HAS_COLO_PLAN_NODE: false | | | | VRESULT SINK | -| MYSQL_PROTOCAL | +| MYSQL_PROTOCOL | | | | 4:VEXCHANGE | | offset: 0 | diff --git a/samples/datalake/lakesoul/README.md b/samples/datalake/lakesoul/README.md index 3a211d9bacca18..136c249fbe0c4f 100644 --- a/samples/datalake/lakesoul/README.md +++ b/samples/datalake/lakesoul/README.md @@ -101,7 +101,7 @@ mysql> explain verbose select * from customer_from_spark where c_nationkey < 3; | HAS_COLO_PLAN_NODE: false | | | | VRESULT SINK | -| MYSQL_PROTOCAL | +| MYSQL_PROTOCOL | | | | 1:VEXCHANGE | | offset: 0 |