Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flink: Backport PR #10526 to v1.18 and v1.20 #11018

Merged
merged 2 commits into from
Aug 30, 2024

Conversation

zhongqishang
Copy link
Contributor

Backport PR #10526

@github-actions github-actions bot added the flink label Aug 27, 2024
@pvary
Copy link
Contributor

pvary commented Aug 27, 2024

@zhongqishang:
This could help with the backport:

git diff HEAD^ HEAD > /tmp/v1.19.patch
cat /tmp/v1.19.patch | sed "s/v1.19/v1.20/g" > /tmp/v1.20.patch
git apply -3 /tmp/v1.20.patch

@zhongqishang zhongqishang marked this pull request as draft August 27, 2024 06:35
@@ -242,21 +246,21 @@ public void testOrderedEventsBetweenCheckpoints() throws Exception {
RowData row1 = SimpleDataUtil.createRowData(1, "hello");
DataFile dataFile1 = writeDataFile("data-1", ImmutableList.of(row1));

harness.processElement(of(dataFile1), ++timestamp);
long firstCheckpointId = 1;
harness.processElement(of(firstCheckpointId, dataFile1), ++timestamp);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pvary When apply V1.20 patch, a misalignment occurred.

But I don't know what caused it, so I fixed it manually.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is related to @rodmeneses's last commit.
Could you please check @rodmeneses?
Thanks,
Peter

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e6f8ab9#diff-4f79d5342dad9de47d561297e1af60aac21a498f22144ad378dc762affdbfa27L142-L143

Yes, thanks for your reminder.
It should be the modification of TestIcebergFilesCommitter.java that caused the inconsistent line numbers.

@zhongqishang
Copy link
Contributor Author

I via the follow cmd to check the diff


git diff --no-index flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink
git diff --no-index flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink

git diff --no-index flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink 
git diff --no-index flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink

There is no difference between 1.19 and 1.20.
The difference between 1.19 and 1.18 is not caused by this PR.

@zhongqishang zhongqishang marked this pull request as ready for review August 27, 2024 07:31
@pvary pvary merged commit e8c6148 into apache:main Aug 30, 2024
20 checks passed
@pvary
Copy link
Contributor

pvary commented Aug 30, 2024

Merged to main. Thanks for the backport @zhongqishang!

jenbaldwin pushed a commit to Teradata/iceberg that referenced this pull request Sep 17, 2024
* main: (208 commits)
  Docs: Fix Flink 1.20 support versions (apache#11065)
  Flink: Fix compile warning (apache#11072)
  Docs: Initial committer guidelines and requirements for merging (apache#10780)
  Core: Refactor ZOrderByteUtils (apache#10624)
  API: implement types timestamp_ns and timestamptz_ns (apache#9008)
  Build: Bump com.google.errorprone:error_prone_annotations (apache#11055)
  Build: Bump mkdocs-material from 9.5.33 to 9.5.34 (apache#11062)
  Flink: Backport PR apache#10526 to v1.18 and v1.20 (apache#11018)
  Kafka Connect: Disable publish tasks in runtime project (apache#11032)
  Flink: add unit tests for range distribution on bucket partition column (apache#11033)
  Spark 3.5: Use FileGenerationUtil in PlanningBenchmark (apache#11027)
  Core: Add benchmark for appending files (apache#11029)
  Build: Ignore benchmark output folders across all modules (apache#11030)
  Spec: Add RemovePartitionSpecsUpdate REST update type (apache#10846)
  Docs: bump latest version to 1.6.1 (apache#11036)
  OpenAPI, Build: Apply spotless to testFixtures source code (apache#11024)
  Core: Generate realistic bounds in benchmarks (apache#11022)
  Add REST Compatibility Kit (apache#10908)
  Flink: backport PR apache#10832 of inferring parallelism in FLIP-27 source (apache#11009)
  Docs: Add Druid docs url to sidebar (apache#10997)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants