hudi-agent commented on code in PR #19304: URL: https://github.com/apache/hudi/pull/19304#discussion_r3659822774
########## hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestComplexKeyGenNewTableDefault.scala: ########## @@ -0,0 +1,140 @@ +/* + * 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.functional + +import org.apache.hudi.DataSourceWriteOptions +import org.apache.hudi.common.model.HoodieFileFormat +import org.apache.hudi.common.testutils.{HoodieTestDataGenerator, HoodieTestUtils} +import org.apache.hudi.common.testutils.HoodieTestDataGenerator.recordsToStrings +import org.apache.hudi.config.HoodieWriteConfig +import org.apache.hudi.core.io.storage.HoodieIOFactory +import org.apache.hudi.keygen.KeyGenUtils +import org.apache.hudi.storage.StoragePath +import org.apache.hudi.testutils.HoodieSparkClientTestBase +import org.apache.spark.sql.SaveMode +import org.junit.jupiter.api.{AfterEach, BeforeEach, Test} + +import scala.collection.JavaConverters._ + +/** + * Writes to a BRAND NEW table using ComplexKeyGenerator with a single record key field + * and a single partition path field, using PURE DEFAULTS for the three keygen-related + * write configs (new.encoding, auto.deduce.encoding, validation.enable are NOT set). + * + * Goal: empirically determine the default _hoodie_record_key format produced by this branch + * when a fresh table is written directly. + */ +class TestComplexKeyGenNewTableDefault extends HoodieSparkClientTestBase { + + var commonOpts: Map[String, String] = Map( + "hoodie.write.table.version" -> "8", // the encoding fix only applies to table version 8 and below + "hoodie.insert.shuffle.parallelism" -> "4", + "hoodie.upsert.shuffle.parallelism" -> "4", + DataSourceWriteOptions.PRECOMBINE_FIELD.key -> "timestamp", + HoodieWriteConfig.TBL_NAME.key -> "hoodie_test" + ) + + @BeforeEach + override def setUp(): Unit = { + initPath() + initSparkContexts() + initTestDataGenerator() + initHoodieStorage() + } + + @AfterEach + override def tearDown(): Unit = { + cleanupResources() + } + + @Test + def testNewTableDefaultKeyFormat(): Unit = { + val recordKeyField = "_row_key" + val partitionPathField = "partition" + + val dataGen = new HoodieTestDataGenerator(0xDEED) + val records = recordsToStrings(dataGen.generateInserts("001", 100)).asScala.toList + val inputDF = sparkSession.read.json(sparkSession.sparkContext.parallelize(records, 2)) + + // PURE DEFAULTS: only set keygen class + record key + partition path. + // Do NOT set hoodie.write.complex.keygen.new.encoding + // Do NOT set hoodie.write.complex.keygen.auto.deduce.encoding + // Do NOT set hoodie.write.complex.keygen.validation.enable + val options = commonOpts ++ Map( + DataSourceWriteOptions.RECORDKEY_FIELD.key -> recordKeyField, + DataSourceWriteOptions.PARTITIONPATH_FIELD.key -> partitionPathField, + DataSourceWriteOptions.KEYGENERATOR_CLASS_NAME.key -> "org.apache.hudi.keygen.ComplexKeyGenerator" + ) + + println("========== NEW TABLE DEFAULT WRITE: starting ==========") Review Comment: 🤖 nit: `testNewTableDefaultKeyFormat` only prints to stdout and never asserts — it will always pass regardless of what the code does. Could you add at least one assertion (e.g. that the aux file exists and that the sampled record keys match the expected default encoding), or fold the exploration into one of the parameterized tests? <sub><i>⚠️ AI-generated; verify before applying. React 👍/👎 to flag quality.</i></sub> ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/KeyGenUtils.java: ########## @@ -385,4 +408,91 @@ public static boolean mayUseNewEncodingForComplexKeyGen(HoodieTableConfig tableC return tableConfig.getTableVersion().lesserThan(HoodieTableVersion.NINE) && isComplexKeyGeneratorWithSingleRecordKeyField(tableConfig); } + + public static StoragePath getComplexKeyEncodingFilePath(StoragePath basePath) { + return new StoragePath(basePath, AUXILIARYFOLDER_NAME + "/" + COMPLEX_KEY_ENCODING_FILE_NAME); + } + + public static Option<Boolean> readComplexKeyEncodingFromAuxFile(HoodieStorage storage, StoragePath basePath) { + StoragePath encodingFilePath = getComplexKeyEncodingFilePath(basePath); + try { + if (storage.exists(encodingFilePath)) { + Properties props = new Properties(); + try (InputStream inputStream = storage.open(encodingFilePath)) { + props.load(inputStream); + } + String value = props.getProperty(COMPLEX_KEYGEN_NEW_ENCODING.key()); + if (value != null) { + return Option.of(Boolean.parseBoolean(value)); + } + } + } catch (IOException e) { + LOG.warn("Failed to read complex key encoding from aux file: {}", encodingFilePath, e); + } + return Option.empty(); + } + + public static void writeComplexKeyEncodingToAuxFile(HoodieStorage storage, StoragePath basePath, boolean useNewEncoding) { + StoragePath encodingFilePath = getComplexKeyEncodingFilePath(basePath); + try { + Properties props = new Properties(); + props.setProperty(COMPLEX_KEYGEN_NEW_ENCODING.key(), String.valueOf(useNewEncoding)); + try (OutputStream outputStream = storage.create(encodingFilePath, true)) { + props.store(outputStream, "Complex key generator encoding format"); + } + LOG.info("Wrote complex key encoding to aux file: {}", useNewEncoding); + } catch (IOException e) { + throw new HoodieKeyException("Failed to write complex key encoding file to " + encodingFilePath, e); + } + } + + public static final boolean DEFAULT_NEW_ENCODING_FOR_NEW_TABLE = true; Review Comment: 🤖 nit: could you move `DEFAULT_NEW_ENCODING_FOR_NEW_TABLE` up to the constant block at the top of the class (with `COMPLEX_KEY_ENCODING_FILE_NAME` etc.)? Having a `public static final` field declared mid-class between method bodies makes it easy to miss when searching for constants. <sub><i>⚠️ AI-generated; verify before applying. React 👍/👎 to flag quality.</i></sub> -- 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]
