Change conditions for enabling block input (#11600)

loochek · web-flow · commit ea6af5f19027 · 2024-11-19T17:53:24.000+03:00
diff --git a/ydb/library/yql/providers/yt/provider/yql_yt_block_input_filter.cpp b/ydb/library/yql/providers/yt/provider/yql_yt_block_input_filter.cpp
@@ -39,7 +39,7 @@ class YtBlockInputFilterTransformer : public TOptimizeTransformerBase {
 
     TMaybeNode<TExprBase> HandleMap(TExprBase node, TExprContext& ctx) const {
         auto map = node.Cast<TYtMap>();
-        if (!State_->Configuration->JobBlockInput.Get().GetOrElse(Types->UseBlocks || Types->BlockEngineMode != EBlockEngineMode::Disable)) {
+        if (!State_->Configuration->JobBlockInput.Get().GetOrElse(Types->UseBlocks)) {
             return map;
         }
 
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
@@ -729,9 +729,9 @@
     ],
     "test.test[blocks-type_and_callable_stats--Debug]": [
         {
-            "checksum": "8b19fc3bd751064da3be585eec86d072",
-            "size": 3162,
-            "uri": "https://{canondata_backend}/1600758/2dc19465f48c728834a4a3ba696598f2f30efa2e/resource.tar.gz#test.test_blocks-type_and_callable_stats--Debug_/opt.yql"
+            "checksum": "abf887f971c093b3c766c0d61de9bfa5",
+            "size": 3140,
+            "uri": "https://{canondata_backend}/1942278/7c66ffff1df826f3e0283b5718f3b64fef634b24/resource.tar.gz#test.test_blocks-type_and_callable_stats--Debug_/opt.yql"
         }
     ],
     "test.test[blocks-type_and_callable_stats--Peephole]": [

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class YtBlockInputFilterTransformer : public TOptimizeTransformerBase {`
`39`	`39`
`40`	`40`	`TMaybeNode<TExprBase> HandleMap(TExprBase node, TExprContext& ctx) const {`
`41`	`41`	`auto map = node.Cast<TYtMap>();`
`42`		`- if (!State_->Configuration->JobBlockInput.Get().GetOrElse(Types->UseBlocks \|\| Types->BlockEngineMode != EBlockEngineMode::Disable)) {`
	`42`	`+ if (!State_->Configuration->JobBlockInput.Get().GetOrElse(Types->UseBlocks)) {`
`43`	`43`	`return map;`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -729,9 +729,9 @@`
`729`	`729`	`],`
`730`	`730`	`"test.test[blocks-type_and_callable_stats--Debug]": [`
`731`	`731`	`{`
`732`		`- "checksum": "8b19fc3bd751064da3be585eec86d072",`
`733`		`- "size": 3162,`
`734`		`- "uri": "https://{canondata_backend}/1600758/2dc19465f48c728834a4a3ba696598f2f30efa2e/resource.tar.gz#test.test_blocks-type_and_callable_stats--Debug_/opt.yql"`
	`732`	`+ "checksum": "abf887f971c093b3c766c0d61de9bfa5",`
	`733`	`+ "size": 3140,`
	`734`	`+ "uri": "https://{canondata_backend}/1942278/7c66ffff1df826f3e0283b5718f3b64fef634b24/resource.tar.gz#test.test_blocks-type_and_callable_stats--Debug_/opt.yql"`
`735`	`735`	`}`
`736`	`736`	`],`
`737`	`737`	`"test.test[blocks-type_and_callable_stats--Peephole]": [`