rdar://111955881 (Differentiate Create Table Unordered from Create Table default) (apache#1810)

Co-authored-by: Russell Spitzer <[email protected]>

Author: RussellSpitzer

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -4381,7 +4381,11 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
     val ordering = toOrdering(orderingSpec)
 
     val table = createUnresolvedTable(ctx.multipartIdentifier, "ALTER TABLE ... WRITE")
-    SetWriteDistributionAndOrdering(table, distributionMode, ordering)
+    if (distributionMode == "unordered") {
+      SetWriteDistributionAndOrdering(table, "none", ordering)
+    } else {
+      SetWriteDistributionAndOrdering(table, distributionMode, ordering)
+    }
   }
 
   private def toDistributionMode(
@@ -4391,7 +4395,8 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
     if (distributionSpec != null) {
       "hash"
     } else if (orderingSpec.UNORDERED != null || orderingSpec.LOCALLY != null) {
-      "none"
+      // Need to distinguish between "none" (default) and explicitly unordered
+      "unordered"
     } else {
       "range"
     }

sql/core/src/test/scala/org/apache/spark/sql/execution/command/PlanResolutionSuite.scala

@@ -3134,7 +3134,7 @@ class PlanResolutionSuite extends AnalysisTest {
           .add("description", StringType)
           .add("point", new StructType().add("x", DoubleType).add("y", DoubleType)))
         assert(create.partitioning == expectedPartitioning)
-        assert(create.distributionMode == "none")
+        assert(create.distributionMode == "unordered")
         assert(create.ordering == expectedOrdering)
         assert(create.tableSpec.properties == expectedProperties)
         assert(create.ignoreIfExists)
@@ -3167,7 +3167,7 @@ class PlanResolutionSuite extends AnalysisTest {
         assert(ctas.tableSpec.properties == expectedProperties)
         assert(ctas.writeOptions.isEmpty)
         assert(ctas.partitioning.isEmpty)
-        assert(ctas.distributionMode == "none")
+        assert(ctas.distributionMode == "unordered")
         assert(ctas.ordering.isEmpty)
         assert(ctas.ignoreIfExists)