Merge branch 'vbudati/SNOW-1794510-merge-decoder' into vbudati/SNOW-1794510-refactor-decoder

Author: sfc-gh-vbudati

src/snowflake/snowpark/_internal/proto/ast.proto

@@ -22,10 +22,6 @@ message List_SpDataType {
   repeated SpDataType list = 1;
 }
 
-message List_SpStructField {
-  repeated SpStructField list = 1;
-}
-
 message List_String {
   repeated string list = 1;
 }
@@ -178,7 +174,7 @@ message SpStructField {
 
 // sp-type.ir:46
 message SpStructType {
-  List_SpStructField fields = 1;
+  repeated SpStructField fields = 1;
   bool structured = 2;
 }
 

src/snowflake/snowpark/types.py

@@ -784,7 +784,7 @@ def json_value(self) -> Dict[str, Any]:
     def _fill_ast(self, ast: proto.SpDataType) -> None:
         ast.sp_struct_type.structured = self.structured
         for field in self.fields:
-            field._fill_ast(ast.sp_struct_type.fields.list.add())
+            field._fill_ast(ast.sp_struct_type.fields.add())
 
 
 class VariantType(DataType):

tests/ast/data/sproc.test

@@ -173,11 +173,11 @@ res33 = sproc("select_sp", return_type=StructType([StructField("A", IntegerType(
 
 session.sql("SELECT 1 as A, 2 as B").show()
 
-res37 = sproc("select_sp", return_type=StructType(structured=False), input_types=[IntegerType(), IntegerType()], source_code_display=False, _registered_object_name="\"MOCK_DATABASE\".\"MOCK_SCHEMA\".\"SNOWPARK_TEMP_PROCEDURE_xxx\"")(1, 2)
+res37 = sproc("select_sp", return_type=StructType([], structured=False), input_types=[IntegerType(), IntegerType()], source_code_display=False, _registered_object_name="\"MOCK_DATABASE\".\"MOCK_SCHEMA\".\"SNOWPARK_TEMP_PROCEDURE_xxx\"")(1, 2)
 
 session.sql("SELECT 1 as A, 2 as B").show()
 
-res41 = sproc("select_sp", return_type=StructType(structured=False), input_types=[LongType(), LongType()], _registered_object_name="\"MOCK_DATABASE\".\"MOCK_SCHEMA\".\"SNOWPARK_TEMP_PROCEDURE_xxx\"")(1, 2)
+res41 = sproc("select_sp", return_type=StructType([], structured=False), input_types=[LongType(), LongType()], _registered_object_name="\"MOCK_DATABASE\".\"MOCK_SCHEMA\".\"SNOWPARK_TEMP_PROCEDURE_xxx\"")(1, 2)
 
 session.sql("SELECT 1 as A, 2 as B").show()
 
@@ -1603,24 +1603,22 @@ body {
         return_type {
           sp_struct_type {
             fields {
-              list {
-                column_identifier {
-                  name: "A"
-                }
-                data_type {
-                  sp_integer_type: true
-                }
-                nullable: true
+              column_identifier {
+                name: "A"
               }
-              list {
-                column_identifier {
-                  name: "B"
-                }
-                data_type {
-                  sp_integer_type: true
-                }
-                nullable: true
+              data_type {
+                sp_integer_type: true
+              }
+              nullable: true
+            }
+            fields {
+              column_identifier {
+                name: "B"
+              }
+              data_type {
+                sp_integer_type: true
               }
+              nullable: true
             }
           }
         }

tests/ast/decoder.py

@@ -525,7 +525,7 @@ def decode_data_type_expr(
                 # The fields can be a list of Expr, a single Expr, or None.
                 fields = []
                 if hasattr(data_type_expr.sp_struct_type, "fields"):
-                    for field in data_type_expr.sp_struct_type.fields.list:
+                    for field in data_type_expr.sp_struct_type.fields:
                         column_identifier = field.column_identifier.name
                         data_type = self.decode_data_type_expr(field.data_type)
                         nullable = field.nullable
@@ -754,7 +754,7 @@ def decode_struct_type_expr(
             The decoded object.
         """
         struct_field_list = []
-        for field in sp_struct_type_expr.fields.list:
+        for field in sp_struct_type_expr.fields:
             column_identifier = field.column_identifier.name
             datatype = self.decode_data_type_expr(field.data_type)
             nullable = field.nullable