Revert "YQL-17476 check for cycle during evaluation of file args (ydb-platform#1608)"

This reverts commit 1c12b54.

Author: rvu1024

ydb/library/yql/providers/config/yql_config_provider.cpp

@@ -168,7 +168,7 @@ namespace {
                         for (auto& arg: flag.GetArgs()) {
                             args.push_back(arg);
                         }
-                        if (!ApplyFlag(pos, flag.GetName(), args, ctx, 0)) {
+                        if (!ApplyFlag(pos, flag.GetName(), args, ctx)) {
                             return false;
                         }
                     }
@@ -260,23 +260,15 @@ namespace {
                         for (size_t i = 3; i < node->ChildrenSize(); ++i) {
                             if (node->Child(i)->IsCallable("EvaluateAtom")) {
                                 hasPendingEvaluations = true;
-                                break;
+                                return res;
                             }
                             if (!EnsureAtom(*node->Child(i), ctx)) {
                                 return {};
                             }
                             args.push_back(node->Child(i)->Content());
                         }
 
-                        if (hasPendingEvaluations) {
-                            if (!ValidateEvaluation(command, *node, ctx)) {
-                                return {};
-                            }
-
-                            return res;
-                        }
-
-                        if (!ApplyFlag(ctx.GetPosition(node->Child(2)->Pos()), command, args, ctx, node->UniqueId())) {
+                        if (!ApplyFlag(ctx.GetPosition(node->Child(2)->Pos()), command, args, ctx)) {
                             return {};
                         }
 
@@ -468,30 +460,7 @@ namespace {
             return true;
         }
 
-        bool ValidateEvaluation(const TStringBuf name, const TExprNode& node, TExprContext& ctx) {
-            if (name == "AddFileByUrl" || name == "AddFolderByUrl") {
-                if (node.ChildrenSize() < 4) {
-                    ctx.AddError(TIssue(ctx.GetPosition(node.Pos()), TStringBuilder() << "Expected at least 4 arguments, but got " << node.ChildrenSize()));
-                    return false;
-                }
-
-                if (node.Child(3)->IsCallable("EvaluateAtom")) {
-                    return true;
-                }
-
-                if (!PendingEvaluationFiles.insert({TString(node.Child(3)->Content()), node.UniqueId()}).second) {
-                    ctx.AddError(TIssue(ctx.GetPosition(node.Pos()), TStringBuilder() << "Detected evaluation cycle for file: " << node.Child(3)->Content()));
-                    return false;
-                }
-
-                return true;
-            } else {
-                return true;
-            }
-        }
-
-        bool ApplyFlag(const TPosition& pos, const TStringBuf name, const TVector<TStringBuf>& args, TExprContext& ctx,
-            ui64 nodeUniqueId) {
+        bool ApplyFlag(const TPosition& pos, const TStringBuf name, const TVector<TStringBuf>& args, TExprContext& ctx) {
             if (!IsSettingAllowed(pos, name, ctx)) {
                 return false;
             }
@@ -505,15 +474,15 @@ namespace {
                     return false;
                 }
             } else if (name == "AddFileByUrl") {
-                if (!AddFileByUrl(pos, args, ctx, nodeUniqueId)) {
+                if (!AddFileByUrl(pos, args, ctx)) {
                     return false;
                 }
             } else if (name == "SetFileOption") {
                 if (!SetFileOption(pos, args, ctx)) {
                     return false;
                 }
             } else if (name == "AddFolderByUrl") {
-                if (!AddFolderByUrl(pos, args, ctx, nodeUniqueId)) {
+                if (!AddFolderByUrl(pos, args, ctx)) {
                     return false;
                 }
             } else if (name == "SetPackageVersion") {
@@ -1026,13 +995,12 @@ namespace {
             return true;
         }
 
-        bool AddFileByUrl(const TPosition& pos, const TVector<TStringBuf>& args, TExprContext& ctx, ui64 nodeUniqueId) {
+        bool AddFileByUrl(const TPosition& pos, const TVector<TStringBuf>& args, TExprContext& ctx) {
             if (args.size() < 2 || args.size() > 3) {
                 ctx.AddError(TIssue(pos, TStringBuilder() << "Expected 2 or 3 arguments, but got " << args.size()));
                 return false;
             }
 
-            PendingEvaluationFiles.erase({TString(args[0]),nodeUniqueId});
             TStringBuf token = args.size() == 3 ? args[2] : TStringBuf();
             if (token) {
                 if (auto cred = Types.Credentials->FindCredential(token)) {
@@ -1146,13 +1114,12 @@ namespace {
             return url;
         }
 
-        bool AddFolderByUrl(const TPosition& pos, const TVector<TStringBuf>& args, TExprContext& ctx, ui64 nodeUniqueId) {
+        bool AddFolderByUrl(const TPosition& pos, const TVector<TStringBuf>& args, TExprContext& ctx) {
             if (args.size() < 2 || args.size() > 3) {
                 ctx.AddError(TIssue(pos, TStringBuilder() << "Expected 2 or 3 arguments, but got " << args.size()));
                 return false;
             }
 
-            PendingEvaluationFiles.erase({TString(args[0]),nodeUniqueId});
             TStringBuf token = args.size() == 3 ? args[2] : TStringBuf();
             if (token) {
                 if (auto cred = Types.Credentials->FindCredential(token)) {
@@ -1249,7 +1216,6 @@ namespace {
         TString Username;
         const TAllowSettingPolicy Policy;
         TOperationStatistics Statistics;
-        THashSet<std::pair<TString, ui64>> PendingEvaluationFiles;
     };
 }
 

ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json

@@ -21,11 +21,6 @@
         }
     ],
     "test.test[action-evaluate_pure--Results]": [],
-    "test.test[action-file_cycle--Results]": [
-        {
-            "uri": "file://test.test_action-file_cycle--Results_/extracted"
-        }
-    ],
     "test.test[action-nested_eval-default.txt-Analyze]": [
         {
             "checksum": "b4dd508a329723c74293d80f0278c705",

ydb/library/yql/tests/sql/dq_file/part8/canondata/test.test_action-file_cycle--Results_/extracted

@@ -412,13 +412,6 @@
             "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_action-export_action_/sql.yql"
         }
     ],
-    "test_sql2yql.test[action-file_cycle]": [
-        {
-            "checksum": "095c2c315ba26037554c056a02f5af05",
-            "size": 343,
-            "uri": "https://{canondata_backend}/1871002/4d084a25cea0c62bd09f3c9e9e7c2b56d112c5b1/resource.tar.gz#test_sql2yql.test_action-file_cycle_/sql.yql"
-        }
-    ],
     "test_sql2yql.test[action-inline_action]": [
         {
             "checksum": "8a5ec6d478e5d8d125841b8105d50706",
@@ -18185,13 +18178,6 @@
             "uri": "https://{canondata_backend}/1871102/17992aa919577eec0f31ef167084ab70f41ccc80/resource.tar.gz#test_sql_format.test_action-export_action_/formatted.sql"
         }
     ],
-    "test_sql_format.test[action-file_cycle]": [
-        {
-            "checksum": "5476df82092007027246993752e24f68",
-            "size": 45,
-            "uri": "https://{canondata_backend}/1871002/4d084a25cea0c62bd09f3c9e9e7c2b56d112c5b1/resource.tar.gz#test_sql_format.test_action-file_cycle_/formatted.sql"
-        }
-    ],
     "test_sql_format.test[action-inline_action]": [
         {
             "checksum": "7da554999ea3520183678c730ae2fffb",

ydb/library/yql/tests/sql/sql2yql/canondata/result.json

@@ -20,13 +20,6 @@
             "uri": "https://{canondata_backend}/1900335/4871e48d29e4933514d3ed0c9c5d19de571eda1f/resource.tar.gz#test.test_action-evaluate_pure--Results_/results.txt"
         }
     ],
-    "test.test[action-file_cycle--Debug]": [],
-    "test.test[action-file_cycle--Plan]": [],
-    "test.test[action-file_cycle--Results]": [
-        {
-            "uri": "file://test.test_action-file_cycle--Results_/extracted"
-        }
-    ],
     "test.test[action-nested_eval-default.txt-Debug]": [
         {
             "checksum": "79af7d3cdd20c4123718aae10c3202d7",