[ENG-38911] Test hudi rs with hudi functional tests #18455
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -103,6 +103,7 @@ object HoodieSparkUtils extends SparkAdapterSupport with SparkVersionsSupport wi | |||||
| // Additionally, we have to explicitly wrap around resulting [[RDD]] into the one | ||||||
| // injecting [[SQLConf]], which by default isn't propagated by Spark to the executor(s). | ||||||
| // [[SQLConf]] is required by [[AvroSerializer]] | ||||||
| logWarning(s"createRdd executedPlan:\n${df.queryExecution.executedPlan.treeString}") | ||||||
|
Contributor
There was a problem hiding this comment.
This
This line should be removed entirely before merging. — Greptile (original) (source:comment#3082852557)
Contributor
There was a problem hiding this comment. Avoid warning-level plan dumps on the
Suggested change- logWarning(s"createRdd executedPlan:\n${df.queryExecution.executedPlan.treeString}")
+ logDebug(s"createRdd executedPlan:\n${df.queryExecution.executedPlan.treeString}")📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents— CodeRabbit (original) (source:comment#3082895711) |
||||||
| injectSQLConf(df.queryExecution.toRdd.mapPartitions (rows => { | ||||||
| if (rows.isEmpty) { | ||||||
| Iterator.empty | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 org.apache.hudi.testutils; | ||
|
|
||
| import org.apache.spark.SparkConf; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Utility for injecting Gluten/Velox native execution into a test {@link SparkConf}. | ||
| * | ||
| * <p>Activated by passing {@code -Dgluten.bundle.jar=<path>} at test time. | ||
| * If {@code ai.onehouse.quanton.QuantonPlugin} is on the classpath it is preferred; | ||
| * otherwise {@code org.apache.gluten.GlutenPlugin} is used. | ||
| */ | ||
| public class GlutenTestUtils { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(GlutenTestUtils.class); | ||
|
|
||
| private GlutenTestUtils() {} | ||
|
|
||
| /** | ||
| * Applies Gluten/Velox native-execution settings to {@code sparkConf} when the | ||
| * {@code gluten.bundle.jar} system property is set. No-op otherwise. | ||
| */ | ||
| public static void applyGlutenConf(SparkConf sparkConf) { | ||
| String glutenBundleJar = System.getProperty("gluten.bundle.jar"); | ||
| if (glutenBundleJar == null || glutenBundleJar.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| String pluginClass; | ||
| try { | ||
| Class.forName("ai.onehouse.quanton.QuantonPlugin"); | ||
| pluginClass = "ai.onehouse.quanton.QuantonPlugin"; | ||
| } catch (ClassNotFoundException e) { | ||
| pluginClass = "org.apache.gluten.GlutenPlugin"; | ||
| } | ||
|
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: fd -t f "GlutenTestUtils.java"Repository: yihua/hudi Length of output: 144 🏁 Script executed: cat -n hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/GlutenTestUtils.javaRepository: yihua/hudi Length of output: 3358 🏁 Script executed: # Search for similar validation patterns in the codebase for system properties
rg "System.getProperty" --type java -A 5 -B 2 | head -100Repository: yihua/hudi Length of output: 13994 🏁 Script executed: # Check if there are any tests or usages of applyGlutenConf
rg "applyGlutenConf" --type java -B 2 -A 5Repository: yihua/hudi Length of output: 3052 Add fail-fast validation for The method currently treats Suggested fail-fast check+import java.io.File;
+
public static void applyGlutenConf(SparkConf sparkConf) {
String glutenBundleJar = System.getProperty("gluten.bundle.jar");
if (glutenBundleJar == null || glutenBundleJar.isEmpty()) {
return;
}
+ if (!new File(glutenBundleJar).isFile()) {
+ throw new IllegalArgumentException("gluten.bundle.jar does not point to an existing file: " + glutenBundleJar);
+ }
String pluginClass;
try {
Class.forName("ai.onehouse.quanton.QuantonPlugin");
pluginClass = "ai.onehouse.quanton.QuantonPlugin";
} catch (ClassNotFoundException e) {
- pluginClass = "org.apache.gluten.GlutenPlugin";
+ try {
+ Class.forName("org.apache.gluten.GlutenPlugin");
+ pluginClass = "org.apache.gluten.GlutenPlugin";
+ } catch (ClassNotFoundException e2) {
+ throw new IllegalStateException(
+ "gluten.bundle.jar is set but neither Quanton nor Gluten plugin is on the test classpath",
+ e2);
+ }
}🤖 Prompt for AI Agents— CodeRabbit (original) (source:comment#3082895725) |
||
|
|
||
| String confPrefix = pluginClass.contains("quanton") ? "spark.quanton" : "spark.gluten"; | ||
| String libName = pluginClass.contains("quanton") ? "quanton" : "gluten"; | ||
|
|
||
| sparkConf.set("spark.plugins", pluginClass); | ||
| sparkConf.set("spark.memory.offHeap.enabled", "true"); | ||
| sparkConf.set("spark.memory.offHeap.size", System.getProperty("gluten.offheap.size", "8g")); | ||
| sparkConf.set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager"); | ||
| sparkConf.set(confPrefix + ".sql.columnar.libname", libName); | ||
| sparkConf.set(confPrefix + ".sql.columnar.backend.velox.glogSeverityLevel", "0"); | ||
|
|
||
| LOG.warn("Using Gluten/Velox native execution with plugin={}, lib={}", pluginClass, libName); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -113,7 +113,7 @@ | |
| * Tests {@link HoodieFileGroupReader} with different engines | ||
| */ | ||
| public abstract class TestHoodieFileGroupReaderBase<T> { | ||
| private static final List<HoodieFileFormat> DEFAULT_SUPPORTED_FILE_FORMATS = Arrays.asList(HoodieFileFormat.PARQUET); | ||
|
Contributor
There was a problem hiding this comment. 🤖 Removing ORC from - Generated by an AI agent and may contain mistakes. Please verify any suggestions before applying. |
||
| protected static List<HoodieFileFormat> supportedFileFormats; | ||
| private static final String KEY_FIELD_NAME = "_row_key"; | ||
| protected static final String ORDERING_FIELD_NAME = "timestamp"; | ||
|
|
@@ -356,10 +356,10 @@ private static Stream<Arguments> testArguments() { | |
| args.add(arguments(RecordMergeMode.COMMIT_TIME_ORDERING, HoodieFileFormat.PARQUET, "avro", false)); | ||
| args.add(arguments(RecordMergeMode.EVENT_TIME_ORDERING, HoodieFileFormat.PARQUET, "avro", true)); | ||
| } | ||
| args.add(arguments(RecordMergeMode.COMMIT_TIME_ORDERING, HoodieFileFormat.PARQUET, "avro", true)); | ||
| args.add(arguments(RecordMergeMode.EVENT_TIME_ORDERING, HoodieFileFormat.PARQUET, "avro", true)); | ||
| // args.add(arguments(RecordMergeMode.CUSTOM, HoodieFileFormat.PARQUET, "avro", false)); | ||
| // args.add(arguments(RecordMergeMode.CUSTOM, HoodieFileFormat.PARQUET, "parquet", true)); | ||
|
|
||
| return args.stream(); | ||
| } | ||
|
|
@@ -449,8 +449,7 @@ public void testReadFileGroupWithMultipleOrderingFields() throws Exception { | |
| private static Stream<Arguments> logFileOnlyCases() { | ||
| return Stream.of( | ||
| arguments(RecordMergeMode.COMMIT_TIME_ORDERING, "avro"), | ||
| arguments(RecordMergeMode.EVENT_TIME_ORDERING, "avro")); | ||
|
Contributor
There was a problem hiding this comment. Log file only test cases reduced to avro format only.
🤖 Prompt for AI Agents— CodeRabbit (original) (source:comment#3082895741) |
||
| } | ||
|
|
||
| @ParameterizedTest | ||
|
|
@@ -549,10 +548,8 @@ private static Stream<Arguments> testArgsForDifferentBaseAndLogFormats() { | |
|
|
||
| if (supportsLance) { | ||
| args.add(arguments(HoodieFileFormat.LANCE, "avro")); | ||
| } | ||
| args.add(arguments(HoodieFileFormat.PARQUET, "avro")); | ||
|
|
||
| return args.stream(); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ | |
| import org.apache.hudi.storage.StorageConfiguration; | ||
|
|
||
| import org.apache.avro.generic.IndexedRecord; | ||
| import org.junit.jupiter.api.Disabled; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
@@ -137,6 +138,7 @@ void readWithEventTimeOrderingAndDeleteBlock() throws IOException { | |
| assertEquals(2, readStats.getNumUpdates()); | ||
| } | ||
|
|
||
| @Disabled("Custom delete payload not supported") | ||
| @Test | ||
| void readWithEventTimeOrderingWithRecords() throws IOException { | ||
| HoodieReadStats readStats = new HoodieReadStats(); | ||
|
|
@@ -176,6 +178,7 @@ void readWithEventTimeOrderingWithRecords() throws IOException { | |
| assertEquals(3, readStats.getNumUpdates()); | ||
| } | ||
|
|
||
| @Disabled("Custom delete payload not supported") | ||
| @Test | ||
| void readWithCommitTimeOrdering() throws IOException { | ||
|
Contributor
There was a problem hiding this comment. Disabled reason may be misleading for test name. The test 🤖 Prompt for AI Agents— CodeRabbit (original) (source:comment#3082895734) |
||
| HoodieReadStats readStats = new HoodieReadStats(); | ||
|
|
@@ -206,6 +209,7 @@ void readWithCommitTimeOrdering() throws IOException { | |
| assertEquals(2, readStats.getNumUpdates()); | ||
| } | ||
|
|
||
| @Disabled("Custom delete payload not supported") | ||
| @Test | ||
| void readWithCommitTimeOrderingWithRecords() throws IOException { | ||
| HoodieReadStats readStats = new HoodieReadStats(); | ||
|
|
@@ -242,6 +246,7 @@ void readWithCommitTimeOrderingWithRecords() throws IOException { | |
| assertEquals(4, readStats.getNumUpdates()); | ||
| } | ||
|
|
||
| @Disabled("CUSTOM merge mode not supported") | ||
| @Test | ||
| void readWithCustomPayload() throws IOException { | ||
| HoodieReadStats readStats = new HoodieReadStats(); | ||
|
|
@@ -281,6 +286,7 @@ void readWithCustomPayload() throws IOException { | |
| assertEquals(0, readStats.getNumUpdates()); | ||
| } | ||
|
|
||
| @Disabled("CUSTOM merge mode not supported") | ||
| @Test | ||
| void readWithCustomPayloadWithRecords() throws IOException { | ||
| HoodieReadStats readStats = new HoodieReadStats(); | ||
|
|
@@ -320,6 +326,7 @@ void readWithCustomPayloadWithRecords() throws IOException { | |
| assertEquals(2, readStats.getNumUpdates()); | ||
| } | ||
|
|
||
| @Disabled("CUSTOM merge mode not supported") | ||
| @Test | ||
| void readWithCustomMerger() throws IOException { | ||
| HoodieReadStats readStats = new HoodieReadStats(); | ||
|
|
@@ -357,6 +364,7 @@ void readWithCustomMerger() throws IOException { | |
| assertEquals(0, readStats.getNumUpdates()); | ||
| } | ||
|
|
||
| @Disabled("CUSTOM merge mode not supported") | ||
| @Test | ||
| void readWithCustomMergerWithRecords() throws IOException { | ||
| HoodieReadStats readStats = new HoodieReadStats(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤖 This
logWarningdumps the full executed plan on everycreateRddcall in production code. This is a debug statement that should be removed before merging — it will produce excessive log output in production workloads and may leak schema details into logs.- Generated by an AI agent and may contain mistakes. Please verify any suggestions before applying.