You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by bl...@apache.org on 2019/05/06 23:37:37 UTC
[flink] branch hivetbl created (now 093e265)
This is an automated email from the ASF dual-hosted git repository.
bli pushed a change to branch hivetbl
in repository https://gitbox.apache.org/repos/asf/flink.git.
at 093e265 revert unrelated changes
This branch includes the following new commits:
new 093e265 revert unrelated changes
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[flink] 01/01: revert unrelated changes
Posted by bl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bli pushed a commit to branch hivetbl
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 093e26583c5700bb5845694d2019bc24fa8acbdf
Author: bowen.li <bo...@gmail.com>
AuthorDate: Mon May 6 16:37:06 2019 -0700
revert unrelated changes
---
.../flink/table/catalog/hive/HiveCatalogBase.java | 2 +-
.../flink/table/catalog/hive/HiveTableConfig.java | 33 +++++++++++
.../table/catalog/hive/config/HiveTableConfig.java | 69 ----------------------
.../hive/util/GenericHiveMetastoreCatalogUtil.java | 2 +-
.../table/catalog/hive/util/HiveCatalogUtil.java | 2 +-
5 files changed, 36 insertions(+), 72 deletions(-)
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalogBase.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalogBase.java
index 77da8d6..7329d14 100644
--- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalogBase.java
+++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalogBase.java
@@ -208,7 +208,7 @@ public abstract class HiveCatalogBase implements ReadableWritableCatalog {
// ------ tables ------
protected void createHiveTable(ObjectPath tablePath, Table table, boolean ignoreIfExists)
- throws TableAlreadyExistException, DatabaseNotExistException, CatalogException {
+ throws TableAlreadyExistException, DatabaseNotExistException, CatalogException {
if (!databaseExists(tablePath.getDatabaseName())) {
throw new DatabaseNotExistException(catalogName, tablePath.getDatabaseName());
} else {
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveTableConfig.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveTableConfig.java
new file mode 100644
index 0000000..69f869b
--- /dev/null
+++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveTableConfig.java
@@ -0,0 +1,33 @@
+/*
+ * 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.flink.table.catalog.hive;
+
+/**
+ * Configs for tables in Hive metastore.
+ */
+public class HiveTableConfig {
+
+ // -------------------
+ // Hive table configs
+ // -------------------
+
+ // Comment of the Flink table
+ public static final String TABLE_COMMENT = "comment";
+
+}
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/config/HiveTableConfig.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/config/HiveTableConfig.java
deleted file mode 100644
index 0deda55..0000000
--- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/config/HiveTableConfig.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.flink.table.catalog.hive.config;
-
-/**
- * Configs for Flink tables stored in Hive metastore.
- */
-public class HiveTableConfig {
-
- // -------------------
- // Hive table configs
- // -------------------
-
- // Comment of the Flink table
- public static final String TABLE_COMMENT = "comment";
-
- // -------------------
- // Hive storage information configs
- // -------------------
-
- public static final String HIVE_TABLE_LOCATION = "hive.table.location";
-
- public static final String HIVE_TABLE_TYPE = "hive.table.type";
-
- public static final String HIVE_TABLE_SERDE_LIBRARY = "hive.table.serde.library";
-
- public static final String HIVE_TABLE_INPUT_FORMAT = "hive.table.input.format";
-
- public static final String HIVE_TABLE_OUTPUT_FORMAT = "hive.table.output.format";
-
- public static final String HIVE_TABLE_COMPRESSED = "hive.table.compressed";
-
- public static final String HIVE_TABLE_NUM_BUCKETS = "hive.table.num.buckets";
-
- public static final String HIVE_TABLE_STORAGE_SERIALIZATION_FORMAT = "hive.table.storage.serialization.format";
-
- public static final String HIVE_TABLE_FIELD_NAMES = "hive.table.field.names";
-
- public static final String HIVE_TABLE_FIELD_TYPES = "hive.table.field.types";
-
- public static final String HIVE_TABLE_DB_NAME = "hive.table.db.name";
-
- public static final String HIVE_TABLE_TABLE_NAME = "hive.table.table.name";
-
- public static final String HIVE_TABLE_PARTITION_FIELDS = "hive.table.partition.fields";
-
- // Hive table storage format such as "orc" and "parquet". A storage format can be considered as a composite of
- // input/output format and SerDe.
- public static final String HIVE_TABLE_STORAGE_FORMAT = "storageFormat";
-
- public static final String DEFAULT_HIVE_TABLE_STORAGE_FORMAT = "TextFile";
-
-}
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/GenericHiveMetastoreCatalogUtil.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/GenericHiveMetastoreCatalogUtil.java
index 8980450..9d6594f 100644
--- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/GenericHiveMetastoreCatalogUtil.java
+++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/GenericHiveMetastoreCatalogUtil.java
@@ -26,7 +26,7 @@ import org.apache.flink.table.catalog.CatalogView;
import org.apache.flink.table.catalog.GenericCatalogTable;
import org.apache.flink.table.catalog.GenericCatalogView;
import org.apache.flink.table.catalog.ObjectPath;
-import org.apache.flink.table.catalog.hive.config.HiveTableConfig;
+import org.apache.flink.table.catalog.hive.HiveTableConfig;
import org.apache.flink.table.plan.stats.TableStats;
import org.apache.hadoop.hive.metastore.TableType;
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveCatalogUtil.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveCatalogUtil.java
index 5e5f626..2bc5a85 100644
--- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveCatalogUtil.java
+++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveCatalogUtil.java
@@ -25,7 +25,7 @@ import org.apache.flink.table.catalog.CatalogTable;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.hive.HiveCatalogDatabase;
import org.apache.flink.table.catalog.hive.HiveCatalogTable;
-import org.apache.flink.table.catalog.hive.config.HiveTableConfig;
+import org.apache.flink.table.catalog.hive.HiveTableConfig;
import org.apache.hadoop.hive.metastore.api.Database;
import org.apache.hadoop.hive.metastore.api.FieldSchema;