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 c30e60fe93953dd279a9ef27a40174b4728b937c Author: sivabalan <[email protected]> AuthorDate: Tue Dec 13 08:26:19 2022 -0800 resolving conflicts for HUDI-5306 --- .../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, 4 insertions(+), 14 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 029ac3c4027..2d56ea4e043 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,6 +18,7 @@ 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; @@ -202,16 +203,6 @@ 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. */ @@ -219,7 +210,6 @@ 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 4ea14c413cc..5a28eb97a77 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,7 +462,8 @@ 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) + this.conf.getBoolean(FlinkOptions.UTC_TIMEZONE), + null ); } 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 2e3e8a2ed32..c0f3758a793 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,8 +89,7 @@ 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; } }
