Merge pull request #12554 from vitalyisaev2/YQ-3839.with_rightlib.3

Import from Arcadia + YDB FQ: turning gateways_config.proto into a file without external dependencies

9 files changed, 15 insertions, 15 deletions

diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.cfg
index 62b2a5fe18..d575d2a0c9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.cfg
@@ -2,4 +2,4 @@ in Input input.txt
 out Output output.txt
 res result.txt
 udf python3_udf
-providers dummy
+providers yt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.sql
index 0f5cd0b0c6..71ad92d19d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.sql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.sql
@@ -8,7 +8,7 @@ GROUP BY Length(key) as skey);
 $udfScript = @@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@;
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yql
index 3df99f0f47..dc7c70cea6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yql
@@ -28,7 +28,7 @@
             (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@))) '0))
@@ -36,7 +36,7 @@ def f(input,x):
             (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@)) inputRowsList (Int32 '"1")))
@@ -49,7 +49,7 @@ def f(input,x):
         (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@))) '0))
@@ -57,7 +57,7 @@ def f(input,x):
         (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@)) inputRowsList (Int32 '"2")))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.cfg
index 62b2a5fe18..d575d2a0c9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.cfg
@@ -2,4 +2,4 @@ in Input input.txt
 out Output output.txt
 res result.txt
 udf python3_udf
-providers dummy
+providers yt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.sql
index f0bd1ff3ba..e15ee6feeb 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.sql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.sql
@@ -8,7 +8,7 @@ GROUP BY Length(key) as skey);
 $udfScript = @@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@;
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yql
index 3e8637fc54..2143f06bf2 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yql
@@ -26,7 +26,7 @@
         (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@))) '0))
@@ -34,7 +34,7 @@ def f(input,x):
         (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 @@)) inputRowsList (Int32 '"1")))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.cfg
index 62b2a5fe18..d575d2a0c9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.cfg
@@ -2,4 +2,4 @@ in Input input.txt
 out Output output.txt
 res result.txt
 udf python3_udf
-providers dummy
+providers yt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.sql
index c87931cafd..d3690a17e4 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.sql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.sql
@@ -8,7 +8,7 @@ GROUP BY Length(key) as skey);
 $udfScript = @@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
       
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yql
index 5656d60fc3..5495292e2e 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yql
@@ -28,7 +28,7 @@
             (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 
@@ -39,7 +39,7 @@ def f2(a,b,c):
             (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d
 
@@ -55,7 +55,7 @@ def f2(a,b,c):
         (let res (Apply (ScriptUdf 'Python3 '"f2" (CallableType '() '((StructType '('"a" (DataType 'Uint32)) '('"b" (DataType 'Uint64)) '('"c" (DataType 'Int32)))) '((DataType 'Uint32) 'skey) '((DataType 'Uint64) 'cnt) '((DataType 'Int32) 'pass)) (String '@@
 def f(input,x):
    for i in list(input):
-      d = i.__dict__
+      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
       d["pass"] = x
       yield d