Skip to content

Commit 5aca977

Browse files
committed
[834] Follow Hudi's hudi-common package reorganization
Hudi master moved two packages that XTable depends on, in the refactor(common) commits apache/hudi#19193 and apache/hudi#19195: - org.apache.hudi.stats -> org.apache.hudi.metadata.stats, covering ValueMetadata, ValueType and HoodieColumnRangeMetadata. XTable's XTableValueMetadata and its test live inside Hudi's package to reach package-private members, so the files move directories as well. - org.apache.hudi.avro.HoodieAvroUtils -> org.apache.hudi.common.avro. HoodieAvroUtils. The generated org.apache.hudi.avro.model classes did not move. This is required to build against a Hudi release that carries the reorganization, alongside the hudi.version bump this branch already makes.
1 parent 994aa31 commit 5aca977

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

xtable-core/src/main/java/org/apache/hudi/stats/XTableValueMetadata.java renamed to xtable-core/src/main/java/org/apache/hudi/metadata/stats/XTableValueMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.hudi.stats;
19+
package org.apache.hudi.metadata.stats;
2020

2121
import static org.apache.xtable.model.schema.InternalSchema.MetadataKey.TIMESTAMP_PRECISION;
2222
import static org.apache.xtable.model.schema.InternalSchema.MetadataValue.MICROS;

xtable-core/src/main/java/org/apache/xtable/hudi/BaseFileUpdatesExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
import org.apache.hudi.hadoop.fs.CachingPath;
5858
import org.apache.hudi.metadata.HoodieIndexVersion;
5959
import org.apache.hudi.metadata.HoodieTableMetadata;
60-
import org.apache.hudi.stats.HoodieColumnRangeMetadata;
61-
import org.apache.hudi.stats.ValueMetadata;
62-
import org.apache.hudi.stats.XTableValueMetadata;
60+
import org.apache.hudi.metadata.stats.HoodieColumnRangeMetadata;
61+
import org.apache.hudi.metadata.stats.ValueMetadata;
62+
import org.apache.hudi.metadata.stats.XTableValueMetadata;
6363

6464
import org.apache.xtable.collectors.CustomCollectors;
6565
import org.apache.xtable.exception.ReadException;

xtable-core/src/main/java/org/apache/xtable/hudi/HudiFileStatsExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
import org.apache.hudi.metadata.HoodieTableMetadata;
5555
import org.apache.hudi.metadata.HoodieTableMetadataUtil;
5656
import org.apache.hudi.metadata.MetadataPartitionType;
57-
import org.apache.hudi.stats.HoodieColumnRangeMetadata;
58-
import org.apache.hudi.stats.ValueMetadata;
59-
import org.apache.hudi.stats.XTableValueMetadata;
57+
import org.apache.hudi.metadata.stats.HoodieColumnRangeMetadata;
58+
import org.apache.hudi.metadata.stats.ValueMetadata;
59+
import org.apache.hudi.metadata.stats.XTableValueMetadata;
6060

6161
import org.apache.xtable.avro.AvroSchemaConverter;
6262
import org.apache.xtable.collectors.CustomCollectors;

xtable-core/src/test/java/org/apache/hudi/stats/TestXTableValueMetadata.java renamed to xtable-core/src/test/java/org/apache/hudi/metadata/stats/TestXTableValueMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.hudi.stats;
19+
package org.apache.hudi.metadata.stats;
2020

2121
import static org.junit.jupiter.api.Assertions.assertEquals;
2222
import static org.junit.jupiter.api.Assertions.assertInstanceOf;

xtable-core/src/test/java/org/apache/xtable/TestJavaHudiTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
import org.apache.avro.generic.GenericRecord;
4040
import org.apache.hadoop.conf.Configuration;
4141

42-
import org.apache.hudi.avro.HoodieAvroUtils;
4342
import org.apache.hudi.client.HoodieJavaWriteClient;
4443
import org.apache.hudi.client.WriteStatus;
4544
import org.apache.hudi.client.clustering.plan.strategy.JavaSizeBasedClusteringPlanStrategy;
4645
import org.apache.hudi.client.clustering.run.strategy.JavaSortAndSizeExecutionStrategy;
4746
import org.apache.hudi.client.common.HoodieJavaEngineContext;
47+
import org.apache.hudi.common.avro.HoodieAvroUtils;
4848
import org.apache.hudi.common.config.TypedProperties;
4949
import org.apache.hudi.common.engine.HoodieEngineContext;
5050
import org.apache.hudi.common.model.HoodieAvroPayload;

xtable-core/src/test/java/org/apache/xtable/hudi/HudiTestUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.apache.hudi.config.HoodieArchivalConfig;
4949
import org.apache.hudi.config.HoodieIndexConfig;
5050
import org.apache.hudi.config.HoodieWriteConfig;
51-
import org.apache.hudi.stats.HoodieColumnRangeMetadata;
51+
import org.apache.hudi.metadata.stats.HoodieColumnRangeMetadata;
5252

5353
@NoArgsConstructor(access = AccessLevel.PRIVATE)
5454
public class HudiTestUtil {

xtable-core/src/test/java/org/apache/xtable/hudi/TestBaseFileUpdatesExtractor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.apache.xtable.hudi;
2020

2121
import static org.apache.hudi.hadoop.fs.HadoopFSUtils.getStorageConf;
22-
import static org.apache.hudi.stats.XTableValueMetadata.getValueMetadata;
22+
import static org.apache.hudi.metadata.stats.XTableValueMetadata.getValueMetadata;
2323
import static org.apache.xtable.hudi.HudiTestUtil.createWriteStatus;
2424
import static org.apache.xtable.hudi.HudiTestUtil.getHoodieWriteConfig;
2525
import static org.apache.xtable.hudi.HudiTestUtil.initTableAndGetMetaClient;
@@ -60,9 +60,9 @@
6060
import org.apache.hudi.config.HoodieWriteConfig;
6161
import org.apache.hudi.hadoop.fs.CachingPath;
6262
import org.apache.hudi.metadata.HoodieIndexVersion;
63-
import org.apache.hudi.stats.HoodieColumnRangeMetadata;
64-
import org.apache.hudi.stats.ValueMetadata;
65-
import org.apache.hudi.stats.ValueType;
63+
import org.apache.hudi.metadata.stats.HoodieColumnRangeMetadata;
64+
import org.apache.hudi.metadata.stats.ValueMetadata;
65+
import org.apache.hudi.metadata.stats.ValueType;
6666

6767
import org.apache.xtable.model.schema.InternalField;
6868
import org.apache.xtable.model.schema.InternalPartitionField;

0 commit comments

Comments
 (0)