tengqm commented on code in PR #5723:
URL: https://github.com/apache/gravitino/pull/5723#discussion_r1867155362
##########
catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonTablePropertiesMetadata.java:
##########
@@ -35,14 +35,14 @@
*/
public class PaimonTablePropertiesMetadata extends BasePropertiesMetadata {
- public static final String COMMENT = "comment";
- public static final String OWNER = "owner";
- public static final String BUCKET_KEY = "bucket-key";
- public static final String MERGE_ENGINE = "merge-engine";
- public static final String SEQUENCE_FIELD = "sequence.field";
- public static final String ROWKIND_FIELD = "rowkind.field";
- public static final String PRIMARY_KEY = "primary-key";
- public static final String PARTITION = "partition";
+ public static final String COMMENT = PaimonConstants.COMMENT;
+ public static final String OWNER = PaimonConstants.OWNER;
+ public static final String BUCKET_KEY = PaimonConstants.BUCKET_KEY;
+ public static final String MERGE_ENGINE = PaimonConstants.MERGE_ENGINE;
+ public static final String SEQUENCE_FIELD = PaimonConstants.SEQUENCE_FIELD;
+ public static final String ROWKIND_FIELD = PaimonConstants.ROWKIND_FIELD;
+ public static final String PRIMARY_KEY = PaimonConstants.PRIMARY_KEY;
+ public static final String PARTITION = PaimonConstants.PARTITION;
Review Comment:
So ... the plan is get rid of this duplicated constants eventually?
I failed to see the point of replicating these constants across many
packages.
##########
spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/version/CatalogNameAdaptor.java:
##########
@@ -27,15 +27,24 @@
public class CatalogNameAdaptor {
private static final Map<String, String> catalogNames =
ImmutableMap.of(
- "hive-3.3",
"org.apache.gravitino.spark.connector.hive.GravitinoHiveCatalogSpark33",
- "hive-3.4",
"org.apache.gravitino.spark.connector.hive.GravitinoHiveCatalogSpark34",
- "hive-3.5",
"org.apache.gravitino.spark.connector.hive.GravitinoHiveCatalogSpark35",
+ "hive-3.3",
+
"org.apache.gravitino.spark.connector.hive.GravitinoHiveCatalogSpark33",
+ "hive-3.4",
+
"org.apache.gravitino.spark.connector.hive.GravitinoHiveCatalogSpark34",
+ "hive-3.5",
Review Comment:
This revised indentation has made the map harder to read ...
##########
catalogs/catalog-common/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonPropertiesUtils.java:
##########
@@ -0,0 +1,95 @@
+/*
+ * 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.gravitino.catalog.lakehouse.paimon;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.gravitino.storage.OSSProperties;
+import org.apache.gravitino.storage.S3Properties;
+
+public class PaimonPropertiesUtils {
+
+ // Map that maintains the mapping of keys in Gravitino to that in Paimon,
for example, users
+ // will only need to set the configuration 'catalog-backend' in Gravitino
and Gravitino will
+ // change it to `catalogType` automatically and pass it to Paimon.
+ public static final Map<String, String> GRAVITINO_CONFIG_TO_PAIMON;
+
+ static {
+ Map<String, String> map = new HashMap();
+ map.put(PaimonConstants.CATALOG_BACKEND, PaimonConstants.CATALOG_BACKEND);
+ map.put(PaimonConstants.GRAVITINO_JDBC_DRIVER,
PaimonConstants.GRAVITINO_JDBC_DRIVER);
+ map.put(PaimonConstants.GRAVITINO_JDBC_USER,
PaimonConstants.PAIMON_JDBC_USER);
+ map.put(PaimonConstants.GRAVITINO_JDBC_PASSWORD,
PaimonConstants.PAIMON_JDBC_PASSWORD);
+ map.put(PaimonConstants.URI, PaimonConstants.URI);
+ map.put(PaimonConstants.WAREHOUSE, PaimonConstants.WAREHOUSE);
+ map.put(PaimonConstants.CATALOG_BACKEND_NAME,
PaimonConstants.CATALOG_BACKEND_NAME);
+ // S3
+ map.put(S3Properties.GRAVITINO_S3_ENDPOINT, PaimonConstants.S3_ENDPOINT);
+ map.put(S3Properties.GRAVITINO_S3_ACCESS_KEY_ID,
PaimonConstants.S3_ACCESS_KEY);
+ map.put(S3Properties.GRAVITINO_S3_SECRET_ACCESS_KEY,
PaimonConstants.S3_SECRET_KEY);
+ // OSS
+ map.put(OSSProperties.GRAVITINO_OSS_ENDPOINT,
PaimonConstants.OSS_ENDPOINT);
+ map.put(OSSProperties.GRAVITINO_OSS_ACCESS_KEY_ID,
PaimonConstants.OSS_ACCESS_KEY);
+ map.put(OSSProperties.GRAVITINO_OSS_ACCESS_KEY_SECRET,
PaimonConstants.OSS_SECRET_KEY);
+ GRAVITINO_CONFIG_TO_PAIMON = Collections.unmodifiableMap(map);
+ }
+
+ /**
+ * Converts Gravitino properties to Paimon catalog properties, the common
transform logic shared
+ * by Spark connector, Gravitino Paimon catalog.
+ *
+ * @param gravitinoProperties a map of Gravitino configuration properties.
+ * @return a map containing Paimon catalog properties.
+ */
+ public static Map<String, String> toPaimonCatalogProperties(
Review Comment:
I don't like this pattern.
Either you hide the map and expose this conversion method; or you expose the
map directly so users don't bother to call this method.
Providing two methods to access a property often leads to confusion and
errors.
--
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...@gravitino.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
