From 3553a115375b3323eab10630d8e93b8d69f51911 Mon Sep 17 00:00:00 2001
From: Alexey Pozdniakov <pas.9250306384@gmail.com>
Date: Fri, 13 Sep 2024 22:29:43 +0300
Subject: [PATCH] Revert "YQ-3617: fix GROUP BY HOP + AS_TABLE" (#9196)

---
 .../yql/core/yql_aggregate_expander.cpp       |  2 +-
 .../sql/dq_file/part4/canondata/result.json   | 28 -------------------
 .../tests/sql/sql2yql/canondata/result.json   | 14 ----------
 .../suites/aggregate/group_by_hop_small.sql   | 16 -----------
 4 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 ydb/library/yql/tests/sql/suites/aggregate/group_by_hop_small.sql

diff --git a/ydb/library/yql/core/yql_aggregate_expander.cpp b/ydb/library/yql/core/yql_aggregate_expander.cpp
index 7e3911085609..5eec73b41666 100644
--- a/ydb/library/yql/core/yql_aggregate_expander.cpp
+++ b/ydb/library/yql/core/yql_aggregate_expander.cpp
@@ -32,7 +32,7 @@ TExprNode::TPtr TAggregateExpander::ExpandAggregateWithFullOutput()
     auto settings = Node->Child(3);
 
     bool allTraitsCollected = CollectTraits();
-    // YQL_ENSURE(!HasSetting(*settings, "hopping"), "Aggregate with hopping unsupported here."); // TODO(YQ-3661): uncomment
+    YQL_ENSURE(!HasSetting(*settings, "hopping"), "Aggregate with hopping unsupported here.");
 
     HaveDistinct = AnyOf(AggregatedColumns->ChildrenList(),
         [](const auto& child) { return child->ChildrenSize() == 3; });
diff --git a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
index 9ae9f4d5308a..dd931f50b309 100644
--- a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
@@ -362,34 +362,6 @@
             "uri": "https://{canondata_backend}/1899731/d439cec3e297e3dd031f751fd90f3935129a1094/resource.tar.gz#test.test_aggregate-group_by_hop--Results_/results.txt"
         }
     ],
-    "test.test[aggregate-group_by_hop_small-default.txt-Analyze]": [
-        {
-            "checksum": "b4dd508a329723c74293d80f0278c705",
-            "size": 505,
-            "uri": "https://{canondata_backend}/1847551/2209c2969854610c404ebe58fe3bfaa092239305/resource.tar.gz#test.test_aggregate-group_by_hop_small-default.txt-Analyze_/plan.txt"
-        }
-    ],
-    "test.test[aggregate-group_by_hop_small-default.txt-Debug]": [
-        {
-            "checksum": "4eb73aa6ee121bbad859125d3cfd5a95",
-            "size": 1015,
-            "uri": "https://{canondata_backend}/1847551/2209c2969854610c404ebe58fe3bfaa092239305/resource.tar.gz#test.test_aggregate-group_by_hop_small-default.txt-Debug_/opt.yql_patched"
-        }
-    ],
-    "test.test[aggregate-group_by_hop_small-default.txt-Plan]": [
-        {
-            "checksum": "b4dd508a329723c74293d80f0278c705",
-            "size": 505,
-            "uri": "https://{canondata_backend}/1847551/2209c2969854610c404ebe58fe3bfaa092239305/resource.tar.gz#test.test_aggregate-group_by_hop_small-default.txt-Plan_/plan.txt"
-        }
-    ],
-    "test.test[aggregate-group_by_hop_small-default.txt-Results]": [
-        {
-            "checksum": "b204692654e9a175f23dc8efd761e05b",
-            "size": 696,
-            "uri": "https://{canondata_backend}/1847551/2209c2969854610c404ebe58fe3bfaa092239305/resource.tar.gz#test.test_aggregate-group_by_hop_small-default.txt-Results_/results.txt"
-        }
-    ],
     "test.test[aggregate-group_by_hop_star--Analyze]": [
         {
             "checksum": "9221cc272d85bbacaaea3595e69b6b17",
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index aed74e86fbb1..ecb1c1e2c373 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -2183,13 +2183,6 @@
             "uri": "https://{canondata_backend}/1784117/d56ae82ad9d30397a41490647be1bd2124718f98/resource.tar.gz#test_sql2yql.test_aggregate-group_by_hop_only_start_/sql.yql"
         }
     ],
-    "test_sql2yql.test[aggregate-group_by_hop_small]": [
-        {
-            "checksum": "91dd52bcee5be9d4f5f9638eb801db32",
-            "size": 2149,
-            "uri": "https://{canondata_backend}/1920236/bb2301e85eb73fecf6260a9c1294520fbf1e952e/resource.tar.gz#test_sql2yql.test_aggregate-group_by_hop_small_/sql.yql"
-        }
-    ],
     "test_sql2yql.test[aggregate-group_by_hop_star]": [
         {
             "checksum": "e777f280db84a47b4cdfe9176e6d9d1f",
@@ -21846,13 +21839,6 @@
             "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_aggregate-group_by_hop_only_start_/formatted.sql"
         }
     ],
-    "test_sql_format.test[aggregate-group_by_hop_small]": [
-        {
-            "checksum": "27fdd7af224a36c15155f7f69f14ad07",
-            "size": 393,
-            "uri": "https://{canondata_backend}/1942173/9d793e788c391df831fae057e65f63b2b147c4d4/resource.tar.gz#test_sql_format.test_aggregate-group_by_hop_small_/formatted.sql"
-        }
-    ],
     "test_sql_format.test[aggregate-group_by_hop_star]": [
         {
             "checksum": "0132a85abf9d40c5a848a3c031206631",
diff --git a/ydb/library/yql/tests/sql/suites/aggregate/group_by_hop_small.sql b/ydb/library/yql/tests/sql/suites/aggregate/group_by_hop_small.sql
deleted file mode 100644
index 1e8f31e48a40..000000000000
--- a/ydb/library/yql/tests/sql/suites/aggregate/group_by_hop_small.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-/* syntax version 1 */
-/* postgres can not */
-/* ytfile can not */
-/* yt can not */
-
-$input = SELECT * FROM AS_TABLE([
-    <|"time":"2024-01-01T00:00:01Z"|>,
-    <|"time":"2024-01-02T00:00:01Z"|>,
-    <|"time":"2024-01-03T00:00:01Z"|>
-]);
-
-SELECT
-    COUNT(*),
-    -- HOP_START()
-FROM $input
-GROUP BY HOP(CAST(time as Timestamp), 'PT60S', 'PT86400S', 'PT60S')