You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@paimon.apache.org by lz...@apache.org on 2023/12/14 06:50:51 UTC
(incubator-paimon) branch master updated: [core] Lazy deserialize hive conf in metastoreClientFactory (#2506)
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 2a92b5d45 [core] Lazy deserialize hive conf in metastoreClientFactory (#2506)
2a92b5d45 is described below
commit 2a92b5d45130fbfd6e044b9950bd6fd592f15feb
Author: Zouxxyy <zo...@alibaba-inc.com>
AuthorDate: Thu Dec 14 14:50:47 2023 +0800
[core] Lazy deserialize hive conf in metastoreClientFactory (#2506)
---
.../apache/paimon/hive/SerializableHiveConf.java | 56 ++++++++++++--------
.../paimon/hive/SerializableHiveConfTest.java | 59 ++++++++++++++++++++++
2 files changed, 93 insertions(+), 22 deletions(-)
diff --git a/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/SerializableHiveConf.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/SerializableHiveConf.java
index acdcc7de9..b1ae2ff0c 100644
--- a/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/SerializableHiveConf.java
+++ b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/SerializableHiveConf.java
@@ -17,55 +17,67 @@
package org.apache.paimon.hive;
-import org.apache.paimon.io.DataInputDeserializer;
-import org.apache.paimon.io.DataOutputSerializer;
-
import org.apache.hadoop.hive.conf.HiveConf;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-/** Wrap {@link HiveConf} to a serializable class. */
+/**
+ * Wrap {@link HiveConf} to a serializable class, use lazy serialization and deserialization
+ * mechanism to reduce overhead.
+ */
public class SerializableHiveConf implements Serializable {
private static final long serialVersionUID = 1L;
private transient HiveConf conf;
+ private byte[] serializedConf;
+
public SerializableHiveConf(HiveConf conf) {
this.conf = conf;
}
public HiveConf conf() {
+ if (conf == null && serializedConf != null) {
+ deSerializeConf();
+ }
return conf;
}
+ private void deSerializeConf() {
+ try (ByteArrayInputStream bis = new ByteArrayInputStream(serializedConf);
+ ObjectInputStream ois = new ObjectInputStream(bis)) {
+ this.conf = new HiveConf();
+ conf.readFields(ois);
+ } catch (IOException e) {
+ throw new RuntimeException("Could not deserialize conf", e);
+ }
+ }
+
private void writeObject(ObjectOutputStream out) throws IOException {
+ if (serializedConf == null && conf != null) {
+ serializeConf();
+ }
out.defaultWriteObject();
+ }
- // we write the jobConf through a separate serializer to avoid cryptic exceptions when it
- // corrupts the serialization stream
- final DataOutputSerializer ser = new DataOutputSerializer(256);
- conf.write(ser);
- out.writeInt(ser.length());
- out.write(ser.getSharedBuffer(), 0, ser.length());
+ private void serializeConf() throws IOException {
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+ conf.write(oos);
+ oos.flush();
+ serializedConf = bos.toByteArray();
+ } catch (IOException e) {
+ throw new IOException("Could not serialize conf", e);
+ }
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
-
- final byte[] data = new byte[in.readInt()];
- in.readFully(data);
- final DataInputDeserializer deser = new DataInputDeserializer(data);
- this.conf = new HiveConf();
- try {
- conf.readFields(deser);
- } catch (IOException e) {
- throw new IOException(
- "Could not deserialize HiveConf, the serialized and de-serialized don't match.",
- e);
- }
}
}
diff --git a/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/SerializableHiveConfTest.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/SerializableHiveConfTest.java
new file mode 100644
index 000000000..f10cb742e
--- /dev/null
+++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/SerializableHiveConfTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.paimon.hive;
+
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for {@link SerializableHiveConf}. */
+public class SerializableHiveConfTest {
+ @Test
+ public void testSerializeHiveConf() throws IOException, ClassNotFoundException {
+ HiveConf conf = new HiveConf();
+ conf.set("k1", "v1");
+ conf.set("k2", "v2");
+ int size = conf.size();
+ SerializableHiveConf serializableHiveConf = new SerializableHiveConf(conf);
+
+ // serialize
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(serializableHiveConf);
+ oos.close();
+
+ // deserialize
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ SerializableHiveConf deserializedHiveConf = (SerializableHiveConf) ois.readObject();
+ ois.close();
+
+ HiveConf deserializedConf = deserializedHiveConf.conf();
+ assertThat(deserializedConf.size()).isEqualTo(size);
+ assertThat(deserializedConf.get("k1")).isEqualTo("v1");
+ assertThat(deserializedConf.get("k2")).isEqualTo("v2");
+ }
+}