This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin5 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 092bbed4787b4db434b5cc06b356ec0a75462523 Author: Dorris Zhang <ruixuan.zh...@kyligence.io> AuthorDate: Mon Oct 31 15:49:16 2022 +0800 KYLIN-5353 add UT --- .../rest/service/ModelServiceBrokenRepairTest.java | 15 ++ .../3580693c-d1fd-7697-8ee8-0474f81c413d.json | 13 ++ .../722b027b-8906-379b-cf4f-ac2055ee528b.json | 2 +- .../8dc4c289-c95d-0402-31e4-b123f9ef553f.json | 2 +- ...n => 3580693c-d1fd-7697-8ee8-0474f81c413d.json} | 8 +- .../722b027b-8906-379b-cf4f-ac2055ee528b.json | 1 + .../8dc4c289-c95d-0402-31e4-b123f9ef553f.json | 2 +- .../3580693c-d1fd-7697-8ee8-0474f81c413d.json} | 172 ++++++++++++--------- .../722b027b-8906-379b-cf4f-ac2055ee528b.json | 2 +- .../8dc4c289-c95d-0402-31e4-b123f9ef553f.json | 2 +- .../metadata/ssb/table/SSB.CUSTOMER.json | 2 +- .../metadata/ssb/table/SSB.LINEORDER.json | 2 +- .../metadata/ssb/table/SSB.SUPPLIER.json | 2 +- .../model_request_broken_aftr_reload.json | 2 +- .../model_request_broken_aftr_reload_2.json | 2 +- ...2.json => model_request_with_timestamp_cc.json} | 172 ++++++++++++--------- 16 files changed, 235 insertions(+), 166 deletions(-) diff --git a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceBrokenRepairTest.java b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceBrokenRepairTest.java index c91bf7a273..103ac90988 100644 --- a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceBrokenRepairTest.java +++ b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceBrokenRepairTest.java @@ -29,6 +29,7 @@ import org.apache.kylin.metadata.favorite.FavoriteRuleManager; import org.apache.kylin.metadata.model.MultiPartitionDesc; import org.apache.kylin.metadata.model.NDataModel; import org.apache.kylin.metadata.model.NDataModelManager; +import org.apache.kylin.metadata.model.UpdateImpact; import org.apache.kylin.metadata.recommendation.candidate.JdbcRawRecStore; import org.apache.kylin.rest.config.initialize.ModelBrokenListener; import org.apache.kylin.rest.request.ModelRequest; @@ -168,4 +169,18 @@ public class ModelServiceBrokenRepairTest extends SourceTestCase { Assert.assertEquals("LINEORDER.LO_ORDERDATE", repairedDataModel.getMultiPartitionDesc().getColumns().getFirst()); } + + @Test + public void testSaveModelWithTimestampCC() throws IOException { + String modelId = "3580693c-d1fd-7697-8ee8-0474f81c413d"; + NDataModelManager modelManager = NDataModelManager.getInstance(getTestConfig(), PROJECT_NAME); + Assert.assertNotNull(modelManager.getDataModelDesc(modelId)); + NDataModel dataModel = modelManager.getDataModelDesc(modelId); + ModelRequest modelRequest = JsonUtil.readValue(new File( + "src/test/resources/ut_meta/broken_repair_test/model_request/model_request_with_timestamp_cc.json"), + ModelRequest.class); + modelRequest.setProject(PROJECT_NAME); + UpdateImpact updateImpact = semanticService.updateModelColumns(dataModel, modelRequest); + Assert.assertEquals(0, updateImpact.getRemovedOrUpdatedCCs().size()); + } } diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/3580693c-d1fd-7697-8ee8-0474f81c413d.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/3580693c-d1fd-7697-8ee8-0474f81c413d.json new file mode 100644 index 0000000000..1eb6d06585 --- /dev/null +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/3580693c-d1fd-7697-8ee8-0474f81c413d.json @@ -0,0 +1,13 @@ +{ + "uuid" : "3580693c-d1fd-7697-8ee8-0474f81c413d", + "last_modified" : 0, + "create_time" : 1667186632737, + "version" : "4.0.0.0", + "status" : "OFFLINE", + "last_status" : null, + "cost" : 50, + "query_hit_count" : 0, + "last_query_time" : 0, + "layout_query_hit_count" : { }, + "segments" : [ ] +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/722b027b-8906-379b-cf4f-ac2055ee528b.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/722b027b-8906-379b-cf4f-ac2055ee528b.json index cb1b91ff90..2ebf687089 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/722b027b-8906-379b-cf4f-ac2055ee528b.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/722b027b-8906-379b-cf4f-ac2055ee528b.json @@ -10,4 +10,4 @@ "last_query_time" : 0, "layout_query_hit_count" : { }, "segments" : [ ] -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/8dc4c289-c95d-0402-31e4-b123f9ef553f.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/8dc4c289-c95d-0402-31e4-b123f9ef553f.json index f5bd4046a6..f15f29f45a 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/8dc4c289-c95d-0402-31e4-b123f9ef553f.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/dataflow/8dc4c289-c95d-0402-31e4-b123f9ef553f.json @@ -10,4 +10,4 @@ "last_query_time" : 0, "layout_query_hit_count" : { }, "segments" : [ ] -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/8dc4c289-c95d-0402-31e4-b123f9ef553f.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/3580693c-d1fd-7697-8ee8-0474f81c413d.json similarity index 79% copy from src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/8dc4c289-c95d-0402-31e4-b123f9ef553f.json copy to src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/3580693c-d1fd-7697-8ee8-0474f81c413d.json index 587c63dc4c..71e295b00b 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/8dc4c289-c95d-0402-31e4-b123f9ef553f.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/3580693c-d1fd-7697-8ee8-0474f81c413d.json @@ -1,7 +1,7 @@ { - "uuid" : "8dc4c289-c95d-0402-31e4-b123f9ef553f", - "last_modified" : 1658197554559, - "create_time" : 1658197424087, + "uuid" : "3580693c-d1fd-7697-8ee8-0474f81c413d", + "last_modified" : 1667186632626, + "create_time" : 1667186632626, "version" : "4.0.0.0", "description" : null, "rule_based_index" : null, @@ -18,4 +18,4 @@ "layout_bucket_num" : { }, "approved_additional_recs" : 0, "approved_removal_recs" : 0 -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/722b027b-8906-379b-cf4f-ac2055ee528b.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/722b027b-8906-379b-cf4f-ac2055ee528b.json index 701d9cfa95..79896e6863 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/722b027b-8906-379b-cf4f-ac2055ee528b.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/722b027b-8906-379b-cf4f-ac2055ee528b.json @@ -19,3 +19,4 @@ "approved_additional_recs" : 0, "approved_removal_recs" : 0 } + diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/8dc4c289-c95d-0402-31e4-b123f9ef553f.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/8dc4c289-c95d-0402-31e4-b123f9ef553f.json index 587c63dc4c..1b7e93786d 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/8dc4c289-c95d-0402-31e4-b123f9ef553f.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/index_plan/8dc4c289-c95d-0402-31e4-b123f9ef553f.json @@ -18,4 +18,4 @@ "layout_bucket_num" : { }, "approved_additional_recs" : 0, "approved_removal_recs" : 0 -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/3580693c-d1fd-7697-8ee8-0474f81c413d.json similarity index 61% copy from src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json copy to src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/3580693c-d1fd-7697-8ee8-0474f81c413d.json index bd499a2a65..ed870ed64e 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/3580693c-d1fd-7697-8ee8-0474f81c413d.json @@ -1,13 +1,13 @@ { - "uuid" : "8dc4c289-c95d-0402-31e4-b123f9ef553f", - "last_modified" : 1658197505312, - "create_time" : 1658197424008, + "uuid" : "3580693c-d1fd-7697-8ee8-0474f81c413d", + "last_modified" : 1667186632623, + "create_time" : 1667186632149, "version" : "4.0.0.0", - "alias" : "model_broken_aftr_reload_2", + "alias" : "model1", "owner" : "ADMIN", "config_last_modifier" : null, "config_last_modified" : 0, - "description" : "", + "description" : null, "fact_table" : "SSB.LINEORDER", "fact_table_alias" : null, "management_type" : "MODEL_BASED", @@ -28,7 +28,7 @@ } ], "filter_condition" : "", "partition_desc" : { - "partition_date_column" : "LINEORDER.LO_COMMITDATE", + "partition_date_column" : "LINEORDER.LO_ORDERDATE", "partition_date_start" : 0, "partition_date_format" : "yyyy-MM-dd", "partition_type" : "APPEND", @@ -43,113 +43,130 @@ "create_empty_segment_enabled" : false }, "data_check_desc" : null, - "semantic_version" : 1, + "semantic_version" : 0, "storage_type" : 0, "model_type" : "BATCH", "all_named_columns" : [ { "id" : 0, - "name" : "LO_PARTKEY", - "column" : "LINEORDER.LO_PARTKEY" - }, { - "id" : 1, "name" : "LO_ORDERKEY", "column" : "LINEORDER.LO_ORDERKEY", "status" : "DIMENSION" + }, { + "id" : 1, + "name" : "LO_PARTKEY", + "column" : "LINEORDER.LO_PARTKEY", + "status" : "DIMENSION" }, { "id" : 2, - "name" : "LO_ORDERDATE_TEST", - "column" : "LINEORDER.LO_ORDERDATE_TEST", - "status" : "TOMB" + "name" : "LO_DISCOUNT", + "column" : "LINEORDER.LO_DISCOUNT", + "status" : "DIMENSION" }, { "id" : 3, - "name" : "LO_SHIPPRIOTITY", - "column" : "LINEORDER.LO_SHIPPRIOTITY" + "name" : "LO_SUPPLYCOST", + "column" : "LINEORDER.LO_SUPPLYCOST", + "status" : "DIMENSION" }, { "id" : 4, - "name" : "LO_ORDERPRIOTITY", - "column" : "LINEORDER.LO_ORDERPRIOTITY" + "name" : "LO_COMMITDATE", + "column" : "LINEORDER.LO_COMMITDATE", + "status" : "DIMENSION" }, { "id" : 5, - "name" : "LO_QUANTITY", - "column" : "LINEORDER.LO_QUANTITY" + "name" : "LO_EXTENDEDPRICE", + "column" : "LINEORDER.LO_EXTENDEDPRICE", + "status" : "DIMENSION" }, { "id" : 6, - "name" : "LO_COMMITDATE", - "column" : "LINEORDER.LO_COMMITDATE" + "name" : "LO_TAX", + "column" : "LINEORDER.LO_TAX", + "status" : "DIMENSION" }, { "id" : 7, - "name" : "LO_SHIPMODE", - "column" : "LINEORDER.LO_SHIPMODE" + "name" : "LO_SUPPKEY", + "column" : "LINEORDER.LO_SUPPKEY", + "status" : "DIMENSION" }, { "id" : 8, "name" : "LO_ORDTOTALPRICE", - "column" : "LINEORDER.LO_ORDTOTALPRICE" + "column" : "LINEORDER.LO_ORDTOTALPRICE", + "status" : "DIMENSION" }, { "id" : 9, - "name" : "LO_TAX", - "column" : "LINEORDER.LO_TAX" + "name" : "LO_REVENUE", + "column" : "LINEORDER.LO_REVENUE", + "status" : "DIMENSION" }, { "id" : 10, - "name" : "LO_LINENUMBER", - "column" : "LINEORDER.LO_LINENUMBER", + "name" : "LO_ORDERDATE", + "column" : "LINEORDER.LO_ORDERDATE", "status" : "DIMENSION" }, { "id" : 11, - "name" : "LO_CUSTKEY_TEST", - "column" : "LINEORDER.LO_CUSTKEY_TEST", - "status" : "TOMB" + "name" : "LO_ORDERPRIOTITY", + "column" : "LINEORDER.LO_ORDERPRIOTITY", + "status" : "DIMENSION" }, { "id" : 12, - "name" : "LO_EXTENDEDPRICE", - "column" : "LINEORDER.LO_EXTENDEDPRICE" + "name" : "LO_SHIPPRIOTITY", + "column" : "LINEORDER.LO_SHIPPRIOTITY", + "status" : "DIMENSION" }, { "id" : 13, - "name" : "LO_DISCOUNT", - "column" : "LINEORDER.LO_DISCOUNT" + "name" : "LO_QUANTITY", + "column" : "LINEORDER.LO_QUANTITY", + "status" : "DIMENSION" }, { "id" : 14, - "name" : "LO_REVENUE", - "column" : "LINEORDER.LO_REVENUE" + "name" : "LO_SHIPMODE", + "column" : "LINEORDER.LO_SHIPMODE", + "status" : "DIMENSION" }, { "id" : 15, - "name" : "LO_SUPPLYCOST", - "column" : "LINEORDER.LO_SUPPLYCOST" + "name" : "LO_LINENUMBER", + "column" : "LINEORDER.LO_LINENUMBER", + "status" : "DIMENSION" }, { "id" : 16, - "name" : "LO_SUPPKEY", - "column" : "LINEORDER.LO_SUPPKEY" + "name" : "LO_CUSTKEY", + "column" : "LINEORDER.LO_CUSTKEY", + "status" : "DIMENSION" }, { "id" : 17, - "name" : "C_PHONE", - "column" : "CUSTOMER.C_PHONE" + "name" : "C_ADDRESS", + "column" : "CUSTOMER.C_ADDRESS" }, { "id" : 18, - "name" : "C_CUSTKEY_TEST", - "column" : "CUSTOMER.C_CUSTKEY_TEST" - }, { - "id" : 19, "name" : "C_NATION", "column" : "CUSTOMER.C_NATION" }, { - "id" : 20, + "id" : 19, "name" : "C_CITY", "column" : "CUSTOMER.C_CITY" + }, { + "id" : 20, + "name" : "C_PHONE", + "column" : "CUSTOMER.C_PHONE" }, { "id" : 21, - "name" : "C_MKTSEGMENT", - "column" : "CUSTOMER.C_MKTSEGMENT" + "name" : "C_REGION", + "column" : "CUSTOMER.C_REGION" }, { "id" : 22, - "name" : "C_ADDRESS", - "column" : "CUSTOMER.C_ADDRESS" - }, { - "id" : 23, "name" : "C_NAME", "column" : "CUSTOMER.C_NAME" + }, { + "id" : 23, + "name" : "C_MKTSEGMENT", + "column" : "CUSTOMER.C_MKTSEGMENT" }, { "id" : 24, - "name" : "C_REGION", - "column" : "CUSTOMER.C_REGION" + "name" : "C_CUSTKEY", + "column" : "CUSTOMER.C_CUSTKEY" + }, { + "id" : 25, + "name" : "CC111", + "column" : "LINEORDER.CC111" } ], "all_measures" : [ { "name" : "COUNT_ALL", @@ -168,31 +185,34 @@ "internal_ids" : [ ] } ], "recommendations_count" : 0, - "computed_columns" : [ ], + "computed_columns" : [ { + "tableIdentity" : "SSB.LINEORDER", + "tableAlias" : "LINEORDER", + "columnName" : "CC111", + "expression" : "timestampadd(day, 1, LINEORDER.LO_ORDERDATE)", + "innerExpression" : "TIMESTAMPADD('day', 1, `LINEORDER`.`LO_ORDERDATE`)", + "datatype" : "DATE", + "comment" : null, + "rec_uuid" : null + } ], "canvas" : { "coordinate" : { - "LINEORDER" : { - "x" : 477.77777777777777, - "y" : 7.5, - "width" : 220.0, - "height" : 200.0 - }, "CUSTOMER" : { - "x" : 322.22222222222223, - "y" : 233.05555555555557, - "width" : 220.0, - "height" : 200.0 + "x" : 685.2777777777778, + "y" : 220.27777777777783, + "width" : 200.0, + "height" : 230.0 + }, + "LINEORDER" : { + "x" : 373.0555555555556, + "y" : 83.61111111111111, + "width" : 200.0, + "height" : 230.0 } }, "zoom" : 9.0 }, - "broken_reason" : "SCHEMA", - "handled_after_broken" : true, - "multi_partition_desc" : { - "columns" : [ "LINEORDER.LO_ORDERDATE" ], - "partitions" : [ ], - "max_partition_id" : -1 - }, + "multi_partition_desc" : null, "multi_partition_key_mapping" : null, "fusion_id" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/722b027b-8906-379b-cf4f-ac2055ee528b.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/722b027b-8906-379b-cf4f-ac2055ee528b.json index 5386211ef7..eb52a57689 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/722b027b-8906-379b-cf4f-ac2055ee528b.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/722b027b-8906-379b-cf4f-ac2055ee528b.json @@ -457,4 +457,4 @@ "multi_partition_desc" : null, "multi_partition_key_mapping" : null, "fusion_id" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/8dc4c289-c95d-0402-31e4-b123f9ef553f.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/8dc4c289-c95d-0402-31e4-b123f9ef553f.json index 9499eba6e4..b62ef430d3 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/8dc4c289-c95d-0402-31e4-b123f9ef553f.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/model_desc/8dc4c289-c95d-0402-31e4-b123f9ef553f.json @@ -195,4 +195,4 @@ }, "multi_partition_key_mapping" : null, "fusion_id" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.CUSTOMER.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.CUSTOMER.json index 793af290b2..823242f0bb 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.CUSTOMER.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.CUSTOMER.json @@ -65,4 +65,4 @@ "transactional" : false, "rangePartition" : false, "partition_desc" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.LINEORDER.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.LINEORDER.json index e6ec0011bc..291be55354 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.LINEORDER.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.LINEORDER.json @@ -110,4 +110,4 @@ "transactional" : false, "rangePartition" : false, "partition_desc" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.SUPPLIER.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.SUPPLIER.json index 4e73c1b25e..6b195ea133 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.SUPPLIER.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/metadata/ssb/table/SSB.SUPPLIER.json @@ -60,4 +60,4 @@ "transactional" : false, "rangePartition" : false, "partition_desc" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload.json index 5143cf2297..c65de529e9 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload.json @@ -457,4 +457,4 @@ "multi_partition_desc" : null, "multi_partition_key_mapping" : null, "fusion_id" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json index bd499a2a65..b3e6f6832f 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json @@ -195,4 +195,4 @@ }, "multi_partition_key_mapping" : null, "fusion_id" : null -} \ No newline at end of file +} diff --git a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_with_timestamp_cc.json similarity index 61% copy from src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json copy to src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_with_timestamp_cc.json index bd499a2a65..ed870ed64e 100644 --- a/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_broken_aftr_reload_2.json +++ b/src/modeling-service/src/test/resources/ut_meta/broken_repair_test/model_request/model_request_with_timestamp_cc.json @@ -1,13 +1,13 @@ { - "uuid" : "8dc4c289-c95d-0402-31e4-b123f9ef553f", - "last_modified" : 1658197505312, - "create_time" : 1658197424008, + "uuid" : "3580693c-d1fd-7697-8ee8-0474f81c413d", + "last_modified" : 1667186632623, + "create_time" : 1667186632149, "version" : "4.0.0.0", - "alias" : "model_broken_aftr_reload_2", + "alias" : "model1", "owner" : "ADMIN", "config_last_modifier" : null, "config_last_modified" : 0, - "description" : "", + "description" : null, "fact_table" : "SSB.LINEORDER", "fact_table_alias" : null, "management_type" : "MODEL_BASED", @@ -28,7 +28,7 @@ } ], "filter_condition" : "", "partition_desc" : { - "partition_date_column" : "LINEORDER.LO_COMMITDATE", + "partition_date_column" : "LINEORDER.LO_ORDERDATE", "partition_date_start" : 0, "partition_date_format" : "yyyy-MM-dd", "partition_type" : "APPEND", @@ -43,113 +43,130 @@ "create_empty_segment_enabled" : false }, "data_check_desc" : null, - "semantic_version" : 1, + "semantic_version" : 0, "storage_type" : 0, "model_type" : "BATCH", "all_named_columns" : [ { "id" : 0, - "name" : "LO_PARTKEY", - "column" : "LINEORDER.LO_PARTKEY" - }, { - "id" : 1, "name" : "LO_ORDERKEY", "column" : "LINEORDER.LO_ORDERKEY", "status" : "DIMENSION" + }, { + "id" : 1, + "name" : "LO_PARTKEY", + "column" : "LINEORDER.LO_PARTKEY", + "status" : "DIMENSION" }, { "id" : 2, - "name" : "LO_ORDERDATE_TEST", - "column" : "LINEORDER.LO_ORDERDATE_TEST", - "status" : "TOMB" + "name" : "LO_DISCOUNT", + "column" : "LINEORDER.LO_DISCOUNT", + "status" : "DIMENSION" }, { "id" : 3, - "name" : "LO_SHIPPRIOTITY", - "column" : "LINEORDER.LO_SHIPPRIOTITY" + "name" : "LO_SUPPLYCOST", + "column" : "LINEORDER.LO_SUPPLYCOST", + "status" : "DIMENSION" }, { "id" : 4, - "name" : "LO_ORDERPRIOTITY", - "column" : "LINEORDER.LO_ORDERPRIOTITY" + "name" : "LO_COMMITDATE", + "column" : "LINEORDER.LO_COMMITDATE", + "status" : "DIMENSION" }, { "id" : 5, - "name" : "LO_QUANTITY", - "column" : "LINEORDER.LO_QUANTITY" + "name" : "LO_EXTENDEDPRICE", + "column" : "LINEORDER.LO_EXTENDEDPRICE", + "status" : "DIMENSION" }, { "id" : 6, - "name" : "LO_COMMITDATE", - "column" : "LINEORDER.LO_COMMITDATE" + "name" : "LO_TAX", + "column" : "LINEORDER.LO_TAX", + "status" : "DIMENSION" }, { "id" : 7, - "name" : "LO_SHIPMODE", - "column" : "LINEORDER.LO_SHIPMODE" + "name" : "LO_SUPPKEY", + "column" : "LINEORDER.LO_SUPPKEY", + "status" : "DIMENSION" }, { "id" : 8, "name" : "LO_ORDTOTALPRICE", - "column" : "LINEORDER.LO_ORDTOTALPRICE" + "column" : "LINEORDER.LO_ORDTOTALPRICE", + "status" : "DIMENSION" }, { "id" : 9, - "name" : "LO_TAX", - "column" : "LINEORDER.LO_TAX" + "name" : "LO_REVENUE", + "column" : "LINEORDER.LO_REVENUE", + "status" : "DIMENSION" }, { "id" : 10, - "name" : "LO_LINENUMBER", - "column" : "LINEORDER.LO_LINENUMBER", + "name" : "LO_ORDERDATE", + "column" : "LINEORDER.LO_ORDERDATE", "status" : "DIMENSION" }, { "id" : 11, - "name" : "LO_CUSTKEY_TEST", - "column" : "LINEORDER.LO_CUSTKEY_TEST", - "status" : "TOMB" + "name" : "LO_ORDERPRIOTITY", + "column" : "LINEORDER.LO_ORDERPRIOTITY", + "status" : "DIMENSION" }, { "id" : 12, - "name" : "LO_EXTENDEDPRICE", - "column" : "LINEORDER.LO_EXTENDEDPRICE" + "name" : "LO_SHIPPRIOTITY", + "column" : "LINEORDER.LO_SHIPPRIOTITY", + "status" : "DIMENSION" }, { "id" : 13, - "name" : "LO_DISCOUNT", - "column" : "LINEORDER.LO_DISCOUNT" + "name" : "LO_QUANTITY", + "column" : "LINEORDER.LO_QUANTITY", + "status" : "DIMENSION" }, { "id" : 14, - "name" : "LO_REVENUE", - "column" : "LINEORDER.LO_REVENUE" + "name" : "LO_SHIPMODE", + "column" : "LINEORDER.LO_SHIPMODE", + "status" : "DIMENSION" }, { "id" : 15, - "name" : "LO_SUPPLYCOST", - "column" : "LINEORDER.LO_SUPPLYCOST" + "name" : "LO_LINENUMBER", + "column" : "LINEORDER.LO_LINENUMBER", + "status" : "DIMENSION" }, { "id" : 16, - "name" : "LO_SUPPKEY", - "column" : "LINEORDER.LO_SUPPKEY" + "name" : "LO_CUSTKEY", + "column" : "LINEORDER.LO_CUSTKEY", + "status" : "DIMENSION" }, { "id" : 17, - "name" : "C_PHONE", - "column" : "CUSTOMER.C_PHONE" + "name" : "C_ADDRESS", + "column" : "CUSTOMER.C_ADDRESS" }, { "id" : 18, - "name" : "C_CUSTKEY_TEST", - "column" : "CUSTOMER.C_CUSTKEY_TEST" - }, { - "id" : 19, "name" : "C_NATION", "column" : "CUSTOMER.C_NATION" }, { - "id" : 20, + "id" : 19, "name" : "C_CITY", "column" : "CUSTOMER.C_CITY" + }, { + "id" : 20, + "name" : "C_PHONE", + "column" : "CUSTOMER.C_PHONE" }, { "id" : 21, - "name" : "C_MKTSEGMENT", - "column" : "CUSTOMER.C_MKTSEGMENT" + "name" : "C_REGION", + "column" : "CUSTOMER.C_REGION" }, { "id" : 22, - "name" : "C_ADDRESS", - "column" : "CUSTOMER.C_ADDRESS" - }, { - "id" : 23, "name" : "C_NAME", "column" : "CUSTOMER.C_NAME" + }, { + "id" : 23, + "name" : "C_MKTSEGMENT", + "column" : "CUSTOMER.C_MKTSEGMENT" }, { "id" : 24, - "name" : "C_REGION", - "column" : "CUSTOMER.C_REGION" + "name" : "C_CUSTKEY", + "column" : "CUSTOMER.C_CUSTKEY" + }, { + "id" : 25, + "name" : "CC111", + "column" : "LINEORDER.CC111" } ], "all_measures" : [ { "name" : "COUNT_ALL", @@ -168,31 +185,34 @@ "internal_ids" : [ ] } ], "recommendations_count" : 0, - "computed_columns" : [ ], + "computed_columns" : [ { + "tableIdentity" : "SSB.LINEORDER", + "tableAlias" : "LINEORDER", + "columnName" : "CC111", + "expression" : "timestampadd(day, 1, LINEORDER.LO_ORDERDATE)", + "innerExpression" : "TIMESTAMPADD('day', 1, `LINEORDER`.`LO_ORDERDATE`)", + "datatype" : "DATE", + "comment" : null, + "rec_uuid" : null + } ], "canvas" : { "coordinate" : { - "LINEORDER" : { - "x" : 477.77777777777777, - "y" : 7.5, - "width" : 220.0, - "height" : 200.0 - }, "CUSTOMER" : { - "x" : 322.22222222222223, - "y" : 233.05555555555557, - "width" : 220.0, - "height" : 200.0 + "x" : 685.2777777777778, + "y" : 220.27777777777783, + "width" : 200.0, + "height" : 230.0 + }, + "LINEORDER" : { + "x" : 373.0555555555556, + "y" : 83.61111111111111, + "width" : 200.0, + "height" : 230.0 } }, "zoom" : 9.0 }, - "broken_reason" : "SCHEMA", - "handled_after_broken" : true, - "multi_partition_desc" : { - "columns" : [ "LINEORDER.LO_ORDERDATE" ], - "partitions" : [ ], - "max_partition_id" : -1 - }, + "multi_partition_desc" : null, "multi_partition_key_mapping" : null, "fusion_id" : null -} \ No newline at end of file +}