add ut

dbms/src/DataStreams/WindowBlockInputStream.cpp

@@ -1457,25 +1457,31 @@ void WindowTransformAction::tryCalculate()
             }
             peer_group_last = current_row;
 
+            RowNumber tmp = frame_start;
             // Advance the frame start.
             advanceFrameStart();
+            std::cout << "frame start: " << tmp.toString() << " -> " << frame_start.toString() << std::endl;
 
             if (!frame_started)
             {
                 // Wait for more input data to find the start of frame.
                 assert(!input_is_finished);
                 assert(!partition_ended);
+                std::cout << "frame start return" << std::endl;
                 return;
             }
 
             // Advance the frame end.
+            tmp = frame_end;
             advanceFrameEnd();
+            std::cout << "frame end: " << tmp.toString() << " -> " << frame_end.toString() << std::endl;
 
             if (!frame_ended)
             {
                 // Wait for more input data to find the end of frame.
                 assert(!input_is_finished);
                 assert(!partition_ended);
+                std::cout << "frame end return" << std::endl;
                 return;
             }
 

dbms/src/WindowFunctions/tests/gtest_agg.cpp

@@ -36,11 +36,17 @@ class WindowAggFuncTest : public DB::tests::WindowTest
     static std::vector<Int64> int_value;
 };
 
+// TODO uncomment them
 std::vector<Int64> WindowAggFuncTest::partition = {0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 5, 6, 6, 6};
-std::vector<Int64> WindowAggFuncTest::order = {0, 0, 1, 2, 3, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 5, 6, 0, 0, 0, 1, 2};
+std::vector<Int64> WindowAggFuncTest::order =     {0, 0, 1, 3, 6, 0, 1, 4, 7, 8, 0, 4, 6, 10, 20, 40, 41, 0, 0, 0, 10, 30};
 std::vector<Int64> WindowAggFuncTest::int_value
     = {0, -1, 0, 4, 6, 2, 0, -4, -2, 1, 7, -3, 9, -9, -3, 2, 1, 4, -5, 2, 5, 0};
 
+// std::vector<Int64> WindowAggFuncTest::partition = {2, 2};
+// std::vector<Int64> WindowAggFuncTest::order =     {7, 8};
+// std::vector<Int64> WindowAggFuncTest::int_value
+//     = {-2, 1};
+
 // TODO test frame position list:
 // 1. prev_start = frame_start, prev_end = frame_end
 // 2. prev_start < frame_start, prev_end = frame_end
@@ -55,118 +61,124 @@ std::vector<Int64> WindowAggFuncTest::int_value
 // 5. add = 0
 
 // TODO maybe we need to reset null flag for AggregateFunctionNull
-TEST_F(WindowAggFuncTest, windowAggSumTests)
+// TODO test duplicate order by values in range frame
+TEST_F(WindowAggFuncTest, Sum)
 try
 {
     {
-        // rows frame
-        MockWindowFrame frame;
-        frame.type = tipb::WindowFrameType::Rows;
-        frame.end = mock::MockWindowFrameBound(tipb::WindowBoundType::Following, false, 0);
-        std::vector<Int64> frame_start_offset{0, 1, 3, 10};
-        std::vector<Int64> frame_end_offset{0, 1, 3, 10};
-
-        std::vector<std::vector<std::optional<Int64>>> res{
-            {0, -1, 0, 4, 6, 2, 0, -4, -2, 1, 7, -3, 9, -9, -3, 2, 1, 4, -5, 2, 5, 0},
-            {0, -1, -1, 4, 10, 2, 2, -4, -6, -1, 7, 4, 6, 0, -12, -1, 3, 4, -5, 2, 7, 5},
-            {0, -1, -1, 3, 9, 2, 2, -2, -4, -5, 7, 4, 13, 4, -6, -1, -9, 4, -5, 2, 7, 7},
-            {0, -1, -1, 3, 9, 2, 2, -2, -4, -3, 7, 4, 13, 4, 1, 3, 4, 4, -5, 2, 7, 7}};
-
-        for (size_t i = 0; i < frame_start_offset.size(); ++i)
-        {
-            std::cout << "--------- i: " << i << std::endl;
-            frame.start = mock::MockWindowFrameBound(tipb::WindowBoundType::Preceding, false, frame_start_offset[i]);
-
-            executeFunctionAndAssert(
-                toNullableVec<Int64>(res[i]),
-                Sum(value_col),
-                {toVec<Int64>(partition), toVec<Int64>(order), toVec<Int64>(int_value)},
-                frame);
-        }
-
-        res
-            = {{0, -1, 0, 4, 6, 2, 0, -4, -2, 1, 7, -3, 9, -9, -3, 2, 1, 4, -5, 2, 5, 0},
-               {0, -1, 4, 10, 6, 2, -4, -6, -1, 1, 4, 6, 0, -12, -1, 3, 1, 4, -5, 7, 5, 0},
-               {0, 9, 10, 10, 6, -4, -5, -5, -1, 1, 4, -6, -1, -9, 0, 3, 1, 4, -5, 7, 5, 0},
-               {0, 9, 10, 10, 6, -3, -5, -5, -1, 1, 4, -3, 0, -9, 0, 3, 1, 4, -5, 7, 5, 0}};
-
-        frame.start = mock::MockWindowFrameBound(tipb::WindowBoundType::Preceding, false, 0);
-        for (size_t i = 0; i < frame_end_offset.size(); ++i)
-        {
-            std::cout << "--------- i: " << i << std::endl;
-            frame.end = mock::MockWindowFrameBound(tipb::WindowBoundType::Following, false, frame_end_offset[i]);
-
-            executeFunctionAndAssert(
-                toNullableVec<Int64>(res[i]),
-                Sum(value_col),
-                {toVec<Int64>(partition), toVec<Int64>(order), toVec<Int64>(int_value)},
-                frame);
-        }
-    }
-
-
-    // TODO uncomment these test after range frame is merged
     // {
-    //     // range frame
+    //     // rows frame
     //     MockWindowFrame frame;
     //     frame.type = tipb::WindowFrameType::Rows;
-    //     frame.start = buildRangeFrameBound(tipb::WindowBoundType::Preceding, tipb::RangeCmpDataType::Int, ORDER_COL_NAME, false, 0);
-    //     frame.end = buildRangeFrameBound(tipb::WindowBoundType::Following, tipb::RangeCmpDataType::Int, ORDER_COL_NAME, true, 3);
+    //     frame.end = mock::MockWindowFrameBound(tipb::WindowBoundType::Following, false, 0);
     //     std::vector<Int64> frame_start_offset{0, 1, 3, 10};
+    //     std::vector<Int64> frame_end_offset{0, 1, 3, 10};
 
-    //     std::vector<std::vector<Int64>> res_not_null{
-    //         {0, 7, 6, 4, 8, 3, 3, 23, 28, 15, 4, 8, 5, 9, 15, 20, 31},
-    //         {0, 7, 7, 4, 8, 3, 3, 23, 28, 15, 4, 8, 5, 9, 15, 20, 31},
-    //         {0, 7, 7, 7, 8, 3, 3, 23, 38, 28, 4, 9, 8, 9, 15, 20, 31},
-    //         {0, 7, 7, 7, 15, 3, 3, 26, 41, 38, 4, 9, 9, 18, 29, 35, 31}};
+    //     std::vector<std::vector<std::optional<Int64>>> res{
+    //         {0, -1, 0, 4, 6, 2, 0, -4, -2, 1, 7, -3, 9, -9, -3, 2, 1, 4, -5, 2, 5, 0},
+    //         {0, -1, -1, 4, 10, 2, 2, -4, -6, -1, 7, 4, 6, 0, -12, -1, 3, 4, -5, 2, 7, 5},
+    //         {0, -1, -1, 3, 9, 2, 2, -2, -4, -5, 7, 4, 13, 4, -6, -1, -9, 4, -5, 2, 7, 7},
+    //         {0, -1, -1, 3, 9, 2, 2, -2, -4, -3, 7, 4, 13, 4, 1, 3, 4, 4, -5, 2, 7, 7}};
 
     //     for (size_t i = 0; i < frame_start_offset.size(); ++i)
     //     {
-    //         frame.start = buildRangeFrameBound(tipb::WindowBoundType::Preceding, tipb::RangeCmpDataType::Int, ORDER_COL_NAME, false, 0);
+    //         std::cout << "--------- i: " << i << std::endl;
+    //         frame.start = mock::MockWindowFrameBound(tipb::WindowBoundType::Preceding, false, frame_start_offset[i]);
 
     //         executeFunctionAndAssert(
-    //             toVec<Int64>(res_not_null[i]),
+    //             toNullableVec<Int64>(res[i]),
     //             Sum(value_col),
-    //             {toVec<Int64>(/*partition*/ {0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3}),
-    //             toVec<Int64>(/*order*/ {0, 1, 2, 4, 8, 0, 3, 10, 13, 15, 1, 3, 5, 9, 15, 20, 31}),
-    //             toVec<Int64>(/*value*/ {0, 1, 2, 4, 8, 0, 3, 10, 13, 15, 1, 3, 5, 9, 15, 20, 31})},
+    //             {toVec<Int64>(partition), toVec<Int64>(order), toVec<Int64>(int_value)},
+    //             frame);
+    //     }
+
+    //     res
+    //         = {{0, -1, 0, 4, 6, 2, 0, -4, -2, 1, 7, -3, 9, -9, -3, 2, 1, 4, -5, 2, 5, 0},
+    //            {0, -1, 4, 10, 6, 2, -4, -6, -1, 1, 4, 6, 0, -12, -1, 3, 1, 4, -5, 7, 5, 0},
+    //            {0, 9, 10, 10, 6, -4, -5, -5, -1, 1, 4, -6, -1, -9, 0, 3, 1, 4, -5, 7, 5, 0},
+    //            {0, 9, 10, 10, 6, -3, -5, -5, -1, 1, 4, -3, 0, -9, 0, 3, 1, 4, -5, 7, 5, 0}};
+
+    //     frame.start = mock::MockWindowFrameBound(tipb::WindowBoundType::Preceding, false, 0);
+    //     for (size_t i = 0; i < frame_end_offset.size(); ++i)
+    //     {
+    //         std::cout << "--------- i: " << i << std::endl;
+    //         frame.end = mock::MockWindowFrameBound(tipb::WindowBoundType::Following, false, frame_end_offset[i]);
+
+    //         executeFunctionAndAssert(
+    //             toNullableVec<Int64>(res[i]),
+    //             Sum(value_col),
+    //             {toVec<Int64>(partition), toVec<Int64>(order), toVec<Int64>(int_value)},
     //             frame);
     //     }
     // }
-}
-CATCH
+    }
 
-TEST_F(WindowAggFuncTest, windowAggCountTests)
-try
-{
     {
-        // rows frame
+        // range frame
         MockWindowFrame frame;
-        frame.type = tipb::WindowFrameType::Rows;
-        frame.start = mock::MockWindowFrameBound(tipb::WindowBoundType::Preceding, false, 0);
-        frame.end = mock::MockWindowFrameBound(tipb::WindowBoundType::Following, false, 3);
-        std::vector<Int64> frame_start_offset{0, 1, 3, 10};
+        frame.type = tipb::WindowFrameType::Ranges;
+        frame.start = buildRangeFrameBound<Int64>(tipb::WindowBoundType::Preceding, tipb::RangeCmpDataType::Int, ORDER_COL_NAME, false, 0);
+        frame.end = buildRangeFrameBound<Int64>(tipb::WindowBoundType::Following, tipb::RangeCmpDataType::Int, ORDER_COL_NAME, true, 0);
+        // std::vector<Int64> frame_end_offset{0, 1, 3, 10}; // TODO uncomment it
+        std::vector<Int64> frame_end_offset{0, 1, 3, 10};
 
+        // TODO uncomment it
         std::vector<std::vector<std::optional<Int64>>> res{
-            {1, 4, 3, 2, 1, 4, 4, 3, 2, 1, 4, 4, 4, 4, 3, 2, 1},
-            {1, 4, 4, 3, 2, 4, 5, 4, 3, 2, 4, 5, 5, 5, 4, 3, 2},
-            {1, 4, 4, 4, 4, 4, 5, 5, 5, 4, 4, 5, 6, 7, 6, 5, 4},
-            {1, 4, 4, 4, 4, 4, 5, 5, 5, 5, 4, 5, 6, 7, 7, 7, 7}};
-
-        for (size_t i = 0; i < frame_start_offset.size(); ++i)
+            {0, -1, 0, 4, 6, 2, 0, -4, -2, 1, 7, -3, 9, -9, -3, 2, 1, 4, -5, 2, 5, 0},
+            {0, -1, 0, 4, 6, 2, 0, -4, -1, 1, 7, -3, 9, -9, -3, 3, 1, 4, -5, 2, 5, 0},
+            {0, 3, 4, 10, 6, 2, -4, -6, -1, 1, 7, 6, 9, -9, -3, 3, 1, 4, -5, 2, 5, 0},
+            {0, 9, 10, 10, 6, -3, -5, -5, -1, 1, 4, -3, 0, -12, -3, 3, 1, 4, -5, 7, 5, 0}
+        };
+
+        // std::vector<std::vector<std::optional<Int64>>> res{
+        //     // {0, -1, 0, 4, 6, 2, 0, -4, -2, 1, 7, -3, 9, -9, -3, 2, 1, 4, -5, 2, 5, 0},
+        //     {-1, 1},
+        //     // {0, 3, 4, 10, 6, 2, -4, -6, -1, 1, 7, 6, 9, -9, -3, 3, 1, 4, -5, 2, 5, 0},
+        //     // {0, 9, 10, 10, 6, -3, -5, -5, -1, 1, 4, -3, 0, -12, -3, 3, 1, 4, -5, 7, 5, 0}
+        // };
+
+        for (size_t i = 0; i < frame_end_offset.size(); i++)
         {
-            frame.start = mock::MockWindowFrameBound(tipb::WindowBoundType::Preceding, false, frame_start_offset[i]);
+            std::cout << "-------- i: " << i << std::endl;
+            frame.end = buildRangeFrameBound<Int64>(tipb::WindowBoundType::Following, tipb::RangeCmpDataType::Int, ORDER_COL_NAME, true, frame_end_offset[i]);
 
             executeFunctionAndAssert(
                 toNullableVec<Int64>(res[i]),
-                Count(value_col),
-                {toVec<Int64>(/*partition*/ {0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3}),
-                 toVec<Int64>(/*order*/ {0, 1, 2, 4, 8, 0, 3, 10, 13, 15, 1, 3, 5, 9, 15, 20, 31}),
-                 toVec<Int64>(/*value*/ {0, 1, 2, 4, 8, 0, 3, 10, 13, 15, 1, 3, 5, 9, 15, 20, 31})},
+                Sum(value_col),
+                {toVec<Int64>(partition),
+                toVec<Int64>(order),
+                toVec<Int64>(int_value)},
                 frame);
         }
     }
-    // TODO add range frame tests after that is merged
+}
+CATCH
+
+TEST_F(WindowAggFuncTest, Count)
+try
+{
+    // TODO add tests
+}
+CATCH
+
+TEST_F(WindowAggFuncTest, Avg)
+try
+{
+    // TODO add tests
+}
+CATCH
+
+TEST_F(WindowAggFuncTest, Min)
+try
+{
+    // TODO add tests
+}
+CATCH
+
+TEST_F(WindowAggFuncTest, Max)
+try
+{
+    // TODO add tests
 }
 CATCH
 } // namespace DB::tests

tests/fullstack-test/mpp/window_agg.test

@@ -21,7 +21,9 @@ func> wait_table test test.agg
 
 mysql> use test; set tidb_enforce_mpp=1;
 
-//TODO ast.AggFuncSum, ast.AggFuncCount, ast.AggFuncAvg, ast.AggFuncMax, ast.AggFuncMin ... 
+// TODO ast.AggFuncSum, ast.AggFuncCount, ast.AggFuncAvg, ast.AggFuncMax, ast.AggFuncMin
+// TODO int decimal64 decimal256 should be tested for add agg
+// TODO string and duration should be tested fow min/max
 
 mysql> use test; set tidb_enforce_mpp=1; select *, sum(v) over (partition by p order by o rows between 1 preceding and 1 following) as a from test.agg;
 +---+----+----+------+