SML0127 commented on code in PR #1541: URL: https://github.com/apache/fluss/pull/1541#discussion_r2282821301
########## fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/conf/IcebergConfiguration.java: ########## @@ -0,0 +1,98 @@ +/* + * 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 com.alibaba.fluss.lake.iceberg.conf; + +import com.alibaba.fluss.annotation.VisibleForTesting; +import com.alibaba.fluss.config.Configuration; + +import org.apache.iceberg.common.DynClasses; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + +/** + * Wraps the hadoop configuration used to configure {@link org.apache.iceberg.catalog.Catalog} if + * hadoop related classes is available. + * + * <p>It don't declare Hadoop configuration explicitly for some catalogs won't need hadoop + * configuration. For these catalogs, it won't throw class not found exception. It set the conf to + * null if no hadoop dependencies are found. It's fine to use null for the catalogs don't require + * Hadoop configuration. + * + * <p>For the catalogs require Hadoop configuration, hadoop related class not found exception will + * be thrown which guides users to add hadoop related classes. + */ +public class IcebergConfiguration implements Serializable { + + private static final Logger LOG = LoggerFactory.getLogger(IcebergConfiguration.class); + + private transient Object conf; + + @VisibleForTesting + protected IcebergConfiguration(Object conf) { + this.conf = conf; + } + + public static IcebergConfiguration from(Configuration flussConfig) { + return new IcebergConfiguration(loadHadoopConfig(flussConfig)); + } + + private void writeObject(ObjectOutputStream out) throws IOException { + out.defaultWriteObject(); + if (conf == null) { + out.writeBoolean(false); + } else { + out.writeBoolean(true); + HadoopConfSerde.writeObject(out, conf); + } + } + + private void readObject(ObjectInputStream in) throws ClassNotFoundException, IOException { + in.defaultReadObject(); + boolean configIsNotNull = in.readBoolean(); + if (configIsNotNull) { + conf = HadoopConfSerde.readObject(in); + } else { + conf = null; + } + } + + private static Object loadHadoopConfig(Configuration flussConfig) { + Class<?> configClass = + DynClasses.builder() + .impl("org.apache.hadoop.hdfs.HdfsConfiguration") + .impl("org.apache.hadoop.conf.Configuration") + .orNull() + .build(); + + if (configClass == null) { + LOG.info("Hadoop not found on classpath, not creating Hadoop config"); + return null; + } + + return HadoopUtils.getHadoopConfiguration(flussConfig); + } Review Comment: how to support exception handling in case where hadoop config is required but missing? ########## fluss-lake/fluss-lake-iceberg/src/test/java/com/alibaba/fluss/lake/iceberg/conf/IcebergConfigurationTest.java: ########## @@ -0,0 +1,68 @@ +/* + * 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 com.alibaba.fluss.lake.iceberg.conf; + +import org.apache.hadoop.conf.Configuration; +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; + +/** UT for {@link IcebergConfiguration}. */ +class IcebergConfigurationTest { + + @Test + void testSerde() throws Exception { + // test when conf is null + IcebergConfiguration conf = new IcebergConfiguration(null); + + byte[] data = serialize(conf); + IcebergConfiguration gotConf = deserialize(data); + assertThat(gotConf.get()).isNull(); + + // test when conf is not null + Configuration hadoopConf = new Configuration(); + hadoopConf.set("k1", "v1"); + conf = new IcebergConfiguration(hadoopConf); + data = serialize(conf); + gotConf = deserialize(data); + Configuration gotHadoopConf = (Configuration) gotConf.get(); + assertThat(gotHadoopConf.toString()).isEqualTo(hadoopConf.toString()); Review Comment: nit. how about consider adding another key-value and asserting directly instead of using toString? ########## fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/conf/HadoopConfSerde.java: ########## @@ -0,0 +1,39 @@ +/* + * 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 com.alibaba.fluss.lake.iceberg.conf; + +import org.apache.hadoop.conf.Configuration; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; + +/** Serde of {@link Configuration} . */ +public class HadoopConfSerde { + + public static void writeObject(ObjectOutputStream out, Object hadoopConf) throws IOException { + Configuration conf = (Configuration) hadoopConf; + conf.write(out); + } + + public static Configuration readObject(ObjectInputStream in) throws IOException { + Configuration hadoopConf = new Configuration(); + hadoopConf.readFields(in); + return hadoopConf; + } Review Comment: nit. how about consider adding explicit error handling in read/writeObject for easier debug? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
