From c192b532c89dbd25033831e5b99217334860673f Mon Sep 17 00:00:00 2001 From: Richard Tia Date: Wed, 11 Sep 2024 19:10:53 -0700 Subject: [PATCH] fix: add leading zero for sorting filenames --- README.md | 4 ++-- .../{query_1_plan.json => query_01_plan.json} | 0 .../{query_2_plan.json => query_02_plan.json} | 0 .../{query_3_plan.json => query_03_plan.json} | 0 .../{query_4_plan.json => query_04_plan.json} | 0 .../{query_5_plan.json => query_05_plan.json} | 0 .../{query_6_plan.json => query_06_plan.json} | 0 .../{query_7_plan.json => query_07_plan.json} | 0 .../{query_8_plan.json => query_08_plan.json} | 0 .../{query_9_plan.json => query_09_plan.json} | 0 .../integration/queries/tpch_test_cases.py | 18 +++++++++--------- .../tests/integration/test_tpch_plans_valid.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_1_plan.json => query_01_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_2_plan.json => query_02_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_3_plan.json => query_03_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_4_plan.json => query_04_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_5_plan.json => query_05_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_6_plan.json => query_06_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_7_plan.json => query_07_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_8_plan.json => query_08_plan.json} (100%) rename substrait_consumer/tests/integration/queries/tpch_substrait_plans/{query_9_plan.json => query_09_plan.json} (100%) diff --git a/README.md b/README.md index 8e2d84bd..dfecea63 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ TPCH_QUERY_TESTS = ( "test_name": "test_tpch_sql_1", "file_names": ["lineitem.parquet"], "sql_query": get_sql("q1.sql"), - "substrait_query": get_substrait_plan("query_1_plan.json"), + "substrait_query": get_substrait_plan("query_01_plan.json"), }, { "test_name": "test_tpch_sql_2", @@ -116,7 +116,7 @@ TPCH_QUERY_TESTS = ( "region.parquet", ], "sql_query": get_sql("q2.sql"), - "substrait_query": get_substrait_plan("query_2_plan.json"), + "substrait_query": get_substrait_plan("query_02_plan.json"), }, ] ``` diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_1_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_01_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_1_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_01_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_2_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_02_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_2_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_02_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_3_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_03_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_3_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_03_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_4_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_04_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_4_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_04_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_5_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_05_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_5_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_05_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_6_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_06_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_6_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_06_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_7_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_07_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_7_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_07_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_8_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_08_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_8_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_08_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_9_plan.json b/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_09_plan.json similarity index 100% rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_9_plan.json rename to substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_09_plan.json diff --git a/substrait_consumer/tests/integration/queries/tpch_test_cases.py b/substrait_consumer/tests/integration/queries/tpch_test_cases.py index 53092d65..6579054e 100644 --- a/substrait_consumer/tests/integration/queries/tpch_test_cases.py +++ b/substrait_consumer/tests/integration/queries/tpch_test_cases.py @@ -5,7 +5,7 @@ "test_name": "test_tpch_sql_1", "file_names": ["lineitem.parquet"], "sql_query": get_sql("q1.sql"), - "substrait_query": get_substrait_plan("query_1_plan.json"), + "substrait_query": get_substrait_plan("query_01_plan.json"), }, { "test_name": "test_tpch_sql_2", @@ -21,7 +21,7 @@ "region.parquet", ], "sql_query": get_sql("q2.sql"), - "substrait_query": get_substrait_plan("query_2_plan.json"), + "substrait_query": get_substrait_plan("query_02_plan.json"), }, { "test_name": "test_tpch_sql_3", @@ -31,13 +31,13 @@ "orders.parquet", ], "sql_query": get_sql("q3.sql"), - "substrait_query": get_substrait_plan("query_3_plan.json"), + "substrait_query": get_substrait_plan("query_03_plan.json"), }, { "test_name": "test_tpch_sql_4", "file_names": ["orders.parquet", "lineitem.parquet"], "sql_query": get_sql("q4.sql"), - "substrait_query": get_substrait_plan("query_4_plan.json"), + "substrait_query": get_substrait_plan("query_04_plan.json"), }, { "test_name": "test_tpch_sql_5", @@ -50,13 +50,13 @@ "region.parquet", ], "sql_query": get_sql("q5.sql"), - "substrait_query": get_substrait_plan("query_5_plan.json"), + "substrait_query": get_substrait_plan("query_05_plan.json"), }, { "test_name": "test_tpch_sql_6", "file_names": ["lineitem.parquet"], "sql_query": get_sql("q6.sql"), - "substrait_query": get_substrait_plan("query_6_plan.json"), + "substrait_query": get_substrait_plan("query_06_plan.json"), }, { "test_name": "test_tpch_sql_7", @@ -69,7 +69,7 @@ "nation.parquet", ], "sql_query": get_sql("q7.sql"), - "substrait_query": get_substrait_plan("query_7_plan.json"), + "substrait_query": get_substrait_plan("query_07_plan.json"), }, { "test_name": "test_tpch_sql_8", @@ -84,7 +84,7 @@ "region.parquet", ], "sql_query": get_sql("q8.sql"), - "substrait_query": get_substrait_plan("query_8_plan.json"), + "substrait_query": get_substrait_plan("query_08_plan.json"), }, { "test_name": "test_tpch_sql_9", @@ -97,7 +97,7 @@ "nation.parquet", ], "sql_query": get_sql("q9.sql"), - "substrait_query": get_substrait_plan("query_9_plan.json"), + "substrait_query": get_substrait_plan("query_09_plan.json"), }, { "test_name": "test_tpch_sql_10", diff --git a/substrait_consumer/tests/integration/test_tpch_plans_valid.py b/substrait_consumer/tests/integration/test_tpch_plans_valid.py index c8d647f6..f47f3966 100644 --- a/substrait_consumer/tests/integration/test_tpch_plans_valid.py +++ b/substrait_consumer/tests/integration/test_tpch_plans_valid.py @@ -52,7 +52,7 @@ def test_isthmus_substrait_plan_generation( substrait_query = producer.produce_substrait(sql_query) snapshot.snapshot_dir = PLAN_SNAPSHOT_DIR - tpch_num = test_name.split("_")[-1] + tpch_num = test_name.split("_")[-1].zfill(2) snapshot.assert_match(str(substrait_query), f"query_{tpch_num}_plan.json") @custom_parametrization(TPCH_QUERY_TESTS)