pingcap · ti-chi-bot · Feb 13, 2026 · Feb 13, 2026 · Feb 13, 2026 · Feb 13, 2026
diff --git a/contrib/tipb b/contrib/tipb
diff --git a/dbms/src/Debug/MockExecutor/AggregationBinder.cpp b/dbms/src/Debug/MockExecutor/AggregationBinder.cpp
@@ -202,7 +202,7 @@ void AggregationBinder::buildAggFunc(tipb::Expr * agg_func, const ASTFunction *
     auto agg_sig = agg_sig_it->second;
     agg_func->set_tp(agg_sig);
 
-    if (agg_sig == tipb::ExprType::Count || agg_sig == tipb::ExprType::Sum)
+    if (agg_sig == tipb::ExprType::Count || agg_sig == tipb::ExprType::Sum || agg_sig == tipb::ExprType::SumInt)
     {
         auto * ft = agg_func->mutable_field_type();
         ft->set_tp(TiDB::TypeLongLong);

diff --git a/dbms/src/Debug/MockExecutor/FuncSigMap.cpp b/dbms/src/Debug/MockExecutor/FuncSigMap.cpp
@@ -89,6 +89,7 @@ std::unordered_map<String, tipb::ExprType> agg_func_name_to_sig({
     {"max", tipb::ExprType::Max},
     {"count", tipb::ExprType::Count},
     {"sum", tipb::ExprType::Sum},
+    {"sum_int", tipb::ExprType::SumInt},
     {"first_row", tipb::ExprType::First},
     {"uniqRawRes", tipb::ExprType::ApproxCountDistinct},
     {"group_concat", tipb::ExprType::GroupConcat},

diff --git a/dbms/src/Flash/Coprocessor/DAGUtils.cpp b/dbms/src/Flash/Coprocessor/DAGUtils.cpp
@@ -53,6 +53,7 @@ const std::unordered_map<tipb::ExprType, String> window_func_map({
 const std::unordered_map<tipb::ExprType, String> agg_func_map({
     {tipb::ExprType::Count, "count"},
     {tipb::ExprType::Sum, "sum"},
+    {tipb::ExprType::SumInt, "sum"},
     {tipb::ExprType::Min, "min"},
     {tipb::ExprType::Max, "max"},
     {tipb::ExprType::First, "first_row"},
@@ -994,6 +995,7 @@ String exprToString(const tipb::Expr & expr, const std::vector<NameAndTypePair>
         return getColumnNameForColumnExpr(expr, input_col);
     case tipb::ExprType::Count:
     case tipb::ExprType::Sum:
+    case tipb::ExprType::SumInt:
     case tipb::ExprType::Avg:
     case tipb::ExprType::Min:
     case tipb::ExprType::Max:
@@ -1050,6 +1052,7 @@ bool isAggFunctionExpr(const tipb::Expr & expr)
     {
     case tipb::ExprType::Count:
     case tipb::ExprType::Sum:
+    case tipb::ExprType::SumInt:
     case tipb::ExprType::Avg:
     case tipb::ExprType::Min:
     case tipb::ExprType::Max:

diff --git a/dbms/src/Flash/Coprocessor/tests/gtest_sum_int_agg_func.cpp b/dbms/src/Flash/Coprocessor/tests/gtest_sum_int_agg_func.cpp
@@ -0,0 +1,109 @@
+// Copyright 2023 PingCAP, Inc.
+//
+// Licensed 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.
+
+#include <AggregateFunctions/AggregateFunctionNull.h>
+#include <AggregateFunctions/AggregateFunctionSum.h>
+#include <Core/Types.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Flash/Coprocessor/AggregationInterpreterHelper.h>
+#include <Flash/Coprocessor/DAGCodec.h>
+#include <Flash/Coprocessor/DAGUtils.h>
+#include <IO/Buffer/WriteBufferFromString.h>
+#include <gtest/gtest.h>
+
+namespace DB
+{
+namespace tests
+{
+namespace
+{
+template <typename T>
+using AggregateFunctionSumSimple = AggregateFunctionSum<
+    T,
+    typename NearestFieldType<T>::Type,
+    AggregateFunctionSumData<typename NearestFieldType<T>::Type>>;
+
+template <typename TInput, typename TExpectedOutput>
+void checkSumIntReturnType(const String & expected_output, const String & expected_output_nullable)
+{
+    using NestedFunc = AggregateFunctionSumSimple<TInput>;
+    auto nested = std::make_shared<NestedFunc>();
+    ASSERT_EQ(nested->getReturnType()->getName(), expected_output);
+
+    auto wrapped
+        = std::make_shared<AggregateFunctionNullUnary</*result_is_nullable*/ true, /*input_is_nullable*/ true>>(nested);
+    ASSERT_EQ(wrapped->getReturnType()->getName(), expected_output_nullable);
+}
+} // namespace
+
+TEST(SumIntAggFuncTest, DagUtilsMappedToSum)
+{
+    tipb::Expr expr;
+    expr.set_tp(tipb::ExprType::SumInt);
+
+    ASSERT_TRUE(isAggFunctionExpr(expr));
+    ASSERT_EQ(getAggFunctionName(expr), "sum");
+    ASSERT_EQ(getFunctionName(expr), "sum");
+}
+
+TEST(SumIntAggFuncTest, ExprToStringIsSum)
+{
+    std::vector<NameAndTypePair> input_cols;
+    input_cols.emplace_back("col0", std::make_shared<DataTypeInt32>());
+
+    tipb::Expr col_ref;
+    col_ref.set_tp(tipb::ExprType::ColumnRef);
+    WriteBufferFromOwnString ss;
+    encodeDAGInt64(0, ss);
+    col_ref.set_val(ss.releaseStr());
+
+    tipb::Expr sum_int;
+    sum_int.set_tp(tipb::ExprType::SumInt);
+    *sum_int.add_children() = col_ref;
+
+    ASSERT_EQ(exprToString(sum_int, input_cols), "sum(col0)");
+}
+
+TEST(SumIntAggFuncTest, PartialStageIsTreatedAsSum)
+{
+    tipb::Expr expr;
+    expr.set_tp(tipb::ExprType::SumInt);
+
+    ASSERT_FALSE(AggregationInterpreterHelper::isSumOnPartialResults(expr));
+
+    expr.set_aggfuncmode(tipb::AggFunctionMode::Partial1Mode);
+    ASSERT_FALSE(AggregationInterpreterHelper::isSumOnPartialResults(expr));
+
+    expr.set_aggfuncmode(tipb::AggFunctionMode::Partial2Mode);
+    ASSERT_TRUE(AggregationInterpreterHelper::isSumOnPartialResults(expr));
+
+    expr.set_aggfuncmode(tipb::AggFunctionMode::FinalMode);
+    ASSERT_TRUE(AggregationInterpreterHelper::isSumOnPartialResults(expr));
+}
+
+TEST(SumIntAggFuncTest, ReturnTypeForIntegerInputs)
+{
+    checkSumIntReturnType<Int8, Int64>("Int64", "Nullable(Int64)");
+    checkSumIntReturnType<Int16, Int64>("Int64", "Nullable(Int64)");
+    checkSumIntReturnType<Int32, Int64>("Int64", "Nullable(Int64)");
+    checkSumIntReturnType<Int64, Int64>("Int64", "Nullable(Int64)");
+
+    checkSumIntReturnType<UInt8, UInt64>("UInt64", "Nullable(UInt64)");
+    checkSumIntReturnType<UInt16, UInt64>("UInt64", "Nullable(UInt64)");
+    checkSumIntReturnType<UInt32, UInt64>("UInt64", "Nullable(UInt64)");
+    checkSumIntReturnType<UInt64, UInt64>("UInt64", "Nullable(UInt64)");
+}
+
+} // namespace tests
+} // namespace DB
diff --git a/tests/docker/cluster.yaml b/tests/docker/cluster.yaml
@@ -16,7 +16,7 @@ version: '2.3'
 
 services:
   pd0:
-    image: hub.pingcap.net/qa/pd:${PD_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/pd/image:${PD_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -35,7 +35,7 @@ services:
       - --log-file=/log/pd.log
     restart: on-failure
   tikv0:
-    image: hub.pingcap.net/qa/tikv:${TIKV_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:${TIKV_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -55,7 +55,7 @@ services:
       - "pd0"
     restart: on-failure
   tidb0:
-    image: hub.pingcap.net/qa/tidb:${TIDB_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:${TIDB_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/cluster_disable_new_collation.yaml b/tests/docker/cluster_disable_new_collation.yaml
@@ -16,7 +16,7 @@ version: '2.3'
 
 services:
   pd0:
-    image: hub.pingcap.net/qa/pd:${PD_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/pd/image:${PD_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -35,7 +35,7 @@ services:
       - --log-file=/log/pd.log
     restart: on-failure
   tikv0:
-    image: hub.pingcap.net/qa/tikv:${TIKV_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:${TIKV_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -55,7 +55,7 @@ services:
       - "pd0"
     restart: on-failure
   tidb0:
-    image: hub.pingcap.net/qa/tidb:${TIDB_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:${TIDB_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/cluster_new_collation.yaml b/tests/docker/cluster_new_collation.yaml
@@ -16,7 +16,7 @@ version: '2.3'
 
 services:
   pd0:
-    image: hub.pingcap.net/qa/pd:${PD_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/pd/image:${PD_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -35,7 +35,7 @@ services:
       - --log-file=/log/pd.log
     restart: on-failure
   tikv0:
-    image: hub.pingcap.net/qa/tikv:${TIKV_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:${TIKV_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -55,7 +55,7 @@ services:
       - "pd0"
     restart: on-failure
   tidb0:
-    image: hub.pingcap.net/qa/tidb:${TIDB_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:${TIDB_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/cluster_tidb_fail_point.yaml b/tests/docker/cluster_tidb_fail_point.yaml
@@ -16,7 +16,7 @@ version: '2.3'
 
 services:
   pd0:
-    image: hub.pingcap.net/qa/pd:${PD_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/pd/image:${PD_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -35,7 +35,7 @@ services:
       - --log-file=/log/pd.log
     restart: on-failure
   tikv0:
-    image: hub.pingcap.net/qa/tikv:${TIKV_BRANCH:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:${TIKV_BRANCH:-master}
     security_opt:
       - seccomp:unconfined
     volumes:
@@ -55,7 +55,7 @@ services:
       - "pd0"
     restart: on-failure
   tidb0:
-    image: hub.pingcap.net/qa/tidb:${TIDB_BRANCH:-master}-failpoint
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:${TIDB_BRANCH:-master}-failpoint
     security_opt:
       - seccomp:unconfined
     environment:

diff --git a/tests/docker/run.sh b/tests/docker/run.sh
@@ -71,6 +71,10 @@ if [ -n "$BRANCH" ]; then
   [ -z "$TIKV_BRANCH" ] && export TIKV_BRANCH="$BRANCH"
   [ -z "$TIDB_BRANCH" ] && export TIDB_BRANCH="$BRANCH"
 fi
+export PD_BRANCH="${PD_BRANCH//\//-}"
+export TIKV_BRANCH="${TIKV_BRANCH//\//-}"
+export TIDB_BRANCH="${TIDB_BRANCH//\//-}"
+export TAG="${TAG//\//-}"
 
 
 # Stop all docker instances if exist.

diff --git a/tests/docker/tiflash-tagged-image.yaml b/tests/docker/tiflash-tagged-image.yaml
@@ -18,7 +18,7 @@ services:
   # for tests under fullstack-test directory
   # (engine DeltaTree)
   tiflash0:
-    image: hub.pingcap.net/tiflash/tics:${TAG:-master}
+    image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tiflash/image:${TAG:-master}
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/util.sh b/tests/docker/util.sh
@@ -97,6 +97,9 @@ function set_branch() {
     [ -z "$TIKV_BRANCH" ] && export TIKV_BRANCH="$BRANCH"
     [ -z "$TIDB_BRANCH" ] && export TIDB_BRANCH="$BRANCH"
   fi
+  export PD_BRANCH="${PD_BRANCH//\//-}"
+  export TIKV_BRANCH="${TIKV_BRANCH//\//-}"
+  export TIDB_BRANCH="${TIDB_BRANCH//\//-}"
   echo "use branch \`${BRANCH-master}\` for ci test"
 }
+3 −2		.github/workflows/unit-test.yml
+3 −0		go-tipb/analyze.pb.go
+718 −339		go-tipb/executor.pb.go
+376 −366		go-tipb/expression.pb.go
+617 −79		go-tipb/select.pb.go
+124 −51		go-tipb/topsql_agent.pb.go
+12 −0		proto/executor.proto
+3 −0		proto/expression.proto
+40 −1		proto/select.proto
+2 −0		proto/topsql_agent.proto
+8,671 −0		scripts/proto.lock