YannByron commented on a change in pull request #3998: URL: https://github.com/apache/hudi/pull/3998#discussion_r753751992
########## File path: hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/catalyst/catalog/HoodieCatalogTable.scala ########## @@ -0,0 +1,291 @@ +/* + * 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.catalyst.catalog + +import org.apache.hudi.HoodieWriterUtils.{convertMapToHoodieConfig, validateTableConfig} +import org.apache.hudi.common.model.{HoodieCommitMetadata, HoodieTableType} +import org.apache.hudi.common.table.HoodieTableConfig +import org.apache.hudi.common.table.HoodieTableMetaClient +import org.apache.hudi.keygen.ComplexKeyGenerator +import org.apache.hudi.keygen.factory.HoodieSparkKeyGeneratorFactory + +import org.apache.spark.internal.Logging +import org.apache.spark.sql.{AnalysisException, SparkSession} +import org.apache.spark.sql.avro.SchemaConverters +import org.apache.spark.sql.catalyst.TableIdentifier +import org.apache.spark.sql.hudi.{HoodieOptionConfig, HoodieSqlUtils} +import org.apache.spark.sql.hudi.HoodieSqlUtils._ +import org.apache.spark.sql.types.{StructField, StructType} + +import java.util.{Locale, Properties} + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +/** + * A wrapper of hoodie CatalogTable instance and hoodie Table. + */ +class HoodieCatalogTable(val spark: SparkSession, val table: CatalogTable) extends Logging { + + assert(table.provider.map(_.toLowerCase(Locale.ROOT)).orNull == "hudi", "It's not a Hudi table") + + private val hadoopConf = spark.sessionState.newHadoopConf + + /** + * properties defined in catalog. + */ + val catalogProperties: Map[String, String] = table.storage.properties ++ table.properties + + /** + * hoodie table's location. + * if create managed hoodie table, use `catalog.defaultTablePath`. + */ + val tableLocation: String = HoodieSqlUtils.getTableLocation(table, spark) + + /** + * A flag to whether the hoodie table exists. + */ + val hoodieTableExists: Boolean = tableExistsInPath(tableLocation, hadoopConf) + + /** + * Meta Client. + */ + lazy val metaClient: HoodieTableMetaClient = HoodieTableMetaClient.builder() + .setBasePath(tableLocation) + .setConf(hadoopConf) + .build() + + /** + * Hoodie Table Config + */ + lazy val tableConfig: HoodieTableConfig = metaClient.getTableConfig + + /** + * the name of table + */ + lazy val tableName: String = tableConfig.getTableName + + /** + * The name of type of table + */ + lazy val tableType: HoodieTableType = tableConfig.getTableType + + /** + * The type of table + */ + lazy val tableTypeName: String = tableType.name() + + /** + * Recored Field List(Primary Key List) + */ + lazy val primaryKeys: Array[String] = tableConfig.getRecordKeyFields.orElse(Array.empty) + + /** + * PreCombine Field + */ + lazy val preCombineKey: Option[String] = Option(tableConfig.getPreCombineField) + + /** + * Paritition Fields + */ + lazy val partitionFields: Array[String] = tableConfig.getPartitionFields.orElse(Array.empty) + + /** + * The schema of table. + * Make StructField nullable. + */ + lazy val tableSchema: StructType = { + val originSchema = getTableSqlSchema(metaClient, includeMetadataFields = true).get + StructType(originSchema.map(_.copy(nullable = true))) + } + + /** + * The schema without hoodie meta fields + */ + lazy val tableSchemaWithoutMetaFields: StructType = HoodieSqlUtils.removeMetaFields(tableSchema) + + /** + * The schema of data fields + */ + lazy val dataSchema: StructType = { + StructType(tableSchema.filterNot(f => partitionFields.contains(f.name))) + } Review comment: if `hoodie.datasource.write.drop.partition.columns` is false, tableSchema doesn't contains partition columns. And dataSchema generated by the codes above will be same with tableSchema. So, i think there is not necessary to change. ########## File path: hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/catalyst/catalog/HoodieCatalogTable.scala ########## @@ -0,0 +1,291 @@ +/* + * 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.catalyst.catalog + +import org.apache.hudi.HoodieWriterUtils.{convertMapToHoodieConfig, validateTableConfig} +import org.apache.hudi.common.model.{HoodieCommitMetadata, HoodieTableType} +import org.apache.hudi.common.table.HoodieTableConfig +import org.apache.hudi.common.table.HoodieTableMetaClient +import org.apache.hudi.keygen.ComplexKeyGenerator +import org.apache.hudi.keygen.factory.HoodieSparkKeyGeneratorFactory + +import org.apache.spark.internal.Logging +import org.apache.spark.sql.{AnalysisException, SparkSession} +import org.apache.spark.sql.avro.SchemaConverters +import org.apache.spark.sql.catalyst.TableIdentifier +import org.apache.spark.sql.hudi.{HoodieOptionConfig, HoodieSqlUtils} +import org.apache.spark.sql.hudi.HoodieSqlUtils._ +import org.apache.spark.sql.types.{StructField, StructType} + +import java.util.{Locale, Properties} + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +/** + * A wrapper of hoodie CatalogTable instance and hoodie Table. + */ +class HoodieCatalogTable(val spark: SparkSession, val table: CatalogTable) extends Logging { + + assert(table.provider.map(_.toLowerCase(Locale.ROOT)).orNull == "hudi", "It's not a Hudi table") + + private val hadoopConf = spark.sessionState.newHadoopConf + + /** + * properties defined in catalog. + */ + val catalogProperties: Map[String, String] = table.storage.properties ++ table.properties + + /** + * hoodie table's location. + * if create managed hoodie table, use `catalog.defaultTablePath`. + */ + val tableLocation: String = HoodieSqlUtils.getTableLocation(table, spark) + + /** + * A flag to whether the hoodie table exists. + */ + val hoodieTableExists: Boolean = tableExistsInPath(tableLocation, hadoopConf) + + /** + * Meta Client. + */ + lazy val metaClient: HoodieTableMetaClient = HoodieTableMetaClient.builder() + .setBasePath(tableLocation) + .setConf(hadoopConf) + .build() + + /** + * Hoodie Table Config + */ + lazy val tableConfig: HoodieTableConfig = metaClient.getTableConfig + + /** + * the name of table + */ + lazy val tableName: String = tableConfig.getTableName + + /** + * The name of type of table + */ + lazy val tableType: HoodieTableType = tableConfig.getTableType + + /** + * The type of table + */ + lazy val tableTypeName: String = tableType.name() + + /** + * Recored Field List(Primary Key List) + */ + lazy val primaryKeys: Array[String] = tableConfig.getRecordKeyFields.orElse(Array.empty) + + /** + * PreCombine Field + */ + lazy val preCombineKey: Option[String] = Option(tableConfig.getPreCombineField) + + /** + * Paritition Fields + */ + lazy val partitionFields: Array[String] = tableConfig.getPartitionFields.orElse(Array.empty) + + /** + * The schema of table. + * Make StructField nullable. + */ + lazy val tableSchema: StructType = { + val originSchema = getTableSqlSchema(metaClient, includeMetadataFields = true).get + StructType(originSchema.map(_.copy(nullable = true))) + } + + /** + * The schema without hoodie meta fields + */ + lazy val tableSchemaWithoutMetaFields: StructType = HoodieSqlUtils.removeMetaFields(tableSchema) + + /** + * The schema of data fields + */ + lazy val dataSchema: StructType = { + StructType(tableSchema.filterNot(f => partitionFields.contains(f.name))) + } + + /** + * The schema of data fields not including hoodie meta fields + */ + lazy val dataSchemaWithoutMetaFields: StructType = HoodieSqlUtils.removeMetaFields(dataSchema) + + /** + * The schema of partition fields + */ + lazy val partitionSchema: StructType = StructType(tableSchema.filter(f => partitionFields.contains(f.name))) + + /** + * All the partition paths + */ + def getAllPartitionPaths: Seq[String] = HoodieSqlUtils.getAllPartitionPaths(spark, table) + + /** + * init hoodie table for create table (as select) + */ + def initHoodieTableIfNeeded(force: Boolean = false): Unit = { + logInfo(s"Init hoodie.properties for ${table.identifier.unquotedString}") + val (finalSchema, tableConfigs) = parseSchemaAndConfigs() + + // Save all the table config to the hoodie.properties. + val properties = new Properties() + properties.putAll(tableConfigs.asJava) + + HoodieTableMetaClient.withPropertyBuilder() + .fromProperties(properties) + .setTableName(table.identifier.table) + .setTableCreateSchema(SchemaConverters.toAvroType(finalSchema).toString()) + .setPartitionFields(table.partitionColumnNames.mkString(",")) + .initTable(hadoopConf, tableLocation) + } Review comment: you're right. will be modified. ########## File path: hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/catalyst/catalog/HoodieCatalogTable.scala ########## @@ -0,0 +1,291 @@ +/* + * 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.catalyst.catalog + +import org.apache.hudi.HoodieWriterUtils.{convertMapToHoodieConfig, validateTableConfig} +import org.apache.hudi.common.model.{HoodieCommitMetadata, HoodieTableType} +import org.apache.hudi.common.table.HoodieTableConfig +import org.apache.hudi.common.table.HoodieTableMetaClient +import org.apache.hudi.keygen.ComplexKeyGenerator +import org.apache.hudi.keygen.factory.HoodieSparkKeyGeneratorFactory + +import org.apache.spark.internal.Logging +import org.apache.spark.sql.{AnalysisException, SparkSession} +import org.apache.spark.sql.avro.SchemaConverters +import org.apache.spark.sql.catalyst.TableIdentifier +import org.apache.spark.sql.hudi.{HoodieOptionConfig, HoodieSqlUtils} +import org.apache.spark.sql.hudi.HoodieSqlUtils._ +import org.apache.spark.sql.types.{StructField, StructType} + +import java.util.{Locale, Properties} + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +/** + * A wrapper of hoodie CatalogTable instance and hoodie Table. + */ +class HoodieCatalogTable(val spark: SparkSession, val table: CatalogTable) extends Logging { + + assert(table.provider.map(_.toLowerCase(Locale.ROOT)).orNull == "hudi", "It's not a Hudi table") + + private val hadoopConf = spark.sessionState.newHadoopConf + + /** + * properties defined in catalog. + */ + val catalogProperties: Map[String, String] = table.storage.properties ++ table.properties + + /** + * hoodie table's location. + * if create managed hoodie table, use `catalog.defaultTablePath`. + */ + val tableLocation: String = HoodieSqlUtils.getTableLocation(table, spark) + + /** + * A flag to whether the hoodie table exists. + */ + val hoodieTableExists: Boolean = tableExistsInPath(tableLocation, hadoopConf) + + /** + * Meta Client. + */ + lazy val metaClient: HoodieTableMetaClient = HoodieTableMetaClient.builder() + .setBasePath(tableLocation) + .setConf(hadoopConf) + .build() + + /** + * Hoodie Table Config + */ + lazy val tableConfig: HoodieTableConfig = metaClient.getTableConfig + + /** + * the name of table + */ + lazy val tableName: String = tableConfig.getTableName + + /** + * The name of type of table + */ + lazy val tableType: HoodieTableType = tableConfig.getTableType + + /** + * The type of table + */ + lazy val tableTypeName: String = tableType.name() + + /** + * Recored Field List(Primary Key List) + */ + lazy val primaryKeys: Array[String] = tableConfig.getRecordKeyFields.orElse(Array.empty) + + /** + * PreCombine Field + */ + lazy val preCombineKey: Option[String] = Option(tableConfig.getPreCombineField) + + /** + * Paritition Fields + */ + lazy val partitionFields: Array[String] = tableConfig.getPartitionFields.orElse(Array.empty) + + /** + * The schema of table. + * Make StructField nullable. + */ + lazy val tableSchema: StructType = { + val originSchema = getTableSqlSchema(metaClient, includeMetadataFields = true).get + StructType(originSchema.map(_.copy(nullable = true))) + } + + /** + * The schema without hoodie meta fields + */ + lazy val tableSchemaWithoutMetaFields: StructType = HoodieSqlUtils.removeMetaFields(tableSchema) + + /** + * The schema of data fields + */ + lazy val dataSchema: StructType = { + StructType(tableSchema.filterNot(f => partitionFields.contains(f.name))) + } + + /** + * The schema of data fields not including hoodie meta fields + */ + lazy val dataSchemaWithoutMetaFields: StructType = HoodieSqlUtils.removeMetaFields(dataSchema) + + /** + * The schema of partition fields + */ + lazy val partitionSchema: StructType = StructType(tableSchema.filter(f => partitionFields.contains(f.name))) + + /** + * All the partition paths + */ + def getAllPartitionPaths: Seq[String] = HoodieSqlUtils.getAllPartitionPaths(spark, table) + + /** + * init hoodie table for create table (as select) + */ + def initHoodieTableIfNeeded(force: Boolean = false): Unit = { + logInfo(s"Init hoodie.properties for ${table.identifier.unquotedString}") + val (finalSchema, tableConfigs) = parseSchemaAndConfigs() + + // Save all the table config to the hoodie.properties. + val properties = new Properties() + properties.putAll(tableConfigs.asJava) + + HoodieTableMetaClient.withPropertyBuilder() + .fromProperties(properties) + .setTableName(table.identifier.table) + .setTableCreateSchema(SchemaConverters.toAvroType(finalSchema).toString()) + .setPartitionFields(table.partitionColumnNames.mkString(",")) + .initTable(hadoopConf, tableLocation) + } + + /** + * @return schema, table parameters in which all parameters aren't sql-styled. + */ + private def parseSchemaAndConfigs(): (StructType, Map[String, String]) = { + val sqlOptions = HoodieOptionConfig.defaultSqlOptions ++ catalogProperties + + // get final schema and parameters + val (finalSchema, tableConfigs) = (table.tableType, hoodieTableExists) match { + case (CatalogTableType.EXTERNAL, true) => + val existingTableConfig = tableConfig.getProps.asScala.toMap + val catalogTableProps = HoodieOptionConfig.mappingSqlOptionToTableConfig(catalogProperties) + validateTableConfig(spark, catalogTableProps, convertMapToHoodieConfig(existingTableConfig)) + + val options = extraTableConfig(spark, hoodieTableExists, existingTableConfig) ++ + HoodieOptionConfig.mappingSqlOptionToTableConfig(sqlOptions) ++ existingTableConfig + + val userSpecifiedSchema = table.schema + val schema = if (tableSchema.nonEmpty) { + tableSchema + } else if (userSpecifiedSchema.nonEmpty) { + addMetaFields(userSpecifiedSchema) + } else { + throw new IllegalArgumentException(s"Missing schema for Create Table: $tableName") + } + + (schema, options) + + case (_, false) => + assert(table.schema.nonEmpty, s"Missing schema for Create Table: $tableName") Review comment: ok -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@hudi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
