stevenzwu opened a new pull request, #13943: URL: https://github.com/apache/iceberg/pull/13943
It is **almost** a clean backport ``` git diff HEAD~1 HEAD flink/v2.0 |sed "s/v2.0/v1.20/g">/tmp/1.20.patch git apply -3 /tmp/1.20.patch git diff HEAD~1 HEAD flink/v2.0 |sed "s/v2.0/v1.19/g">/tmp/1.19.patch git apply -3 /tmp/1.19.patch git co --theirs flink/v1.19/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java ``` There was a diff btw 1.19 and other versions before the backport ``` ➜ iceberg git:(main) ✗ diff flink/v1.19/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java flink/v1.20/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java 143c143 < return prefix + new String(buffer, StandardCharsets.US_ASCII); --- > return prefix + new String(buffer, StandardCharsets.UTF_8); ``` after the backport and conflict resolution, now there is no diff ``` ➜ iceberg git:(backport-13900) ✗ diff flink/v1.19/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java flink/v1.20/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java ➜ iceberg git:(backport-13900) ✗ ``` -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
