[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user asfgit closed the pull request at: https://github.com/apache/spark/pull/16296 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user cloud-fan commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94884658
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/internal/HiveSerDe.scala ---
@@ -77,4 +79,16 @@ object HiveSerDe {
serdeMap.get(key)
}
+
+ def getDefaultStorage(conf: SQLConf): CatalogStorageFormat = {
+val defaultStorageType = conf.getConfString("hive.default.fileformat",
"textfile")
+val defaultHiveSerde = sourceToSerDe(defaultStorageType)
+CatalogStorageFormat.empty.copy(
+ inputFormat = defaultHiveSerde.flatMap(_.inputFormat)
+.orElse(Some("org.apache.hadoop.mapred.TextInputFormat")),
+ outputFormat = defaultHiveSerde.flatMap(_.outputFormat)
+
.orElse(Some("org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat")),
+ serde = defaultHiveSerde.flatMap(_.serde)
+
.orElse(Some("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe")))
--- End diff --
no, because they are same fundamentally.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94884267
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/internal/HiveSerDe.scala ---
@@ -77,4 +79,16 @@ object HiveSerDe {
serdeMap.get(key)
}
+
+ def getDefaultStorage(conf: SQLConf): CatalogStorageFormat = {
+val defaultStorageType = conf.getConfString("hive.default.fileformat",
"textfile")
+val defaultHiveSerde = sourceToSerDe(defaultStorageType)
+CatalogStorageFormat.empty.copy(
+ inputFormat = defaultHiveSerde.flatMap(_.inputFormat)
+.orElse(Some("org.apache.hadoop.mapred.TextInputFormat")),
+ outputFormat = defaultHiveSerde.flatMap(_.outputFormat)
+
.orElse(Some("org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat")),
+ serde = defaultHiveSerde.flatMap(_.serde)
+
.orElse(Some("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe")))
--- End diff --
Does this version break any test?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user cloud-fan commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94759790
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/internal/HiveSerDe.scala ---
@@ -77,4 +79,16 @@ object HiveSerDe {
serdeMap.get(key)
}
+
+ def getDefaultStorage(conf: SQLConf): CatalogStorageFormat = {
+val defaultStorageType = conf.getConfString("hive.default.fileformat",
"textfile")
+val defaultHiveSerde = sourceToSerDe(defaultStorageType)
+CatalogStorageFormat.empty.copy(
+ inputFormat = defaultHiveSerde.flatMap(_.inputFormat)
+.orElse(Some("org.apache.hadoop.mapred.TextInputFormat")),
+ outputFormat = defaultHiveSerde.flatMap(_.outputFormat)
+
.orElse(Some("org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat")),
+ serde = defaultHiveSerde.flatMap(_.serde)
+
.orElse(Some("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe")))
--- End diff --
it's a little different from what it was. Previously we don't set default
serde at
[parser](https://github.com/apache/spark/pull/16296/files#diff-1bb4f7bd5a2656f48bcd3c857167a11bL1069),
but set it during
[analysis](https://github.com/apache/spark/pull/16296/files#diff-c4ed9859978dd6ac271b6a40ee945e4bL54).
However, this doesn't make sense and I think we should just provide the
default serde at the beginning.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94700700
--- Diff:
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala ---
@@ -18,14 +18,79 @@
package org.apache.spark.sql.hive
import org.apache.spark.sql._
+import org.apache.spark.sql.catalyst.catalog.CatalogStorageFormat
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.planning._
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.execution._
-import org.apache.spark.sql.execution.command.ExecutedCommandExec
+import org.apache.spark.sql.execution.command.{DDLUtils,
ExecutedCommandExec}
import org.apache.spark.sql.execution.datasources.CreateTable
import org.apache.spark.sql.hive.execution._
+import org.apache.spark.sql.internal.{HiveSerDe, SQLConf}
+
+
+/**
+ * Determine the serde/format of the Hive serde table, according to the
storage properties.
+ */
+class DetermineHiveSerde(conf: SQLConf) extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan
resolveOperators {
+case c @ CreateTable(t, _, _) if DDLUtils.isHiveTable(t) &&
t.storage.inputFormat.isEmpty =>
+ if (t.bucketSpec.nonEmpty) {
+throw new AnalysisException("Cannot create bucketed Hive serde
table.")
+ }
+
+ val defaultStorage: CatalogStorageFormat = {
+val defaultStorageType =
conf.getConfString("hive.default.fileformat", "textfile")
+val defaultHiveSerde = HiveSerDe.sourceToSerDe(defaultStorageType)
+CatalogStorageFormat(
+ locationUri = None,
+ inputFormat = defaultHiveSerde.flatMap(_.inputFormat)
+.orElse(Some("org.apache.hadoop.mapred.TextInputFormat")),
+ outputFormat = defaultHiveSerde.flatMap(_.outputFormat)
+
.orElse(Some("org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat")),
+ serde = defaultHiveSerde.flatMap(_.serde)
+
.orElse(Some("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe")),
+ compressed = false,
+ properties = Map())
+ }
--- End diff --
Can we create a function to generate `defaultStorage`? We are having the
[duplicate codes](TextInputFormat) in the parser.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94699866
--- Diff:
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala ---
@@ -18,14 +18,79 @@
package org.apache.spark.sql.hive
import org.apache.spark.sql._
+import org.apache.spark.sql.catalyst.catalog.CatalogStorageFormat
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.planning._
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.execution._
-import org.apache.spark.sql.execution.command.ExecutedCommandExec
+import org.apache.spark.sql.execution.command.{DDLUtils,
ExecutedCommandExec}
import org.apache.spark.sql.execution.datasources.CreateTable
import org.apache.spark.sql.hive.execution._
+import org.apache.spark.sql.internal.{HiveSerDe, SQLConf}
+
+
+/**
+ * Determine the serde/format of the Hive serde table, according to the
storage properties.
+ */
+class DetermineHiveSerde(conf: SQLConf) extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan
resolveOperators {
+case c @ CreateTable(t, _, _) if DDLUtils.isHiveTable(t) &&
t.storage.inputFormat.isEmpty =>
+ if (t.bucketSpec.nonEmpty) {
+throw new AnalysisException("Cannot create bucketed Hive serde
table.")
+ }
+
+ val defaultStorage: CatalogStorageFormat = {
+val defaultStorageType =
conf.getConfString("hive.default.fileformat", "textfile")
+val defaultHiveSerde = HiveSerDe.sourceToSerDe(defaultStorageType)
+CatalogStorageFormat(
+ locationUri = None,
+ inputFormat = defaultHiveSerde.flatMap(_.inputFormat)
+.orElse(Some("org.apache.hadoop.mapred.TextInputFormat")),
+ outputFormat = defaultHiveSerde.flatMap(_.outputFormat)
+
.orElse(Some("org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat")),
+ serde = defaultHiveSerde.flatMap(_.serde)
+
.orElse(Some("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe")),
+ compressed = false,
+ properties = Map())
+ }
+
+ val options = new HiveOptions(t.storage.properties)
+
+ val fileStorage = if (options.format.isDefined) {
+HiveSerDe.sourceToSerDe(options.format.get) match {
+ case Some(s) =>
+CatalogStorageFormat.empty.copy(
+ inputFormat = s.inputFormat,
+ outputFormat = s.outputFormat,
+ serde = s.serde)
+ case None =>
+throw new IllegalArgumentException(s"invalid format:
'${options.format.get}'")
+}
+ } else if (options.inputFormat.isDefined) {
--- End diff --
Maybe we should use a helper function to know if inputFormat and
outputFormat are set? The current version assumes that the reader know the
internal of HiveOptions.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94700062
--- Diff:
sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveDDLCommandSuite.scala ---
@@ -592,4 +597,77 @@ class HiveDDLCommandSuite extends PlanTest with
SQLTestUtils with TestHiveSingle
val hiveClient =
spark.sharedState.externalCatalog.asInstanceOf[HiveExternalCatalog].client
assert(hiveClient.getConf("hive.in.test", "") == "true")
}
+
+ test("create hive serde table with new syntax - basic") {
+val sql =
+ """
+|CREATE TABLE t
+|(id int, name string COMMENT 'blabla')
+|USING hive
+|OPTIONS (format 'parquet', my_prop 1)
+|LOCATION '/tmp/file'
+|COMMENT 'BLABLA'
+ """.stripMargin
+
+val table = analyzeCreateTable(sql)
+assert(table.schema == new StructType()
+ .add("id", "int")
+ .add("name", "string", nullable = true, comment = "blabla"))
+assert(table.provider == Some(DDLUtils.HIVE_PROVIDER))
+assert(table.storage.locationUri == Some("/tmp/file"))
+assert(table.storage.properties == Map("my_prop" -> "1"))
+assert(table.comment == Some("BLABLA"))
+
+assert(table.storage.inputFormat ==
+
Some("org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat"))
+assert(table.storage.outputFormat ==
+
Some("org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat"))
+assert(table.storage.serde ==
+ Some("org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe"))
+ }
+
+ test("create hive serde table with new syntax - with partition and
bucketing") {
+val v1 = "CREATE TABLE t (c1 int, c2 int) USING hive PARTITIONED BY
(c2)"
+val table = analyzeCreateTable(v1)
+assert(table.schema == new StructType().add("c1", "int").add("c2",
"int"))
+assert(table.partitionColumnNames == Seq("c2"))
+// check the default formats
+assert(table.storage.serde ==
Some("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"))
+assert(table.storage.inputFormat ==
Some("org.apache.hadoop.mapred.TextInputFormat"))
+assert(table.storage.outputFormat ==
+ Some("org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat"))
+
+val v2 = "CREATE TABLE t (c1 int, c2 int) USING hive CLUSTERED BY (c2)
INTO 4 BUCKETS"
+val e = intercept[AnalysisException](analyzeCreateTable(v2))
+assert(e.message.contains("Cannot create bucketed Hive serde table"))
--- End diff --
Let's also have a test using both partitioning and bucketing.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94698030
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala ---
@@ -342,42 +342,46 @@ class SparkSqlAstBuilder(conf: SQLConf) extends
AstBuilder {
}
/**
- * Create a data source table, returning a [[CreateTable]] logical plan.
+ * Create a table, returning a [[CreateTable]] logical plan.
*
* Expected format:
* {{{
- * CREATE [EXTERNAL] TABLE [IF NOT EXISTS] [db_name.]table_name
+ * CREATE [TEMPORARY] TABLE [IF NOT EXISTS] [db_name.]table_name
* USING table_provider
* [OPTIONS table_property_list]
* [PARTITIONED BY (col_name, col_name, ...)]
* [CLUSTERED BY (col_name, col_name, ...)
*[SORTED BY (col_name [ASC|DESC], ...)]
*INTO num_buckets BUCKETS
* ]
+ * [LOCATION path]
+ * [COMMENT table_comment]
* [AS select_statement];
* }}}
*/
- override def visitCreateTableUsing(ctx: CreateTableUsingContext):
LogicalPlan = withOrigin(ctx) {
+ override def visitCreateTable(ctx: CreateTableContext): LogicalPlan =
withOrigin(ctx) {
val (table, temp, ifNotExists, external) =
visitCreateTableHeader(ctx.createTableHeader)
if (external) {
operationNotAllowed("CREATE EXTERNAL TABLE ... USING", ctx)
}
-val options =
Option(ctx.tablePropertyList).map(visitPropertyKeyValues).getOrElse(Map.empty)
+val options =
Option(ctx.options).map(visitPropertyKeyValues).getOrElse(Map.empty)
val provider = ctx.tableProvider.qualifiedName.getText
-if (provider.toLowerCase == DDLUtils.HIVE_PROVIDER) {
- throw new AnalysisException("Cannot create hive serde table with
CREATE TABLE USING")
-}
val schema = Option(ctx.colTypeList()).map(createSchema)
val partitionColumnNames =
Option(ctx.partitionColumnNames)
.map(visitIdentifierList(_).toArray)
.getOrElse(Array.empty[String])
val bucketSpec = Option(ctx.bucketSpec()).map(visitBucketSpec)
-// TODO: this may be wrong for non file-based data source like JDBC,
which should be external
-// even there is no `path` in options. We should consider allow the
EXTERNAL keyword.
+val location = Option(ctx.locationSpec).map(visitLocationSpec)
val storage = DataSource.buildStorageFormatFromOptions(options)
-val tableType = if (storage.locationUri.isDefined) {
+
+if (location.isDefined && storage.locationUri.isDefined) {
+ throw new ParseException("Cannot specify LOCATION when there is
'path' in OPTIONS.", ctx)
--- End diff --
Let's be more specific at here. These two approaches are the same and we
only want users to use one, right?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94699288
--- Diff:
sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveOptions.scala
---
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hive.execution
+
+import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap
+
+/**
+ * Options for the Hive data source.
+ */
+class HiveOptions(@transient private val parameters: CaseInsensitiveMap)
extends Serializable {
+ import HiveOptions._
+
+ def this(parameters: Map[String, String]) = this(new
CaseInsensitiveMap(parameters))
+
+ val format = parameters.get(FORMAT).map(_.toLowerCase)
--- End diff --
file format?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94699572
--- Diff:
sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveOptions.scala
---
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hive.execution
+
+import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap
+
+/**
+ * Options for the Hive data source.
+ */
+class HiveOptions(@transient private val parameters: CaseInsensitiveMap)
extends Serializable {
+ import HiveOptions._
+
+ def this(parameters: Map[String, String]) = this(new
CaseInsensitiveMap(parameters))
+
+ val format = parameters.get(FORMAT).map(_.toLowerCase)
+ val inputFormat = parameters.get(INPUT_FORMAT)
+ val outputFormat = parameters.get(OUTPUT_FORMAT)
+
+ if (inputFormat.isDefined != outputFormat.isDefined) {
+throw new IllegalArgumentException("Cannot specify only inputFormat or
outputFormat, you " +
+ "have to specify both of them.")
+ }
+
+ if (format.isDefined && inputFormat.isDefined) {
+throw new IllegalArgumentException("Cannot specify format and
inputFormat/outputFormat " +
+ "together for Hive data source.")
+ }
+
+ val serde = parameters.get(SERDE)
+
+ for (f <- format if serde.isDefined) {
--- End diff --
maybe using if is easier to read?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94699072
--- Diff:
sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveOptions.scala
---
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hive.execution
+
+import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap
+
+/**
+ * Options for the Hive data source.
+ */
+class HiveOptions(@transient private val parameters: CaseInsensitiveMap)
extends Serializable {
--- End diff --
Let's also mention that DetermineHiveSerde will fill in default values
based on the file format.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94700334
--- Diff:
sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala
---
@@ -1198,4 +1198,23 @@ class HiveDDLSuite
assert(e.message.contains("unknown is not a valid partition column"))
}
}
+
+ test("create hive serde table with new syntax") {
+withTable("t", "t2") {
+ sql("CREATE TABLE t(id int) USING hive OPTIONS(format 'orc')")
+ val table =
spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
+ assert(DDLUtils.isHiveTable(table))
+ assert(table.storage.serde ==
Some("org.apache.hadoop.hive.ql.io.orc.OrcSerde"))
+ assert(spark.table("t").collect().isEmpty)
+
+ sql("INSERT INTO t SELECT 1")
+ checkAnswer(spark.table("t"), Row(1))
+
+ sql("CREATE TABLE t2 USING HIVE AS SELECT 1 AS c1, 'a' AS c2")
+ val table2 =
spark.sessionState.catalog.getTableMetadata(TableIdentifier("t2"))
+ assert(DDLUtils.isHiveTable(table2))
+ assert(table2.storage.serde ==
Some("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"))
+ checkAnswer(spark.table("t2"), Row(1, "a"))
+}
+ }
--- End diff --
Let's also exercise partitioning.
Let's also test a orc's option.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94699687
--- Diff:
sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveOptions.scala
---
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hive.execution
+
+import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap
+
+/**
+ * Options for the Hive data source.
+ */
+class HiveOptions(@transient private val parameters: CaseInsensitiveMap)
extends Serializable {
+ import HiveOptions._
+
+ def this(parameters: Map[String, String]) = this(new
CaseInsensitiveMap(parameters))
+
+ val format = parameters.get(FORMAT).map(_.toLowerCase)
+ val inputFormat = parameters.get(INPUT_FORMAT)
+ val outputFormat = parameters.get(OUTPUT_FORMAT)
+
+ if (inputFormat.isDefined != outputFormat.isDefined) {
+throw new IllegalArgumentException("Cannot specify only inputFormat or
outputFormat, you " +
+ "have to specify both of them.")
+ }
+
+ if (format.isDefined && inputFormat.isDefined) {
+throw new IllegalArgumentException("Cannot specify format and
inputFormat/outputFormat " +
+ "together for Hive data source.")
+ }
+
+ val serde = parameters.get(SERDE)
+
+ for (f <- format if serde.isDefined) {
+if (!Set("sequencefile", "textfile", "rcfile").contains(f)) {
+ throw new IllegalArgumentException(s"format '$f' already specifies a
serde.")
+}
+ }
+
+ val containsDelimiters =
delimiterOptions.keys.exists(parameters.contains)
--- End diff --
Add one more check? The `DELIMITED` clause cannot be used with a custom
serde. Previously, it is blocked by our parser.
```
row_format
: DELIMITED [FIELDS TERMINATED BY char [ESCAPED BY char]] [COLLECTION
ITEMS TERMINATED BY char]
[MAP KEYS TERMINATED BY char] [LINES TERMINATED BY char]
[NULL DEFINED AS char] -- (Note: Available in Hive 0.13 and later)
| SERDE serde_name [WITH SERDEPROPERTIES (property_name=property_value,
property_name=property_value, ...)]
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user cloud-fan commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94698045
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala ---
@@ -342,42 +342,46 @@ class SparkSqlAstBuilder(conf: SQLConf) extends
AstBuilder {
}
/**
- * Create a data source table, returning a [[CreateTable]] logical plan.
+ * Create a table, returning a [[CreateTable]] logical plan.
*
* Expected format:
* {{{
- * CREATE [EXTERNAL] TABLE [IF NOT EXISTS] [db_name.]table_name
+ * CREATE [TEMPORARY] TABLE [IF NOT EXISTS] [db_name.]table_name
--- End diff --
yup
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94697902
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala ---
@@ -342,42 +342,46 @@ class SparkSqlAstBuilder(conf: SQLConf) extends
AstBuilder {
}
/**
- * Create a data source table, returning a [[CreateTable]] logical plan.
+ * Create a table, returning a [[CreateTable]] logical plan.
*
* Expected format:
* {{{
- * CREATE [EXTERNAL] TABLE [IF NOT EXISTS] [db_name.]table_name
+ * CREATE [TEMPORARY] TABLE [IF NOT EXISTS] [db_name.]table_name
--- End diff --
oh it is a typo
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user yhuai commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r94697485
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala ---
@@ -342,42 +342,46 @@ class SparkSqlAstBuilder(conf: SQLConf) extends
AstBuilder {
}
/**
- * Create a data source table, returning a [[CreateTable]] logical plan.
+ * Create a table, returning a [[CreateTable]] logical plan.
*
* Expected format:
* {{{
- * CREATE [EXTERNAL] TABLE [IF NOT EXISTS] [db_name.]table_name
+ * CREATE [TEMPORARY] TABLE [IF NOT EXISTS] [db_name.]table_name
--- End diff --
Was `external` a typo at here?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #16296: [SPARK-18885][SQL] unify CREATE TABLE syntax for ...
Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/16296#discussion_r93824911
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala ---
@@ -342,42 +342,46 @@ class SparkSqlAstBuilder(conf: SQLConf) extends
AstBuilder {
}
/**
- * Create a data source table, returning a [[CreateTable]] logical plan.
+ * Create a table, returning a [[CreateTable]] logical plan.
*
* Expected format:
* {{{
- * CREATE [EXTERNAL] TABLE [IF NOT EXISTS] [db_name.]table_name
+ * CREATE [TEMPORARY] TABLE [IF NOT EXISTS] [db_name.]table_name
* USING table_provider
* [OPTIONS table_property_list]
* [PARTITIONED BY (col_name, col_name, ...)]
* [CLUSTERED BY (col_name, col_name, ...)
*[SORTED BY (col_name [ASC|DESC], ...)]
*INTO num_buckets BUCKETS
* ]
+ * [TBLPROPERTIES (property_name=property_value, ...)]
--- End diff --
Here, we need an update. Removed `TBLPROPERTIES` but added new
`locationSpec`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
