-
Notifications
You must be signed in to change notification settings - Fork 53
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
Refactor persistence strategy for dlo generation #292
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
.../test/java/com/linkedin/openhouse/jobs/spark/DataLayoutStrategyGeneratorSparkAppTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package com.linkedin.openhouse.jobs.spark; | ||
|
|
||
| import com.linkedin.openhouse.datalayout.persistence.StrategiesDaoTableProps; | ||
| import com.linkedin.openhouse.datalayout.strategy.DataLayoutStrategy; | ||
| import com.linkedin.openhouse.tablestest.OpenHouseSparkITest; | ||
| import java.util.List; | ||
| import org.apache.spark.sql.AnalysisException; | ||
| import org.apache.spark.sql.SparkSession; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class DataLayoutStrategyGeneratorSparkAppTest extends OpenHouseSparkITest { | ||
jiang95-dev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| @Test | ||
| public void testPartitionedTable() throws Exception { | ||
| try (SparkSession spark = getSparkSession()) { | ||
| // create table | ||
| String fqtn = "dlo_partitioned.test_table"; | ||
| String outputFqtn = "dlo_partitioned.dlo_strategies"; | ||
| String partitionLevelOutputFqtn = "dlo_partitioned.dlo_partition_strategies"; | ||
| spark.sql( | ||
| String.format( | ||
| "create table openhouse.%s (id int, name string) partitioned by (id)", fqtn)); | ||
| spark.sql(String.format("insert into openhouse.%s values (1, 'a'), (2, 'b')", fqtn)); | ||
| // run app | ||
| Operations ops = Operations.withCatalog(spark, null); | ||
| DataLayoutStrategyGeneratorSparkApp app = | ||
| new DataLayoutStrategyGeneratorSparkApp( | ||
| "test-job-id", null, fqtn, outputFqtn, partitionLevelOutputFqtn); | ||
| app.runInner(ops); | ||
| // test | ||
| Assertions.assertEquals(1, spark.sql(String.format("select * from %s", outputFqtn)).count()); | ||
| Assertions.assertEquals( | ||
| 2, spark.sql(String.format("select * from %s", partitionLevelOutputFqtn)).count()); | ||
| Assertions.assertTrue( | ||
| spark | ||
| .sql(String.format("select * from %s", outputFqtn)) | ||
| .select("isPartitioned") | ||
| .first() | ||
| .getBoolean(0)); | ||
| Assertions.assertNotNull(ops.getTable(fqtn).properties().get("write.data-layout.strategies")); | ||
| List<DataLayoutStrategy> strategies = | ||
| StrategiesDaoTableProps.deserializeList( | ||
| ops.getTable(fqtn).properties().get("write.data-layout.partition-strategies")); | ||
| Assertions.assertEquals(2, strategies.size()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testUnpartitionedTable() throws Exception { | ||
| try (SparkSession spark = getSparkSession()) { | ||
| // create table | ||
| String fqtn = "dlo_unpartitioned.test_table"; | ||
| String outputFqtn = "dlo_unpartitioned.dlo_strategies"; | ||
| String partitionLevelOutputFqtn = "dlo_unpartitioned.dlo_partition_strategies"; | ||
| spark.sql(String.format("create table openhouse.%s (id int, name string)", fqtn)); | ||
| spark.sql(String.format("insert into openhouse.%s values (1, 'a'), (2, 'b')", fqtn)); | ||
| // run app | ||
| Operations ops = Operations.withCatalog(spark, null); | ||
| DataLayoutStrategyGeneratorSparkApp app = | ||
| new DataLayoutStrategyGeneratorSparkApp( | ||
| "test-job-id", null, fqtn, outputFqtn, partitionLevelOutputFqtn); | ||
| app.runInner(ops); | ||
| // test | ||
| Assertions.assertEquals(1, spark.sql(String.format("select * from %s", outputFqtn)).count()); | ||
| Assertions.assertThrows( | ||
| AnalysisException.class, | ||
| () -> spark.sql(String.format("select * from %s", partitionLevelOutputFqtn))); | ||
| Assertions.assertFalse( | ||
| spark | ||
| .sql(String.format("select * from %s", outputFqtn)) | ||
| .select("isPartitioned") | ||
| .first() | ||
| .getBoolean(0)); | ||
| Assertions.assertNotNull(ops.getTable(fqtn).properties().get("write.data-layout.strategies")); | ||
| Assertions.assertNull( | ||
| ops.getTable(fqtn).properties().get("write.data-layout.partition-strategies")); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you preserve this logging line, it's helpful to see the values for an app run