You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by yi...@apache.org on 2024/05/23 16:24:49 UTC
(hudi) branch release-0.15.0 updated (16ba7f23887 -> ed2dc912003)
This is an automated email from the ASF dual-hosted git repository.
yihua pushed a change to branch release-0.15.0
in repository https://gitbox.apache.org/repos/asf/hudi.git
from 16ba7f23887 Remove local change from 0.14.0
new f5a7c0f4607 [MINOR] [BRANCH-0.x] Added condition to check default value to fix extracting password from credential store (#11247)
new ed2dc912003 [HUDI-7784] Fix serde of HoodieHadoopConfiguration in Spark (#11270)
The 2 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.
Summary of changes:
.../apache/spark/HoodieSparkKryoRegistrar.scala | 6 +-
.../apache/spark/TestHoodieSparkKryoRegistrar.java | 86 ++++++++++++++++++++++
.../org/apache/hudi/HoodieSparkSqlWriter.scala | 2 +-
3 files changed, 90 insertions(+), 4 deletions(-)
create mode 100644 hudi-client/hudi-spark-client/src/test/java/org/apache/spark/TestHoodieSparkKryoRegistrar.java
(hudi) 02/02: [HUDI-7784] Fix serde of HoodieHadoopConfiguration in Spark (#11270)
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yihua pushed a commit to branch release-0.15.0
in repository https://gitbox.apache.org/repos/asf/hudi.git
commit ed2dc912003a7f5f13f09374aec99399ff8d614b
Author: Y Ethan Guo <et...@gmail.com>
AuthorDate: Wed May 22 15:27:48 2024 -0700
[HUDI-7784] Fix serde of HoodieHadoopConfiguration in Spark (#11270)
---
.../apache/spark/HoodieSparkKryoRegistrar.scala | 6 +-
.../apache/spark/TestHoodieSparkKryoRegistrar.java | 86 ++++++++++++++++++++++
2 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/HoodieSparkKryoRegistrar.scala b/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/HoodieSparkKryoRegistrar.scala
index a8650e5668a..eba3999ea57 100644
--- a/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/HoodieSparkKryoRegistrar.scala
+++ b/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/HoodieSparkKryoRegistrar.scala
@@ -22,7 +22,7 @@ import org.apache.hudi.client.model.HoodieInternalRow
import org.apache.hudi.common.model.{HoodieKey, HoodieSparkRecord}
import org.apache.hudi.common.util.HoodieCommonKryoRegistrar
import org.apache.hudi.config.HoodieWriteConfig
-import org.apache.hudi.storage.StorageConfiguration
+import org.apache.hudi.storage.hadoop.HadoopStorageConfiguration
import com.esotericsoftware.kryo.io.{Input, Output}
import com.esotericsoftware.kryo.serializers.JavaSerializer
@@ -64,8 +64,8 @@ class HoodieSparkKryoRegistrar extends HoodieCommonKryoRegistrar with KryoRegist
// Hadoop's configuration is not a serializable object by itself, and hence
// we're relying on [[SerializableConfiguration]] wrapper to work it around.
// We cannot remove this entry; otherwise the ordering is changed.
- // So we replace it with [[StorageConfiguration]].
- kryo.register(classOf[StorageConfiguration[_]], new JavaSerializer())
+ // So we replace it with [[HadoopStorageConfiguration]] for Spark.
+ kryo.register(classOf[HadoopStorageConfiguration], new JavaSerializer())
}
/**
diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/spark/TestHoodieSparkKryoRegistrar.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/spark/TestHoodieSparkKryoRegistrar.java
new file mode 100644
index 00000000000..4dd297a02b6
--- /dev/null
+++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/spark/TestHoodieSparkKryoRegistrar.java
@@ -0,0 +1,86 @@
+/*
+ * 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;
+
+import org.apache.hudi.storage.hadoop.HadoopStorageConfiguration;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+import org.apache.hadoop.conf.Configuration;
+import org.junit.jupiter.api.Test;
+import org.objenesis.strategy.StdInstantiatorStrategy;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Tests {@link HoodieSparkKryoRegistrar}
+ */
+public class TestHoodieSparkKryoRegistrar {
+ @Test
+ public void testSerdeHoodieHadoopConfiguration() {
+ Kryo kryo = newKryo();
+
+ HadoopStorageConfiguration conf = new HadoopStorageConfiguration(new Configuration());
+
+ // Serialize
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ Output output = new Output(baos);
+ kryo.writeObject(output, conf);
+ output.close();
+
+ // Deserialize
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ Input input = new Input(bais);
+ HadoopStorageConfiguration deserialized = kryo.readObject(input, HadoopStorageConfiguration.class);
+ input.close();
+
+ // Verify
+ assertEquals(getPropsInMap(conf), getPropsInMap(deserialized));
+ }
+
+ private Kryo newKryo() {
+ Kryo kryo = new Kryo();
+
+ // This instance of Kryo should not require prior registration of classes
+ kryo.setRegistrationRequired(false);
+ kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new StdInstantiatorStrategy()));
+ // Handle cases where we may have an odd classloader setup like with libjars
+ // for hadoop
+ kryo.setClassLoader(Thread.currentThread().getContextClassLoader());
+
+ // Register Hudi's classes
+ new HoodieSparkKryoRegistrar().registerClasses(kryo);
+
+ return kryo;
+ }
+
+ private Map<String, String> getPropsInMap(HadoopStorageConfiguration conf) {
+ Map<String, String> configMap = new HashMap<>();
+ conf.unwrap().iterator().forEachRemaining(
+ e -> configMap.put(e.getKey(), e.getValue()));
+ return configMap;
+ }
+}
(hudi) 01/02: [MINOR] [BRANCH-0.x] Added condition to check default value to fix extracting password from credential store (#11247)
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yihua pushed a commit to branch release-0.15.0
in repository https://gitbox.apache.org/repos/asf/hudi.git
commit f5a7c0f4607b1e8b39fa1eeff00a16bfb5b24851
Author: Aditya Goenka <63...@users.noreply.github.com>
AuthorDate: Fri May 17 21:18:08 2024 +0530
[MINOR] [BRANCH-0.x] Added condition to check default value to fix extracting password from credential store (#11247)
---
.../src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
index 853dd1ac97c..41657377753 100644
--- a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
+++ b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
@@ -994,7 +994,7 @@ class HoodieSparkSqlWriterInternal {
properties.put(HoodieSyncConfig.META_SYNC_SPARK_VERSION.key, SPARK_VERSION)
properties.put(HoodieSyncConfig.META_SYNC_USE_FILE_LISTING_FROM_METADATA.key, hoodieConfig.getBoolean(HoodieMetadataConfig.ENABLE))
if ((fs.getConf.get(HiveConf.ConfVars.METASTOREPWD.varname) == null || fs.getConf.get(HiveConf.ConfVars.METASTOREPWD.varname).isEmpty) &&
- (properties.get(HiveSyncConfigHolder.HIVE_PASS.key()) == null || properties.get(HiveSyncConfigHolder.HIVE_PASS.key()).toString.isEmpty)){
+ (properties.get(HiveSyncConfigHolder.HIVE_PASS.key()) == null || properties.get(HiveSyncConfigHolder.HIVE_PASS.key()).toString.isEmpty || properties.get(HiveSyncConfigHolder.HIVE_PASS.key()).toString.equalsIgnoreCase(HiveSyncConfigHolder.HIVE_PASS.defaultValue()))){
try {
val passwd = ShimLoader.getHadoopShims.getPassword(spark.sparkContext.hadoopConfiguration, HiveConf.ConfVars.METASTOREPWD.varname)
if (passwd != null && !passwd.isEmpty) {