Resolve conflict

apache · Nov 28, 2023 · 8f8c09c · 8f8c09c
1 parent d98b7a2
commit 8f8c09c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/extensions/spark/kyuubi-spark-authz/src/main/resources/database_command_spec.json b/extensions/spark/kyuubi-spark-authz/src/main/resources/database_command_spec.json
@@ -215,4 +215,4 @@
   } ],
   "opType" : "SWITCHDATABASE",
   "uriDescs" : [ ]
-} ]
+} ]
diff --git a/extensions/spark/kyuubi-spark-authz/src/main/resources/function_command_spec.json b/extensions/spark/kyuubi-spark-authz/src/main/resources/function_command_spec.json
@@ -111,4 +111,4 @@
     "comment" : ""
   } ],
   "opType" : "RELOADFUNCTION"
-} ]
+} ]
diff --git a/extensions/spark/kyuubi-spark-authz/src/main/resources/scan_command_spec.json b/extensions/spark/kyuubi-spark-authz/src/main/resources/scan_command_spec.json
@@ -111,4 +111,4 @@
     "comment" : ""
   } ],
   "uriDescs" : [ ]
-} ]
+} ]
diff --git a/extensions/spark/kyuubi-spark-authz/src/main/resources/table_command_spec.json b/extensions/spark/kyuubi-spark-authz/src/main/resources/table_command_spec.json
@@ -16,7 +16,8 @@
   "uriDescs" : [ {
     "fieldName" : "child",
     "fieldExtractor" : "ResolvedTableURIExtractor",
-    "isInput" : false
+    "isInput" : false,
+    "comment" : ""
   } ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.AddPartitions",
@@ -52,7 +53,8 @@
   "uriDescs" : [ {
     "fieldName" : "child",
     "fieldExtractor" : "ResolvedTableURIExtractor",
-    "isInput" : false
+    "isInput" : false,
+    "comment" : ""
   } ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.AlterTable",
@@ -72,7 +74,8 @@
   "uriDescs" : [ {
     "fieldName" : "ident",
     "fieldExtractor" : "IdentifierURIExtractor",
-    "isInput" : false
+    "isInput" : false,
+    "comment" : ""
   } ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.AppendData",
@@ -334,7 +337,8 @@
   "uriDescs" : [ {
     "fieldName" : "child",
     "fieldExtractor" : "ResolvedTableURIExtractor",
-    "isInput" : false
+    "isInput" : false,
+    "comment" : ""
   } ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.DropPartitions",
@@ -497,7 +501,8 @@
   "uriDescs" : [ {
     "fieldName" : "child",
     "fieldExtractor" : "ResolvedTableURIExtractor",
-    "isInput" : false
+    "isInput" : false,
+    "comment" : ""
   } ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.RenamePartitions",
@@ -549,7 +554,8 @@
   "uriDescs" : [ {
     "fieldName" : "child",
     "fieldExtractor" : "ResolvedTableURIExtractor",
-    "isInput" : false
+    "isInput" : false,
+    "comment" : ""
   } ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.ReplaceData",
@@ -703,7 +709,8 @@
   "uriDescs" : [ {
     "fieldName" : "table",
     "fieldExtractor" : "ResolvedTableURIExtractor",
-    "isInput" : false
+    "isInput" : false,
+    "comment" : ""
   } ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.ShowCreateTable",
@@ -2556,4 +2563,4 @@
     "isInput" : false,
     "comment" : "Delta"
   } ]
-} ]
+} ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,4 +215,4 @@ @@
       } ],
       "opType" : "SWITCHDATABASE",
       "uriDescs" : [ ]
-    } ]
+    } ]