This is an automated email from the ASF dual-hosted git repository. yihua pushed a commit to branch branch-0.x in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 81094e699ee6c70f2011fe8bb685ddbfa53245af Author: Jon Vexler <[email protected]> AuthorDate: Mon May 13 18:18:14 2024 -0700 remove a few classes from hudi-common (#11209) Co-authored-by: Jonathan Vexler <=> --- .../apache/hudi/avro/HoodieBloomFilterWriteSupport.java | 5 +++-- .../java/org/apache/hudi/common/util/BaseFileUtils.java | 9 ++++----- .../org/apache/hudi/avro/HoodieAvroWriteSupport.java | 16 +++++++--------- .../apache/hudi/common/util/ParquetReaderIterator.java | 0 .../org/apache/hudi/io/hadoop/HoodieAvroOrcWriter.java | 3 +-- .../org/apache/hudi/io/storage/HoodieParquetConfig.java | 0 .../hudi/common/util/TestParquetReaderIterator.java | 0 .../apache/hudi/io/hadoop/TestHoodieOrcReaderWriter.java | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieBloomFilterWriteSupport.java b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieBloomFilterWriteSupport.java index 1a689791ba3..39a4655b4e2 100644 --- a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieBloomFilterWriteSupport.java +++ b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieBloomFilterWriteSupport.java @@ -24,8 +24,6 @@ import org.apache.hudi.common.bloom.HoodieDynamicBoundedBloomFilter; import java.util.HashMap; import java.util.Map; -import static org.apache.hudi.avro.HoodieAvroWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY; - /** * This is write-support utility base-class taking up handling of * @@ -42,6 +40,9 @@ public abstract class HoodieBloomFilterWriteSupport<T extends Comparable<T>> { public static final String HOODIE_MAX_RECORD_KEY_FOOTER = "hoodie_max_record_key"; public static final String HOODIE_BLOOM_FILTER_TYPE_CODE = "hoodie_bloom_filter_type_code"; + public static final String HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY = "org.apache.hudi.bloomfilter"; + public static final String OLD_HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY = "com.uber.hoodie.bloomfilter"; + private final BloomFilter bloomFilter; private T minRecordKey; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/BaseFileUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/BaseFileUtils.java index 0f496b2d144..8fb224dddaa 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/BaseFileUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/BaseFileUtils.java @@ -18,7 +18,6 @@ package org.apache.hudi.common.util; -import org.apache.hudi.avro.HoodieAvroWriteSupport; import org.apache.hudi.avro.HoodieBloomFilterWriteSupport; import org.apache.hudi.common.bloom.BloomFilter; import org.apache.hudi.common.bloom.BloomFilterFactory; @@ -99,13 +98,13 @@ public abstract class BaseFileUtils { public BloomFilter readBloomFilterFromMetadata(StorageConfiguration<?> configuration, StoragePath filePath) { Map<String, String> footerVals = readFooter(configuration, false, filePath, - HoodieAvroWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY, - HoodieAvroWriteSupport.OLD_HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY, + HoodieBloomFilterWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY, + HoodieBloomFilterWriteSupport.OLD_HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY, HoodieBloomFilterWriteSupport.HOODIE_BLOOM_FILTER_TYPE_CODE); - String footerVal = footerVals.get(HoodieAvroWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY); + String footerVal = footerVals.get(HoodieBloomFilterWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY); if (null == footerVal) { // We use old style key "com.uber.hoodie.bloomfilter" - footerVal = footerVals.get(HoodieAvroWriteSupport.OLD_HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY); + footerVal = footerVals.get(HoodieBloomFilterWriteSupport.OLD_HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY); } BloomFilter toReturn = null; if (footerVal != null) { diff --git a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java b/hudi-hadoop-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java similarity index 82% rename from hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java rename to hudi-hadoop-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java index 01ae15da1eb..878f68a693a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java +++ b/hudi-hadoop-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java @@ -7,13 +7,14 @@ * "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 + * 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. + * 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.hudi.avro; @@ -42,9 +43,6 @@ public class HoodieAvroWriteSupport<T> extends AvroWriteSupport<T> { private final Map<String, String> footerMetadata = new HashMap<>(); protected final Properties properties; - public static final String OLD_HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY = "com.uber.hoodie.bloomfilter"; - public static final String HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY = "org.apache.hudi.bloomfilter"; - public HoodieAvroWriteSupport(MessageType schema, Schema avroSchema, Option<BloomFilter> bloomFilterOpt, Properties properties) { super(schema, avroSchema, ConvertingGenericData.INSTANCE); diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/ParquetReaderIterator.java b/hudi-hadoop-common/src/main/java/org/apache/hudi/common/util/ParquetReaderIterator.java similarity index 100% rename from hudi-common/src/main/java/org/apache/hudi/common/util/ParquetReaderIterator.java rename to hudi-hadoop-common/src/main/java/org/apache/hudi/common/util/ParquetReaderIterator.java diff --git a/hudi-hadoop-common/src/main/java/org/apache/hudi/io/hadoop/HoodieAvroOrcWriter.java b/hudi-hadoop-common/src/main/java/org/apache/hudi/io/hadoop/HoodieAvroOrcWriter.java index 40e37fa145f..3ecc8fcd450 100644 --- a/hudi-hadoop-common/src/main/java/org/apache/hudi/io/hadoop/HoodieAvroOrcWriter.java +++ b/hudi-hadoop-common/src/main/java/org/apache/hudi/io/hadoop/HoodieAvroOrcWriter.java @@ -19,7 +19,6 @@ package org.apache.hudi.io.hadoop; -import org.apache.hudi.avro.HoodieAvroWriteSupport; import org.apache.hudi.avro.HoodieBloomFilterWriteSupport; import org.apache.hudi.common.bloom.BloomFilter; import org.apache.hudi.common.bloom.HoodieDynamicBoundedBloomFilter; @@ -155,7 +154,7 @@ public class HoodieAvroOrcWriter implements HoodieAvroFileWriter, Closeable { if (orcConfig.useBloomFilter()) { final BloomFilter bloomFilter = orcConfig.getBloomFilter(); - writer.addUserMetadata(HoodieAvroWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY, ByteBuffer.wrap(getUTF8Bytes(bloomFilter.serializeToString()))); + writer.addUserMetadata(HoodieBloomFilterWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY, ByteBuffer.wrap(getUTF8Bytes(bloomFilter.serializeToString()))); if (minRecordKey != null && maxRecordKey != null) { writer.addUserMetadata(HoodieBloomFilterWriteSupport.HOODIE_MIN_RECORD_KEY_FOOTER, ByteBuffer.wrap(getUTF8Bytes(minRecordKey))); writer.addUserMetadata(HoodieBloomFilterWriteSupport.HOODIE_MAX_RECORD_KEY_FOOTER, ByteBuffer.wrap(getUTF8Bytes(maxRecordKey))); diff --git a/hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieParquetConfig.java b/hudi-hadoop-common/src/main/java/org/apache/hudi/io/storage/HoodieParquetConfig.java similarity index 100% rename from hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieParquetConfig.java rename to hudi-hadoop-common/src/main/java/org/apache/hudi/io/storage/HoodieParquetConfig.java diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestParquetReaderIterator.java b/hudi-hadoop-common/src/test/java/org/apache/hudi/common/util/TestParquetReaderIterator.java similarity index 100% rename from hudi-common/src/test/java/org/apache/hudi/common/util/TestParquetReaderIterator.java rename to hudi-hadoop-common/src/test/java/org/apache/hudi/common/util/TestParquetReaderIterator.java diff --git a/hudi-hadoop-common/src/test/java/org/apache/hudi/io/hadoop/TestHoodieOrcReaderWriter.java b/hudi-hadoop-common/src/test/java/org/apache/hudi/io/hadoop/TestHoodieOrcReaderWriter.java index 0cf0ca9d445..1fec959ba93 100644 --- a/hudi-hadoop-common/src/test/java/org/apache/hudi/io/hadoop/TestHoodieOrcReaderWriter.java +++ b/hudi-hadoop-common/src/test/java/org/apache/hudi/io/hadoop/TestHoodieOrcReaderWriter.java @@ -44,7 +44,7 @@ import org.mockito.Mockito; import java.io.IOException; import java.util.function.Supplier; -import static org.apache.hudi.avro.HoodieAvroWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY; +import static org.apache.hudi.avro.HoodieBloomFilterWriteSupport.HOODIE_AVRO_BLOOM_FILTER_METADATA_KEY; import static org.apache.hudi.common.util.ConfigUtils.DEFAULT_HUDI_CONFIG_FOR_READER; import static org.apache.hudi.io.storage.HoodieOrcConfig.AVRO_SCHEMA_METADATA_KEY; import static org.junit.jupiter.api.Assertions.assertEquals;
