fix: removing the updates to ddl tables

Author: gord02

core/src/main/java/io/substrait/relation/AbstractDdlRel.java

@@ -9,7 +9,7 @@
 public abstract class AbstractDdlRel extends ZeroInputRel {
   public abstract NamedStruct getTableSchema();
 
-  public abstract Expression.StructNested getTableDefaults();
+  public abstract Expression.StructLiteral getTableDefaults();
 
   public abstract DdlObject getObject();
 

core/src/main/java/io/substrait/relation/ProtoRelConverter.java

@@ -274,11 +274,11 @@ protected Optional<Rel> optionalViewDefinition(DdlRel rel) {
     return Optional.ofNullable(rel.hasViewDefinition() ? from(rel.getViewDefinition()) : null);
   }
 
-  protected Expression.StructNested tableDefaults(
-      io.substrait.proto.Expression.Nested.Struct struct, NamedStruct tableSchema) {
+  protected Expression.StructLiteral tableDefaults(
+      io.substrait.proto.Expression.Literal.Struct struct, NamedStruct tableSchema) {
     ProtoExpressionConverter converter =
         new ProtoExpressionConverter(lookup, extensions, tableSchema.struct(), this);
-    return Expression.StructNested.builder()
+    return Expression.StructLiteral.builder()
         .fields(
             struct.getFieldsList().stream()
                 .map(converter::from)

core/src/main/java/io/substrait/relation/RelProtoConverter.java

@@ -461,7 +461,7 @@ public Rel visit(NamedDdl ddl, EmptyVisitationContext context) throws RuntimeExc
         DdlRel.newBuilder()
             .setCommon(common(ddl))
             .setTableSchema(ddl.getTableSchema().toProto(typeProtoConverter))
-            .setTableDefaults(toProto(ddl.getTableDefaults()).getNested().getStruct())
+            .setTableDefaults(toProto(ddl.getTableDefaults()).getLiteral().getStruct())
             .setNamedObject(NamedObjectWrite.newBuilder().addAllNames(ddl.getNames()))
             .setObject(ddl.getObject().toProto())
             .setOp(ddl.getOperation().toProto());
@@ -478,7 +478,7 @@ public Rel visit(ExtensionDdl ddl, EmptyVisitationContext context) throws Runtim
         DdlRel.newBuilder()
             .setCommon(common(ddl))
             .setTableSchema(ddl.getTableSchema().toProto(typeProtoConverter))
-            .setTableDefaults(toProto(ddl.getTableDefaults()).getNested().getStruct())
+            .setTableDefaults(toProto(ddl.getTableDefaults()).getLiteral().getStruct())
             .setExtensionObject(
                 ExtensionObject.newBuilder().setDetail(ddl.getDetail().toProto(this)))
             .setObject(ddl.getObject().toProto())

core/src/test/java/io/substrait/type/proto/DdlRelRoundtripTest.java

@@ -5,13 +5,11 @@
 import io.substrait.TestBase;
 import io.substrait.expression.Expression;
 import io.substrait.expression.ExpressionCreator;
-import io.substrait.relation.ExtensionDdl;
 import io.substrait.relation.NamedDdl;
 import io.substrait.relation.ProtoRelConverter;
 import io.substrait.relation.Rel;
 import io.substrait.relation.VirtualTableScan;
 import io.substrait.type.NamedStruct;
-import io.substrait.utils.StringHolder;
 import io.substrait.utils.StringHolderHandlingProtoRelConverter;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -25,11 +23,9 @@ void create() {
         NamedStruct.of(
             Stream.of("column1", "column2").collect(Collectors.toList()), R.struct(R.I64, R.I64));
 
-    Expression.StructNested defaults =
-        Expression.StructNested.builder()
-            .addFields(ExpressionCreator.i64(false, 1))
-            .addFields(ExpressionCreator.i64(false, 2))
-            .build();
+    Expression.StructLiteral defaults =
+        ExpressionCreator.struct(
+            false, ExpressionCreator.i64(false, 1), ExpressionCreator.i64(false, 2));
 
     NamedDdl command =
         NamedDdl.builder()
@@ -48,8 +44,6 @@ void alter() {
     ProtoRelConverter protoRelConverter =
         new StringHolderHandlingProtoRelConverter(functionCollector, defaultExtensionCollection);
 
-    StringHolder detail = new StringHolder("DETAIL");
-
     NamedStruct schema =
         NamedStruct.of(
             Stream.of("column1", "column2").collect(Collectors.toList()), R.struct(R.I64, R.I64));
@@ -63,18 +57,8 @@ void alter() {
     VirtualTableScan virtTable =
         VirtualTableScan.builder().initialSchema(schema).addRows(defaults).build();
 
-    ExtensionDdl command =
-        ExtensionDdl.builder()
-            .viewDefinition(virtTable)
-            .tableSchema(schema)
-            .tableDefaults(defaults)
-            .detail(detail)
-            .operation(ExtensionDdl.DdlOp.ALTER)
-            .object(ExtensionDdl.DdlObject.VIEW)
-            .build();
-
-    io.substrait.proto.Rel protoRel = relProtoConverter.toProto(command);
+    io.substrait.proto.Rel protoRel = relProtoConverter.toProto(virtTable);
     Rel relReturned = protoRelConverter.from(protoRel);
-    assertEquals(command, relReturned);
+    assertEquals(virtTable, relReturned);
   }
 }

isthmus/src/main/java/io/substrait/isthmus/SubstraitRelVisitor.java

@@ -504,7 +504,7 @@ public Rel handleCreateView(CreateView createView) {
     RelNode input = createView.getInput();
     Rel inputRel = apply(input);
 
-    final Expression.StructNested defaults = ExpressionCreator.struct(new ArrayList<>());
+    final Expression.StructLiteral defaults = ExpressionCreator.struct(false);
 
     return NamedDdl.builder()
         .viewDefinition(inputRel)

spark/src/main/scala/io/substrait/spark/logical/ToSubstraitRel.scala

@@ -43,6 +43,7 @@ import io.substrait.{proto, relation}
 import io.substrait.debug.TreePrinter
 import io.substrait.expression.{Expression => SExpression, ExpressionCreator}
 import io.substrait.expression.Expression.StructNested
+import io.substrait.expression.ImmutableExpression.StructLiteral
 import io.substrait.extension.ExtensionCollector
 import io.substrait.hint.Hint
 import io.substrait.plan.Plan
@@ -455,25 +456,25 @@ class ToSubstraitRel extends AbstractLogicalPlanVisitor with Logging {
     if (data.isEmpty) {
       relation.EmptyScan.builder().initialSchema(namedStruct).build()
     } else {
-      var list = data
-        .map(
-          row => {
-            var idx = 0
-            val buf = new ArrayBuffer[SExpression.Literal](row.numFields)
-            while (idx < row.numFields) {
-              val dt = schema(idx).dataType
-              val l = Literal.apply(row.get(idx, dt), dt)
-              buf += ToSubstraitLiteral.apply(l)
-              idx += 1
-            }
-            ExpressionCreator.struct(false, buf.asJava)
-          })
-        .asJava
 
       relation.VirtualTableScan
         .builder()
         .initialSchema(namedStruct)
-        .addAllRows(ExpressionCreator.toNested(list))
+        .addAllRows(
+          data
+            .map(
+              row => {
+                var idx = 0
+                val buf = new ArrayBuffer[SExpression.Literal](row.numFields)
+                while (idx < row.numFields) {
+                  val dt = schema(idx).dataType
+                  val l = Literal.apply(row.get(idx, dt), dt)
+                  buf += ToSubstraitLiteral.apply(l)
+                  idx += 1
+                }
+                ExpressionCreator.struct(buf.asJava)
+              })
+            .asJava)
         .build()
     }
   }
@@ -661,7 +662,7 @@ class ToSubstraitRel extends AbstractLogicalPlanVisitor with Logging {
       .`object`(DdlObject.TABLE)
       .names(seqAsJavaList(names))
       .tableSchema(ToSubstraitType.toNamedStruct(schema))
-      .tableDefaults(StructNested.builder().build())
+      .tableDefaults(StructLiteral.builder.nullable(true).build())
       .build()
   }
 
@@ -673,7 +674,7 @@ class ToSubstraitRel extends AbstractLogicalPlanVisitor with Logging {
       .names(seqAsJavaList(names))
       .tableSchema(
         NamedStruct.builder().struct(Type.Struct.builder().nullable(true).build()).build())
-      .tableDefaults(StructNested.builder().build())
+      .tableDefaults(StructLiteral.builder.nullable(true).build())
       .build()
   }