Intermediate changes

commit_hash:28e9e4bd6b02e8914d82b2aafe9f341b5492421f

11 files changed, 90 insertions, 14 deletions

diff --git a/contrib/libs/libfuzzer/.yandex_meta/override.nix b/contrib/libs/libfuzzer/.yandex_meta/override.nix
index 3dfa4954c4b..15a7622b276 100644
--- a/contrib/libs/libfuzzer/.yandex_meta/override.nix
+++ b/contrib/libs/libfuzzer/.yandex_meta/override.nix
@@ -1,11 +1,11 @@
 pkgs: attrs: with pkgs; with attrs; rec {
-  version = "20.1.1";
+  version = "20.1.2";
 
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
     rev = "llvmorg-${version}";
-    hash = "sha256-hDFYi5wAUDQ8xfjvbGFi05KdawrN9lwrrSC8AcTpCEE=";
+    hash = "sha256-t30Jh8ckp5qD6XDxtvnSaYiAWbEi6L6hAWh6tN8JjtY=";
   };
 
   sourceRoot = "source/compiler-rt";
diff --git a/contrib/libs/libfuzzer/lib/fuzzer/afl/ya.make b/contrib/libs/libfuzzer/lib/fuzzer/afl/ya.make
index a47641d21c8..2cf1cb720df 100644
--- a/contrib/libs/libfuzzer/lib/fuzzer/afl/ya.make
+++ b/contrib/libs/libfuzzer/lib/fuzzer/afl/ya.make
@@ -8,7 +8,7 @@ LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
 SUBSCRIBER(g:cpp-contrib)
 
-VERSION(20.1.1)
+VERSION(20.1.2)
 
 PEERDIR(
     contrib/libs/afl/llvm_mode
diff --git a/contrib/libs/libfuzzer/ya.make b/contrib/libs/libfuzzer/ya.make
index c5508bdd05a..787eeaea14b 100644
--- a/contrib/libs/libfuzzer/ya.make
+++ b/contrib/libs/libfuzzer/ya.make
@@ -12,9 +12,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20.1.1)
+VERSION(20.1.2)
 
-ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-20.1.1.tar.gz)
+ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-20.1.2.tar.gz)
 
 SET(SANITIZER_CFLAGS)
 
diff --git a/contrib/libs/libunwind/.yandex_meta/override.nix b/contrib/libs/libunwind/.yandex_meta/override.nix
index 086f7da5bd8..2666c93f5f8 100644
--- a/contrib/libs/libunwind/.yandex_meta/override.nix
+++ b/contrib/libs/libunwind/.yandex_meta/override.nix
@@ -1,11 +1,11 @@
 pkgs: attrs: with pkgs; with attrs; rec {
-  version = "20.1.1";
+  version = "20.1.2";
 
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
     rev = "llvmorg-${version}";
-    hash = "sha256-hDFYi5wAUDQ8xfjvbGFi05KdawrN9lwrrSC8AcTpCEE=";
+    hash = "sha256-t30Jh8ckp5qD6XDxtvnSaYiAWbEi6L6hAWh6tN8JjtY=";
   };
 
   patches = [];
diff --git a/contrib/libs/libunwind/ya.make b/contrib/libs/libunwind/ya.make
index 0f66f389d0c..c2478a40353 100644
--- a/contrib/libs/libunwind/ya.make
+++ b/contrib/libs/libunwind/ya.make
@@ -11,9 +11,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20.1.1)
+VERSION(20.1.2)
 
-ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-20.1.1.tar.gz)
+ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-20.1.2.tar.gz)
 
 PEERDIR(
     library/cpp/sanitizer/include
diff --git a/yql/essentials/sql/v1/lexer/lexer_ut.cpp b/yql/essentials/sql/v1/lexer/lexer_ut.cpp
index 1ddfd04b507..549dc9d8fa9 100644
--- a/yql/essentials/sql/v1/lexer/lexer_ut.cpp
+++ b/yql/essentials/sql/v1/lexer/lexer_ut.cpp
@@ -68,7 +68,7 @@ TVector<TString> GetTokenViews(ILexer::TPtr& lexer, const TString& query) {
 
 TString ToString(TParsedToken token) {
     TString& string = token.Name;
-    if (!AsciiEqualsIgnoreCase(token.Name, token.Content) && token.Name != "EOF") {
+    if (token.Name != token.Content && token.Name != "EOF") {
         string += "(";
         string += token.Content;
         string += ")";
@@ -306,6 +306,7 @@ Y_UNIT_TEST_SUITE(SQLv1Lexer) {
         UNIT_ASSERT_TOKENIZED(lexer, "SELECT", "SELECT EOF");
         UNIT_ASSERT_TOKENIZED(lexer, "INSERT", "INSERT EOF");
         UNIT_ASSERT_TOKENIZED(lexer, "FROM", "FROM EOF");
+        UNIT_ASSERT_TOKENIZED(lexer, "from", "FROM(from) EOF");
     }
 
     Y_UNIT_TEST_ON_EACH_LEXER(Punctuation) {
@@ -418,8 +419,8 @@ Y_UNIT_TEST_SUITE(SQLv1Lexer) {
 
     Y_UNIT_TEST_ON_EACH_LEXER(SimpleQuery) {
         auto lexer = MakeLexer(Lexers, ANSI, ANTLR4, FLAVOR);
-        UNIT_ASSERT_TOKENIZED(lexer, "select 1", "SELECT WS( ) DIGITS(1) EOF");
-        UNIT_ASSERT_TOKENIZED(lexer, "SELect 1", "SELECT WS( ) DIGITS(1) EOF");
+        UNIT_ASSERT_TOKENIZED(lexer, "select 1", "SELECT(select) WS( ) DIGITS(1) EOF");
+        UNIT_ASSERT_TOKENIZED(lexer, "SELect 1", "SELECT(SELect) WS( ) DIGITS(1) EOF");
     }
 
     Y_UNIT_TEST_ON_EACH_LEXER(ComplexQuery) {
diff --git a/yql/essentials/sql/v1/lexer/regex/lexer.cpp b/yql/essentials/sql/v1/lexer/regex/lexer.cpp
index b0b5c2dad44..b8ca033b0c6 100644
--- a/yql/essentials/sql/v1/lexer/regex/lexer.cpp
+++ b/yql/essentials/sql/v1/lexer/regex/lexer.cpp
@@ -109,8 +109,9 @@ namespace NSQLTranslationV1 {
         bool MatchKeyword(const TStringBuf prefix, TParsedTokenList& matches) {
             size_t count = 0;
             for (const auto& keyword : Grammar_.KeywordNames) {
-                if (AsciiEqualsIgnoreCase(prefix.substr(0, keyword.length()), keyword)) {
-                    matches.emplace_back(keyword, keyword);
+                const TStringBuf content = prefix.substr(0, keyword.length());
+                if (AsciiEqualsIgnoreCase(content, keyword)) {
+                    matches.emplace_back(keyword, TString(content));
                     count += 1;
                 }
             }
diff --git a/yql/essentials/tests/s-expressions/minirun/part6/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part6/canondata/result.json
index 8b0a76c9b1c..181e08dbb8a 100644
--- a/yql/essentials/tests/s-expressions/minirun/part6/canondata/result.json
+++ b/yql/essentials/tests/s-expressions/minirun/part6/canondata/result.json
@@ -1,4 +1,18 @@
 {
+    "test.test[Blocks-ListToBlocks-default.txt-Debug]": [
+        {
+            "checksum": "a75bba410aa5a961fb719529319ca282",
+            "size": 929,
+            "uri": "https://{canondata_backend}/1130705/45dbf61264fbf40322799d506e95dda3522ed97f/resource.tar.gz#test.test_Blocks-ListToBlocks-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Blocks-ListToBlocks-default.txt-Results]": [
+        {
+            "checksum": "86b7325d54c0a9d92f4a858c1328793d",
+            "size": 1794,
+            "uri": "https://{canondata_backend}/1130705/45dbf61264fbf40322799d506e95dda3522ed97f/resource.tar.gz#test.test_Blocks-ListToBlocks-default.txt-Results_/results.txt"
+        }
+    ],
     "test.test[Builtins-AsOptionalType-default.txt-Debug]": [
         {
             "checksum": "147133ffe72e4619d67cefcf20918941",
diff --git a/yql/essentials/tests/s-expressions/minirun/part8/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part8/canondata/result.json
index 42fd52ccd10..2e739109485 100644
--- a/yql/essentials/tests/s-expressions/minirun/part8/canondata/result.json
+++ b/yql/essentials/tests/s-expressions/minirun/part8/canondata/result.json
@@ -41,6 +41,20 @@
             "uri": "https://{canondata_backend}/1597364/1f3e7f25c6ddb50b091fa9aaedebacdf37917233/resource.tar.gz#test.test_Aggregation-InMemAggregateZero-default.txt-Results_/results.txt"
         }
     ],
+    "test.test[Blocks-ListFromBlocks-default.txt-Debug]": [
+        {
+            "checksum": "e997dbfaff24e3885002450606790825",
+            "size": 928,
+            "uri": "https://{canondata_backend}/1937429/6dc717bd36879ce84e2fa1eb85b97eefce0733e9/resource.tar.gz#test.test_Blocks-ListFromBlocks-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Blocks-ListFromBlocks-default.txt-Results]": [
+        {
+            "checksum": "86b7325d54c0a9d92f4a858c1328793d",
+            "size": 1794,
+            "uri": "https://{canondata_backend}/1937429/6dc717bd36879ce84e2fa1eb85b97eefce0733e9/resource.tar.gz#test.test_Blocks-ListFromBlocks-default.txt-Results_/results.txt"
+        }
+    ],
     "test.test[Builtins-ToIntegral-default.txt-Debug]": [
         {
             "checksum": "33f569baf5940bbd79fbf635f47cc363",
diff --git a/yql/essentials/tests/s-expressions/suites/Blocks/ListFromBlocks.yqls b/yql/essentials/tests/s-expressions/suites/Blocks/ListFromBlocks.yqls
new file mode 100644
index 00000000000..d84d2202232
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/suites/Blocks/ListFromBlocks.yqls
@@ -0,0 +1,23 @@
+(
+(let config (DataSource 'config))
+(let res_sink (DataSink 'result))
+
+(let row1 (AsStruct '('"key" (Int32 '1)) '('"subkey" (Int32 '"1001")) '('"value" (String '"AAA"))))
+(let row2 (AsStruct '('"key" (Int32 '2)) '('"subkey" (Int32 '"1002")) '('"value" (String '"AAB"))))
+(let row3 (AsStruct '('"key" (Int32 '3)) '('"subkey" (Int32 '"1003")) '('"value" (String '"AAC"))))
+(let row4 (AsStruct '('"key" (Int32 '4)) '('"subkey" (Int32 '"1004")) '('"value" (String '"AAD"))))
+(let row5 (AsStruct '('"key" (Int32 '5)) '('"subkey" (Int32 '"1005")) '('"value" (String '"AAE"))))
+(let table (AsList row1 row2 row3 row4 row5))
+
+(let expandLambda (lambda '(item) (Member item '"key") (Member item '"subkey") (Member item '"value")))
+(let wideBlockStream (WideToBlocks (FromFlow (ExpandMap (ToFlow table) expandLambda))))
+
+(let narrowLambda (lambda '(key subkey value blockLength) (AsStruct '('"key" key) '('"subkey" subkey) '('"value" value) '('"_yql_block_length" blockLength))))
+(let blockList (ForwardList (NarrowMap (ToFlow wideBlockStream) narrowLambda)))
+
+(let list (ListFromBlocks blockList))
+
+(let world (Write! world res_sink (Key) list '('('type))))
+(let world (Commit! world res_sink))
+(return world)
+)
diff --git a/yql/essentials/tests/s-expressions/suites/Blocks/ListToBlocks.yqls b/yql/essentials/tests/s-expressions/suites/Blocks/ListToBlocks.yqls
new file mode 100644
index 00000000000..ad596fcc38c
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/suites/Blocks/ListToBlocks.yqls
@@ -0,0 +1,23 @@
+(
+(let config (DataSource 'config))
+(let res_sink (DataSink 'result))
+
+(let row1 (AsStruct '('"key" (Int32 '1)) '('"subkey" (Int32 '"1001")) '('"value" (String '"AAA"))))
+(let row2 (AsStruct '('"key" (Int32 '2)) '('"subkey" (Int32 '"1002")) '('"value" (String '"AAB"))))
+(let row3 (AsStruct '('"key" (Int32 '3)) '('"subkey" (Int32 '"1003")) '('"value" (String '"AAC"))))
+(let row4 (AsStruct '('"key" (Int32 '4)) '('"subkey" (Int32 '"1004")) '('"value" (String '"AAD"))))
+(let row5 (AsStruct '('"key" (Int32 '5)) '('"subkey" (Int32 '"1005")) '('"value" (String '"AAE"))))
+(let table (AsList row1 row2 row3 row4 row5))
+
+(let blockList (ListToBlocks table))
+
+(let expandLambda (lambda '(item) (Member item '"key") (Member item '"subkey") (Member item '"value") (Member item '"_yql_block_length")))
+(let wideStream (WideFromBlocks (FromFlow (ExpandMap (ToFlow blockList) expandLambda))))
+
+(let narrowLambda (lambda '(key subkey value) (AsStruct '('"key" key) '('"subkey" subkey) '('"value" value))))
+(let list (ForwardList (NarrowMap (ToFlow wideStream) narrowLambda)))
+
+(let world (Write! world res_sink (Key) list '('('type))))
+(let world (Commit! world res_sink))
+(return world)
+)