amogh-jahagirdar commented on code in PR #5150:
URL: https://github.com/apache/iceberg/pull/5150#discussion_r1008880983
##########
spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestSnapshotSelection.java:
##########
@@ -226,4 +226,148 @@ public void
testSnapshotSelectionBySnapshotIdAndTimestamp() throws IOException {
.hasMessageContaining("Cannot specify both snapshot-id")
.hasMessageContaining("and as-of-timestamp");
}
+
+ @Test
+ public void testSnapshotSelectionByTag() throws IOException {
+ String tableLocation = temp.newFolder("iceberg-table").toString();
+
+ HadoopTables tables = new HadoopTables(CONF);
+ PartitionSpec spec = PartitionSpec.unpartitioned();
+ Table table = tables.create(SCHEMA, spec, tableLocation);
+
+ // produce the first snapshot
+ List<SimpleRecord> firstBatchRecords =
+ Lists.newArrayList(
+ new SimpleRecord(1, "a"), new SimpleRecord(2, "b"), new
SimpleRecord(3, "c"));
+ Dataset<Row> firstDf = spark.createDataFrame(firstBatchRecords,
SimpleRecord.class);
+ firstDf.select("id",
"data").write().format("iceberg").mode("append").save(tableLocation);
+
+ table.manageSnapshots().createTag("tag",
table.currentSnapshot().snapshotId()).commit();
+
+ // produce the second snapshot
+ List<SimpleRecord> secondBatchRecords =
+ Lists.newArrayList(
+ new SimpleRecord(4, "d"), new SimpleRecord(5, "e"), new
SimpleRecord(6, "f"));
+ Dataset<Row> secondDf = spark.createDataFrame(secondBatchRecords,
SimpleRecord.class);
+ secondDf.select("id",
"data").write().format("iceberg").mode("append").save(tableLocation);
+
+ // verify records in the current snapshot by tag
+ Dataset<Row> currentSnapshotResult =
+ spark.read().format("iceberg").option("tag",
"tag").load(tableLocation);
+ List<SimpleRecord> currentSnapshotRecords =
+
currentSnapshotResult.orderBy("id").as(Encoders.bean(SimpleRecord.class)).collectAsList();
+ List<SimpleRecord> expectedRecords = Lists.newArrayList();
+ expectedRecords.addAll(firstBatchRecords);
+ Assert.assertEquals(
+ "Current snapshot rows should match", expectedRecords,
currentSnapshotRecords);
+ }
+
+ @Test
+ public void testSnapshotSelectionByBranch() throws IOException {
+ String tableLocation = temp.newFolder("iceberg-table").toString();
+
+ HadoopTables tables = new HadoopTables(CONF);
+ PartitionSpec spec = PartitionSpec.unpartitioned();
+ Table table = tables.create(SCHEMA, spec, tableLocation);
+
+ // produce the first snapshot
+ List<SimpleRecord> firstBatchRecords =
+ Lists.newArrayList(
+ new SimpleRecord(1, "a"), new SimpleRecord(2, "b"), new
SimpleRecord(3, "c"));
+ Dataset<Row> firstDf = spark.createDataFrame(firstBatchRecords,
SimpleRecord.class);
+ firstDf.select("id",
"data").write().format("iceberg").mode("append").save(tableLocation);
+
+ table.manageSnapshots().createBranch("branch",
table.currentSnapshot().snapshotId()).commit();
+
+ // produce the second snapshot
+ List<SimpleRecord> secondBatchRecords =
+ Lists.newArrayList(
+ new SimpleRecord(4, "d"), new SimpleRecord(5, "e"), new
SimpleRecord(6, "f"));
+ Dataset<Row> secondDf = spark.createDataFrame(secondBatchRecords,
SimpleRecord.class);
+ secondDf.select("id",
"data").write().format("iceberg").mode("append").save(tableLocation);
+
+ // verify records in the current snapshot by tag
+ Dataset<Row> currentSnapshotResult =
+ spark.read().format("iceberg").option("branch",
"branch").load(tableLocation);
+ List<SimpleRecord> currentSnapshotRecords =
+
currentSnapshotResult.orderBy("id").as(Encoders.bean(SimpleRecord.class)).collectAsList();
+ List<SimpleRecord> expectedRecords = Lists.newArrayList();
+ expectedRecords.addAll(firstBatchRecords);
+ Assert.assertEquals(
+ "Current snapshot rows should match", expectedRecords,
currentSnapshotRecords);
+ }
+
+ @Test
+ public void testSnapshotSelectionByBranchAndTag() throws IOException {
Review Comment:
Nit: In test names if they are expected to fail I feel that it's nice to
suffix the test name with "fails" so the expectation on behavior can be seen in
the test name. "testSnapshotSelectionByBranchAndTagFails". Non blocking though
--
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]
