mxm commented on code in PR #15150:
URL: https://github.com/apache/iceberg/pull/15150#discussion_r2961175351
##########
spark/v4.1/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataWrite.java:
##########
@@ -555,6 +557,55 @@ public void testViewsReturnRecentResults() {
assertThat(actual2).hasSameSizeAs(expected2).isEqualTo(expected2);
}
+ @TestTemplate
+ public void testWriteDataFilesInTableSortOrder() {
+ File parent = temp.resolve(format.toString()).toFile();
+ File location = new File(parent, "test");
+ String targetLocation = locationWithBranch(location);
+
+ HadoopTables tables = new HadoopTables(CONF);
+ PartitionSpec spec = PartitionSpec.unpartitioned();
+ Table table = tables.create(SCHEMA, spec, location.toString());
+
+ table.replaceSortOrder().asc("id").commit();
+
+ List<SimpleRecord> expected = Lists.newArrayListWithCapacity(4000);
+ for (int i = 0; i < 4000; i++) {
+ expected.add(new SimpleRecord(i, "a"));
+ }
+
+ Dataset<Row> df = spark.createDataFrame(expected, SimpleRecord.class);
+
+ df.select("id", "data")
+ .write()
+ .format("iceberg")
+ .option(SparkWriteOptions.WRITE_FORMAT, format.toString())
+ .mode(SaveMode.Append)
+ .save(location.toString());
+
+ createBranch(table);
Review Comment:
+1 We should not be branching here (and elsewhere) for no reason.
##########
spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/SparkWriteConf.java:
##########
@@ -171,6 +172,26 @@ public int outputSpecId() {
return outputSpecId;
}
+ public int outputSortOrderId(SparkWriteRequirements writeRequirements) {
+ String explicitId =
+
confParser.stringConf().option(SparkWriteOptions.OUTPUT_SORT_ORDER_ID).parseOptional();
+
+ if (explicitId != null) {
+ int id = Integer.parseInt(explicitId);
+ Preconditions.checkArgument(
+ table.sortOrders().containsKey(id),
+ "Cannot use output sort order id %s because the table does not
contain a sort order with that id",
+ id);
+ return id;
+ }
+
+ if (writeRequirements.hasOrdering()) {
+ return table.sortOrder().orderId();
Review Comment:
Why are we using the table's sort order and not the ordering from the
`writeRequirements`?
--
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]
