This is an automated email from the ASF dual-hosted git repository. sivabalan pushed a commit to branch release-0.12.2-shadow in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 2e6297cfd30060a8deccf038a70d98fcad88ceea Author: sivabalan <n.siv...@gmail.com> AuthorDate: Tue Dec 13 16:45:25 2022 -0800 Revert "resolving conflicts for HUDI-5306" This reverts commit c30e60fe93953dd279a9ef27a40174b4728b937c. --- .../java/org/apache/hudi/configuration/OptionsResolver.java | 12 +++++++++++- .../main/java/org/apache/hudi/table/HoodieTableSource.java | 3 +-- .../main/java/org/apache/hudi/util/RowDataProjection.java | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/configuration/OptionsResolver.java b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/configuration/OptionsResolver.java index 2d56ea4e043..029ac3c4027 100644 --- a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/configuration/OptionsResolver.java +++ b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/configuration/OptionsResolver.java @@ -18,7 +18,6 @@ package org.apache.hudi.configuration; -import org.apache.hudi.common.config.HoodieCommonConfig; import org.apache.hudi.common.model.DefaultHoodieRecordPayload; import org.apache.hudi.common.model.WriteOperationType; import org.apache.hudi.common.util.StringUtils; @@ -203,6 +202,16 @@ public class OptionsResolver { return !conf.contains(FlinkOptions.READ_START_COMMIT) && !conf.contains(FlinkOptions.READ_END_COMMIT); } +<<<<<<< HEAD +======= + /** + * Returns the supplemental logging mode. + */ + public static HoodieCDCSupplementalLoggingMode getCDCSupplementalLoggingMode(Configuration conf) { + String mode = conf.getString(FlinkOptions.SUPPLEMENTAL_LOGGING_MODE); + return HoodieCDCSupplementalLoggingMode.parse(mode); + } + /** * Returns whether comprehensive schema evolution enabled. */ @@ -210,6 +219,7 @@ public class OptionsResolver { return conf.getBoolean(HoodieCommonConfig.SCHEMA_EVOLUTION_ENABLE.key(), HoodieCommonConfig.SCHEMA_EVOLUTION_ENABLE.defaultValue()); } +>>>>>>> 07cc3e89a7 ([HUDI-5306] Unify RecordIterator and HoodieParquetReader with ClosableIterator (#7340)) // ------------------------------------------------------------------------- // Utilities // ------------------------------------------------------------------------- diff --git a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/HoodieTableSource.java b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/HoodieTableSource.java index 5a28eb97a77..4ea14c413cc 100644 --- a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/HoodieTableSource.java +++ b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/HoodieTableSource.java @@ -462,8 +462,7 @@ public class HoodieTableSource implements this.conf.getString(FlinkOptions.PARTITION_DEFAULT_NAME), this.limit == NO_LIMIT_CONSTANT ? Long.MAX_VALUE : this.limit, // ParquetInputFormat always uses the limit value getParquetConf(this.conf, this.hadoopConf), - this.conf.getBoolean(FlinkOptions.UTC_TIMEZONE), - null + this.conf.getBoolean(FlinkOptions.UTC_TIMEZONE) ); } diff --git a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/RowDataProjection.java b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/RowDataProjection.java index c0f3758a793..2e3e8a2ed32 100644 --- a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/RowDataProjection.java +++ b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/RowDataProjection.java @@ -89,7 +89,8 @@ public class RowDataProjection implements Serializable { return values; } - protected @Nullable Object getVal(int pos, @Nullable Object val) { + protected @Nullable + Object getVal(int pos, @Nullable Object val) { return val; } }