Skip to content

Spark: Add tests for select using tag and branch identifier #9286

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.

Sign up for GitHub

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

Merged
nastra merged 2 commits into from
Dec 19, 2023
Merged

Spark: Add tests for select using tag and branch identifier #9286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
271d712
Spark: Add tests for select using tag and branch identifier
wypoon Dec 13, 2023
b435f2a
Amend some comments.
wypoon Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/sql/TestSelect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,23 +235,30 @@ public void testVersionAsOf() {
}

@Test
public void testTagReferenceAsOf() {
public void testTagReference() {
Table table = validationCatalog.loadTable(tableIdent);
long snapshotId = table.currentSnapshot().snapshotId();
table.manageSnapshots().createTag("test_tag", snapshotId).commit();

// create a second snapshot, read the table at the snapshot
List<Object[]> expected = sql("SELECT * FROM %s", tableName);

// create a second snapshot, read the table at the tag
sql("INSERT INTO %s VALUES (4, 'd', 4.0), (5, 'e', 5.0)", tableName);
List<Object[]> actual1 = sql("SELECT * FROM %s VERSION AS OF 'test_tag'", tableName);
assertEquals("Snapshot at specific tag reference name", expected, actual1);

// read the table at the snapshot
// read the table at the tag
// HIVE time travel syntax
List<Object[]> actual2 = sql("SELECT * FROM %s FOR SYSTEM_VERSION AS OF 'test_tag'", tableName);
assertEquals("Snapshot at specific tag reference name", expected, actual2);

// read the table using DataFrameReader option: branch
// Spark session catalog does not support extended table names
if (!"spark_catalog".equals(catalogName)) {
// read the table using the "tag_" prefix in the table name
List<Object[]> actual3 = sql("SELECT * FROM %s.tag_test_tag", tableName);
assertEquals("Snapshot at specific tag reference name, prefix", expected, actual3);
}

// read the table using DataFrameReader option: tag
Dataset<Row> df =
spark.read().format("iceberg").option(SparkReadOptions.TAG, "test_tag").load(tableName);
List<Object[]> fromDF = rowsToJava(df.collectAsList());
Expand Down Expand Up @@ -284,23 +291,30 @@ public void testUseSnapshotIdForTagReferenceAsOf() {
}

@Test
public void testBranchReferenceAsOf() {
public void testBranchReference() {
Table table = validationCatalog.loadTable(tableIdent);
long snapshotId = table.currentSnapshot().snapshotId();
table.manageSnapshots().createBranch("test_branch", snapshotId).commit();

// create a second snapshot, read the table at the snapshot
List<Object[]> expected = sql("SELECT * FROM %s", tableName);

// create a second snapshot, read the table at the branch
sql("INSERT INTO %s VALUES (4, 'd', 4.0), (5, 'e', 5.0)", tableName);
List<Object[]> actual1 = sql("SELECT * FROM %s VERSION AS OF 'test_branch'", tableName);
assertEquals("Snapshot at specific branch reference name", expected, actual1);

// read the table at the snapshot
// read the table at the branch
// HIVE time travel syntax
List<Object[]> actual2 =
sql("SELECT * FROM %s FOR SYSTEM_VERSION AS OF 'test_branch'", tableName);
assertEquals("Snapshot at specific branch reference name", expected, actual2);

// Spark session catalog does not support extended table names
if (!"spark_catalog".equals(catalogName)) {
// read the table using the "branch_" prefix in the table name
List<Object[]> actual3 = sql("SELECT * FROM %s.branch_test_branch", tableName);
assertEquals("Snapshot at specific branch reference name, prefix", expected, actual3);
}

// read the table using DataFrameReader option: branch
Dataset<Row> df =
spark
Expand Down
32 changes: 23 additions & 9 deletions spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/sql/TestSelect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,23 +234,30 @@ public void testVersionAsOf() {
}

@Test
public void testTagReferenceAsOf() {
public void testTagReference() {
Table table = validationCatalog.loadTable(tableIdent);
long snapshotId = table.currentSnapshot().snapshotId();
table.manageSnapshots().createTag("test_tag", snapshotId).commit();

// create a second snapshot, read the table at the snapshot
List<Object[]> expected = sql("SELECT * FROM %s", tableName);

// create a second snapshot, read the table at the tag
sql("INSERT INTO %s VALUES (4, 'd', 4.0), (5, 'e', 5.0)", tableName);
List<Object[]> actual1 = sql("SELECT * FROM %s VERSION AS OF 'test_tag'", tableName);
assertEquals("Snapshot at specific tag reference name", expected, actual1);

// read the table at the snapshot
// read the table at the tag
// HIVE time travel syntax
List<Object[]> actual2 = sql("SELECT * FROM %s FOR SYSTEM_VERSION AS OF 'test_tag'", tableName);
assertEquals("Snapshot at specific tag reference name", expected, actual2);

// read the table using DataFrameReader option: branch
// Spark session catalog does not support extended table names
if (!"spark_catalog".equals(catalogName)) {
// read the table using the "tag_" prefix in the table name
List<Object[]> actual3 = sql("SELECT * FROM %s.tag_test_tag", tableName);
assertEquals("Snapshot at specific tag reference name, prefix", expected, actual3);
}

// read the table using DataFrameReader option: tag
Dataset<Row> df =
spark.read().format("iceberg").option(SparkReadOptions.TAG, "test_tag").load(tableName);
List<Object[]> fromDF = rowsToJava(df.collectAsList());
Expand Down Expand Up @@ -283,23 +290,30 @@ public void testUseSnapshotIdForTagReferenceAsOf() {
}

@Test
public void testBranchReferenceAsOf() {
public void testBranchReference() {
Table table = validationCatalog.loadTable(tableIdent);
long snapshotId = table.currentSnapshot().snapshotId();
table.manageSnapshots().createBranch("test_branch", snapshotId).commit();

// create a second snapshot, read the table at the snapshot
List<Object[]> expected = sql("SELECT * FROM %s", tableName);

// create a second snapshot, read the table at the branch
sql("INSERT INTO %s VALUES (4, 'd', 4.0), (5, 'e', 5.0)", tableName);
List<Object[]> actual1 = sql("SELECT * FROM %s VERSION AS OF 'test_branch'", tableName);
assertEquals("Snapshot at specific branch reference name", expected, actual1);

// read the table at the snapshot
// read the table at the branch
// HIVE time travel syntax
List<Object[]> actual2 =
sql("SELECT * FROM %s FOR SYSTEM_VERSION AS OF 'test_branch'", tableName);
assertEquals("Snapshot at specific branch reference name", expected, actual2);

// Spark session catalog does not support extended table names
if (!"spark_catalog".equals(catalogName)) {
// read the table using the "branch_" prefix in the table name
List<Object[]> actual3 = sql("SELECT * FROM %s.branch_test_branch", tableName);
assertEquals("Snapshot at specific branch reference name, prefix", expected, actual3);
}

// read the table using DataFrameReader option: branch
Dataset<Row> df =
spark
Expand Down
32 changes: 23 additions & 9 deletions spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestSelect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,23 +234,30 @@ public void testVersionAsOf() {
}

@Test
public void testTagReferenceAsOf() {
public void testTagReference() {
Table table = validationCatalog.loadTable(tableIdent);
long snapshotId = table.currentSnapshot().snapshotId();
table.manageSnapshots().createTag("test_tag", snapshotId).commit();

// create a second snapshot, read the table at the snapshot
List<Object[]> expected = sql("SELECT * FROM %s", tableName);

// create a second snapshot, read the table at the tag
sql("INSERT INTO %s VALUES (4, 'd', 4.0), (5, 'e', 5.0)", tableName);
List<Object[]> actual1 = sql("SELECT * FROM %s VERSION AS OF 'test_tag'", tableName);
assertEquals("Snapshot at specific tag reference name", expected, actual1);

// read the table at the snapshot
// read the table at the tag
// HIVE time travel syntax
List<Object[]> actual2 = sql("SELECT * FROM %s FOR SYSTEM_VERSION AS OF 'test_tag'", tableName);
assertEquals("Snapshot at specific tag reference name", expected, actual2);

// read the table using DataFrameReader option: branch
// Spark session catalog does not support extended table names
if (!"spark_catalog".equals(catalogName)) {
// read the table using the "tag_" prefix in the table name
List<Object[]> actual3 = sql("SELECT * FROM %s.tag_test_tag", tableName);
assertEquals("Snapshot at specific tag reference name, prefix", expected, actual3);
}

// read the table using DataFrameReader option: tag
Dataset<Row> df =
spark.read().format("iceberg").option(SparkReadOptions.TAG, "test_tag").load(tableName);
List<Object[]> fromDF = rowsToJava(df.collectAsList());
Expand Down Expand Up @@ -283,23 +290,30 @@ public void testUseSnapshotIdForTagReferenceAsOf() {
}

@Test
public void testBranchReferenceAsOf() {
public void testBranchReference() {
Table table = validationCatalog.loadTable(tableIdent);
long snapshotId = table.currentSnapshot().snapshotId();
table.manageSnapshots().createBranch("test_branch", snapshotId).commit();

// create a second snapshot, read the table at the snapshot
List<Object[]> expected = sql("SELECT * FROM %s", tableName);

// create a second snapshot, read the table at the branch
sql("INSERT INTO %s VALUES (4, 'd', 4.0), (5, 'e', 5.0)", tableName);
List<Object[]> actual1 = sql("SELECT * FROM %s VERSION AS OF 'test_branch'", tableName);
assertEquals("Snapshot at specific branch reference name", expected, actual1);

// read the table at the snapshot
// read the table at the branch
// HIVE time travel syntax
List<Object[]> actual2 =
sql("SELECT * FROM %s FOR SYSTEM_VERSION AS OF 'test_branch'", tableName);
assertEquals("Snapshot at specific branch reference name", expected, actual2);

// Spark session catalog does not support extended table names
if (!"spark_catalog".equals(catalogName)) {
// read the table using the "branch_" prefix in the table name
List<Object[]> actual3 = sql("SELECT * FROM %s.branch_test_branch", tableName);
assertEquals("Snapshot at specific branch reference name, prefix", expected, actual3);
}

// read the table using DataFrameReader option: branch
Dataset<Row> df =
spark
Expand Down