This is an automated email from the ASF dual-hosted git repository. caolu pushed a commit to tag kylin-5.0.2 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 6d97343ecb5de97bce8d0698299735588a2b5017 Author: Yinghao Lin <[email protected]> AuthorDate: Fri Mar 28 00:23:21 2025 +0800 kylin 5.0.2 followup fix Fix sample script & data --- build/bin/sample.sh | 11 - build/release/compress.sh | 7 + .../2d07e878-da28-a203-2d2c-185b4c6656f1.json | 14 - build/sample_project/template/SYSTEM/UUID.json | 8 - .../3372c628-f7f4-ac8c-8fd6-8a493d2dd753.json | 6 - .../52e94c45-05e4-a316-d6a1-f361a3cb5340.json | 6 - .../cbc54374-2940-5f75-80e7-4914d842ea71.json | 6 - .../ee09a64b-57dd-3b9a-2d42-469b8b06e43a.json | 6 - .../ffdd7874-6875-41cd-049c-b7041e5fe606.json | 6 - .../eccbdc7e-a229-3297-6a10-1ccb41d66382.json | 15 + .../eccbdc7e-a229-3297-6a10-1ccb41d66382.json} | 46 +-- .../00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json | 9 + .../eccbdc7e-a229-3297-6a10-1ccb41d66382.json} | 301 ++++++++++--------- .../{ => core_meta}/PROJECT/learn_kylin.json | 16 +- .../00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json | 34 +++ .../template/core_meta/SYSTEM/UUID.json | 8 + .../TABLE_INFO/learn_kylin.SSB.CUSTOMER.json | 14 +- .../TABLE_INFO/learn_kylin.SSB.DATES.json | 14 +- .../TABLE_INFO/learn_kylin.SSB.LINEORDER.json | 116 -------- .../TABLE_INFO/learn_kylin.SSB.PART.json | 14 +- .../TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json | 14 +- .../TABLE_INFO/learn_kylin.SSB.SUPPLIER.json | 14 +- .../10d671c8-875d-d2b0-3ed0-16de6da933d9.json | 9 + .../145b7718-df6c-a83f-2cd6-88c03097aa1e.json | 9 + .../20a357ea-595e-9b47-7855-5a0b74f93673.json | 9 + .../25abdb1e-4315-ddbe-a4d2-311e93d7f7b9.json | 9 + .../42a320ee-01c5-7ba3-82b0-ef0989cd2bcb.json | 9 + .../64a36919-b005-b16c-a673-b7fe80e8a1bd.json | 9 + .../68322c9c-8ddd-ab1c-5c1a-208ce9d6479a.json | 9 + .../8bcf58e6-d431-4721-5fda-0cb957b50091.json | 9 + .../b05341cb-7e87-e798-ff61-a0ecdfbd1055.json | 9 + .../b067a959-25ef-79fc-2646-0a60c38f961c.json | 9 + .../b4955606-d1c3-27c8-7568-ce6235eb6a4a.json | 9 + .../c41767da-12b3-39b1-2685-08b9e3722b31.json | 9 + .../d8f4e4f7-762f-335b-e72f-8a72a4d9210b.json | 9 + .../f74096a3-1e60-7702-a9fd-1888dcfcce49.json | 9 + .../fe78f416-12f6-33c5-e6cc-01faf16de176.json | 9 + .../standalone-docker/all-in-one/Dockerfile | 4 +- .../standalone-docker/all-in-one/README.md | 323 +-------------------- .../standalone-docker/all-in-one/build.sh | 12 +- .../standalone-docker/all-in-one/run.sh | 2 +- .../src/components/monitor/batchJobs/locales.js | 25 +- pom.xml | 4 - .../java/org/apache/kylin/common/KylinVersion.java | 12 +- .../src/main/resources/kylin-defaults0.properties | 2 + .../kylin/job/constant/ExecutableConstants.java | 14 +- .../apache/kylin/engine/spark/job/StageEnum.java | 6 +- .../scala/org/apache/spark/sql/KylinSession.scala | 19 -- 48 files changed, 492 insertions(+), 751 deletions(-) diff --git a/build/bin/sample.sh b/build/bin/sample.sh index 78cba57b97..4d287e565a 100644 --- a/build/bin/sample.sh +++ b/build/bin/sample.sh @@ -110,17 +110,6 @@ echo "Sample hive tables are created successfully; Going to create sample projec mkdir -p ${KYLIN_HOME}/sample_project/sample_model/metadata cp -R ${KYLIN_HOME}/sample_project/template/core_meta ${KYLIN_HOME}/sample_project/sample_model/metadata -#### Add version info into model -kylin_version=5.0.0.0 -echo "kylin version is "$kylin_version -sed -i "s/%default_version%/${kylin_version}/g" ${KYLIN_HOME}/sample_project/sample_model/metadata/core_meta/PROJECT/learn_kylin.json -sed -i "s/%default_version%/${kylin_version}/g" ${KYLIN_HOME}/sample_project/sample_model/metadata/core_meta/TABLE_INFO/learn_kylin.SSB.CUSTOMER.json -sed -i "s/%default_version%/${kylin_version}/g" ${KYLIN_HOME}/sample_project/sample_model/metadata/core_meta/TABLE_INFO/learn_kylin.SSB.DATES.json -sed -i "s/%default_version%/${kylin_version}/g" ${KYLIN_HOME}/sample_project/sample_model/metadata/core_meta/TABLE_INFO/learn_kylin.SSB.LINEORDER.json -sed -i "s/%default_version%/${kylin_version}/g" ${KYLIN_HOME}/sample_project/sample_model/metadata/core_meta/TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json -sed -i "s/%default_version%/${kylin_version}/g" ${KYLIN_HOME}/sample_project/sample_model/metadata/core_meta/TABLE_INFO/learn_kylin.SSB.PART.json -sed -i "s/%default_version%/${kylin_version}/g" ${KYLIN_HOME}/sample_project/sample_model/metadata/core_meta/TABLE_INFO/learn_kylin.SSB.SUPPLIER.json - function printImportResult() { error=$1 if [[ $error == 0 ]]; then diff --git a/build/release/compress.sh b/build/release/compress.sh index 5fe084218a..bc590675a7 100755 --- a/build/release/compress.sh +++ b/build/release/compress.sh @@ -102,6 +102,13 @@ if [[ "${WITH_GLUTEN}" = "1" ]]; then cp -rf gluten/jars/spark33/* ${package_name}/lib/gluten/ mv spark/libch.so ${package_name}/server/ cp spark/jars/gluten.jar ${package_name}/lib/ext/ + if [[ "$(uname)" == "Darwin" ]]; then + sed -i '' '22a\ +export LD_PRELOAD=${KYLIN_HOME}/server/libch.so +' ${package_name}/sbin/spark-test.sh + else + sed -i '22aexport LD_PRELOAD=${KYLIN_HOME}/server/libch.so' ${package_name}/sbin/spark-test.sh + fi fi # cp -rf deploy/.keystore ${package_name}/server/ diff --git a/build/sample_project/template/DATAFLOW/2d07e878-da28-a203-2d2c-185b4c6656f1.json b/build/sample_project/template/DATAFLOW/2d07e878-da28-a203-2d2c-185b4c6656f1.json deleted file mode 100644 index 6ebfdb5167..0000000000 --- a/build/sample_project/template/DATAFLOW/2d07e878-da28-a203-2d2c-185b4c6656f1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "uuid" : "d863b37c-e1a9-717f-7df7-74991815b1eb", - "last_modified" : 0, - "create_time" : 1675840561793, - "version" : "4.0.0.0", - "status" : "OFFLINE", - "last_status" : null, - "cost" : 50, - "query_hit_count" : 0, - "last_query_time" : 0, - "layout_query_hit_count" : { }, - "project" : "learn_kylin", - "segment_uuids" : [ ] -} \ No newline at end of file diff --git a/build/sample_project/template/SYSTEM/UUID.json b/build/sample_project/template/SYSTEM/UUID.json deleted file mode 100644 index 327fde3f56..0000000000 --- a/build/sample_project/template/SYSTEM/UUID.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "uuid" : "48f6a2a5-1eb0-479d-9dba-5018da839ccb", - "last_modified" : 0, - "create_time" : 1730714395988, - "version" : "4.0.0.0", - "str" : "48f6a2a5-1eb0-479d-9dba-5018da839ccb", - "name" : "UUID" -} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_MODEL_RELATION/3372c628-f7f4-ac8c-8fd6-8a493d2dd753.json b/build/sample_project/template/TABLE_MODEL_RELATION/3372c628-f7f4-ac8c-8fd6-8a493d2dd753.json deleted file mode 100644 index 23fd71ef96..0000000000 --- a/build/sample_project/template/TABLE_MODEL_RELATION/3372c628-f7f4-ac8c-8fd6-8a493d2dd753.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "table_identity" : "SSB.CUSTOMER", - "model_uuid" : "2d07e878-da28-a203-2d2c-185b4c6656f1", - "project" : "learn_kylin", - "uuid" : "3372c628-f7f4-ac8c-8fd6-8a493d2dd753" -} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_MODEL_RELATION/52e94c45-05e4-a316-d6a1-f361a3cb5340.json b/build/sample_project/template/TABLE_MODEL_RELATION/52e94c45-05e4-a316-d6a1-f361a3cb5340.json deleted file mode 100644 index 7ea47603a7..0000000000 --- a/build/sample_project/template/TABLE_MODEL_RELATION/52e94c45-05e4-a316-d6a1-f361a3cb5340.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "table_identity" : "SSB.P_LINEORDER", - "model_uuid" : "2d07e878-da28-a203-2d2c-185b4c6656f1", - "project" : "learn_kylin", - "uuid" : "52e94c45-05e4-a316-d6a1-f361a3cb5340" -} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_MODEL_RELATION/cbc54374-2940-5f75-80e7-4914d842ea71.json b/build/sample_project/template/TABLE_MODEL_RELATION/cbc54374-2940-5f75-80e7-4914d842ea71.json deleted file mode 100644 index 63c799b626..0000000000 --- a/build/sample_project/template/TABLE_MODEL_RELATION/cbc54374-2940-5f75-80e7-4914d842ea71.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "table_identity" : "SSB.DATES", - "model_uuid" : "2d07e878-da28-a203-2d2c-185b4c6656f1", - "project" : "learn_kylin", - "uuid" : "cbc54374-2940-5f75-80e7-4914d842ea71" -} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_MODEL_RELATION/ee09a64b-57dd-3b9a-2d42-469b8b06e43a.json b/build/sample_project/template/TABLE_MODEL_RELATION/ee09a64b-57dd-3b9a-2d42-469b8b06e43a.json deleted file mode 100644 index 0372ecb2a9..0000000000 --- a/build/sample_project/template/TABLE_MODEL_RELATION/ee09a64b-57dd-3b9a-2d42-469b8b06e43a.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "table_identity" : "SSB.PART", - "model_uuid" : "2d07e878-da28-a203-2d2c-185b4c6656f1", - "project" : "learn_kylin", - "uuid" : "ee09a64b-57dd-3b9a-2d42-469b8b06e43a" -} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_MODEL_RELATION/ffdd7874-6875-41cd-049c-b7041e5fe606.json b/build/sample_project/template/TABLE_MODEL_RELATION/ffdd7874-6875-41cd-049c-b7041e5fe606.json deleted file mode 100644 index 3ca26374ef..0000000000 --- a/build/sample_project/template/TABLE_MODEL_RELATION/ffdd7874-6875-41cd-049c-b7041e5fe606.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "table_identity" : "SSB.SUPPLIER", - "model_uuid" : "2d07e878-da28-a203-2d2c-185b4c6656f1", - "project" : "learn_kylin", - "uuid" : "ffdd7874-6875-41cd-049c-b7041e5fe606" -} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/DATAFLOW/eccbdc7e-a229-3297-6a10-1ccb41d66382.json b/build/sample_project/template/core_meta/DATAFLOW/eccbdc7e-a229-3297-6a10-1ccb41d66382.json new file mode 100644 index 0000000000..24c017d0a7 --- /dev/null +++ b/build/sample_project/template/core_meta/DATAFLOW/eccbdc7e-a229-3297-6a10-1ccb41d66382.json @@ -0,0 +1,15 @@ +{ + "uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382", + "last_modified" : 1743407020522, + "create_time" : 1743407020522, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "status" : "OFFLINE", + "last_status" : null, + "cost" : 50, + "query_hit_count" : 0, + "last_query_time" : 0, + "last_data_refresh_time" : 0, + "layout_query_hit_count" : { }, + "segment_uuids" : [ "00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243" ] +} \ No newline at end of file diff --git a/build/sample_project/template/INDEX_PLAN/2d07e878-da28-a203-2d2c-185b4c6656f1.json b/build/sample_project/template/core_meta/INDEX_PLAN/eccbdc7e-a229-3297-6a10-1ccb41d66382.json similarity index 62% rename from build/sample_project/template/INDEX_PLAN/2d07e878-da28-a203-2d2c-185b4c6656f1.json rename to build/sample_project/template/core_meta/INDEX_PLAN/eccbdc7e-a229-3297-6a10-1ccb41d66382.json index 5ce8d185ab..f91f6dda16 100644 --- a/build/sample_project/template/INDEX_PLAN/2d07e878-da28-a203-2d2c-185b4c6656f1.json +++ b/build/sample_project/template/core_meta/INDEX_PLAN/eccbdc7e-a229-3297-6a10-1ccb41d66382.json @@ -1,42 +1,43 @@ { - "uuid" : "2d07e878-da28-a203-2d2c-185b4c6656f1", - "last_modified" : 1632293938767, - "create_time" : 1632293938765, - "version" : "%default_version%", + "uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382", + "last_modified" : 1743407020521, + "create_time" : 1743407020517, + "version" : "5.0.2.0", + "project" : "learn_kylin", "description" : null, "rule_based_index" : { - "dimensions" : [ 53, 55, 46, 43, 40, 42, 32 ], + "dimensions" : [ 36, 38, 29, 26, 23, 25, 58 ], "measures" : [ 100000 ], "global_dim_cap" : null, "aggregation_groups" : [ { - "includes" : [ 53, 55 ], + "includes" : [ 36, 38 ], "measures" : [ 100000 ], "select_rule" : { "hierarchy_dims" : [ ], - "mandatory_dims" : [ 53 ], + "mandatory_dims" : [ 36 ], "joint_dims" : [ ] }, "index_range" : "EMPTY" }, { - "includes" : [ 46, 43 ], + "includes" : [ 29, 26 ], "measures" : [ 100000 ], "select_rule" : { "hierarchy_dims" : [ ], - "mandatory_dims" : [ 46 ], + "mandatory_dims" : [ 29 ], "joint_dims" : [ ] }, "index_range" : "EMPTY" }, { - "includes" : [ 40, 42 ], + "includes" : [ 23, 25 ], "measures" : [ 100000 ], "select_rule" : { "hierarchy_dims" : [ ], - "mandatory_dims" : [ 40 ], + "mandatory_dims" : [ 23 ], "joint_dims" : [ ] }, "index_range" : "EMPTY" }, { - "includes" : [ 32 ], + "includes" : [ 58 ], "measures" : [ 100000 ], "select_rule" : { "hierarchy_dims" : [ ], @@ -48,25 +49,27 @@ "layout_id_mapping" : [ 10001, 20001, 30001, 40001, 50001, 60001, 70001, 80001 ], "parent_forward" : 3, "index_start_id" : 10000, - "last_modify_time" : 1632294041099, + "last_modify_time" : 1743407130676, "layout_black_list" : [ ], + "layout_cost_based_pruned_list" : null, "scheduler_version" : 2, - "index_update_enabled" : true + "index_update_enabled" : true, + "base_layout_enabled" : true }, "indexes" : [ { "id" : 0, - "dimensions" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 32, 34, 40, 42, 43, 46, 53, 55 ], + "dimensions" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 ], "measures" : [ 100000 ], "layouts" : [ { "id" : 1, "name" : null, "owner" : null, - "col_order" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 32, 34, 40, 42, 43, 46, 53, 55, 100000 ], + "col_order" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 100000 ], "shard_by_columns" : [ ], "partition_by_columns" : [ ], "sort_by_columns" : [ ], "storage_type" : 20, - "update_time" : 1632293938765, + "update_time" : 1743407020517, "manual" : false, "auto" : false, "base" : true, @@ -76,18 +79,18 @@ "next_layout_offset" : 2 }, { "id" : 20000000000, - "dimensions" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 32, 34, 40, 42, 43, 46, 53, 55 ], + "dimensions" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 ], "measures" : [ ], "layouts" : [ { "id" : 20000000001, "name" : null, "owner" : null, - "col_order" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 32, 34, 40, 42, 43, 46, 53, 55 ], + "col_order" : [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 ], "shard_by_columns" : [ ], "partition_by_columns" : [ ], "sort_by_columns" : [ ], "storage_type" : 20, - "update_time" : 1632293938765, + "update_time" : 1743407020517, "manual" : false, "auto" : false, "base" : true, @@ -108,5 +111,6 @@ "layout_bucket_num" : { }, "approved_additional_recs" : 0, "approved_removal_recs" : 0, - "project" : "learn_kylin" + "base_agg_index_reduce_high_cardinality_dim" : false, + "planner_white_list" : [ ] } \ No newline at end of file diff --git a/build/sample_project/template/core_meta/LAYOUT/00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json b/build/sample_project/template/core_meta/LAYOUT/00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json new file mode 100644 index 0000000000..b9e1793813 --- /dev/null +++ b/build/sample_project/template/core_meta/LAYOUT/00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json @@ -0,0 +1,9 @@ +{ + "uuid" : "00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243", + "last_modified" : 0, + "create_time" : 1743407020539, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "dataflow" : "eccbdc7e-a229-3297-6a10-1ccb41d66382", + "layout_instances" : [ ] +} \ No newline at end of file diff --git a/build/sample_project/template/MODEL/2d07e878-da28-a203-2d2c-185b4c6656f1.json b/build/sample_project/template/core_meta/MODEL/eccbdc7e-a229-3297-6a10-1ccb41d66382.json similarity index 70% rename from build/sample_project/template/MODEL/2d07e878-da28-a203-2d2c-185b4c6656f1.json rename to build/sample_project/template/core_meta/MODEL/eccbdc7e-a229-3297-6a10-1ccb41d66382.json index 5c33ec1c61..ff21590436 100644 --- a/build/sample_project/template/MODEL/2d07e878-da28-a203-2d2c-185b4c6656f1.json +++ b/build/sample_project/template/core_meta/MODEL/eccbdc7e-a229-3297-6a10-1ccb41d66382.json @@ -1,9 +1,10 @@ { - "uuid" : "2d07e878-da28-a203-2d2c-185b4c6656f1", - "last_modified" : 1632293938765, - "create_time" : 1632293935226, - "version" : "%default_version%", - "alias" : "sample_ssb", + "uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382", + "last_modified" : 1743407020514, + "create_time" : 1743407020304, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "alias" : "learn_kylin", "owner" : "ADMIN", "config_last_modifier" : null, "config_last_modified" : 0, @@ -12,20 +13,6 @@ "fact_table_alias" : null, "management_type" : "MODEL_BASED", "join_tables" : [ { - "table" : "SSB.DATES", - "kind" : "LOOKUP", - "alias" : "DATES", - "join" : { - "type" : "INNER", - "primary_key" : [ "DATES.D_DATEKEY" ], - "foreign_key" : [ "P_LINEORDER.LO_ORDERDATE" ], - "non_equi_join_condition" : null, - "primary_table" : null, - "foreign_table" : null - }, - "flattenable" : "flatten", - "join_relation_type" : "MANY_TO_ONE" - }, { "table" : "SSB.CUSTOMER", "kind" : "LOOKUP", "alias" : "CUSTOMER", @@ -67,15 +54,23 @@ }, "flattenable" : "flatten", "join_relation_type" : "MANY_TO_ONE" + }, { + "table" : "SSB.DATES", + "kind" : "LOOKUP", + "alias" : "DATES", + "join" : { + "type" : "INNER", + "primary_key" : [ "DATES.D_DATEKEY" ], + "foreign_key" : [ "P_LINEORDER.LO_ORDERDATE" ], + "non_equi_join_condition" : null, + "primary_table" : null, + "foreign_table" : null + }, + "flattenable" : "flatten", + "join_relation_type" : "MANY_TO_ONE" } ], "filter_condition" : "", - "partition_desc" : { - "partition_date_column" : "P_LINEORDER.LO_ORDERDATE", - "partition_date_start" : 0, - "partition_date_format" : "yyyy-MM-dd", - "partition_type" : "APPEND", - "partition_condition_builder" : "org.apache.kylin.metadata.model.PartitionDesc$DefaultPartitionConditionBuilder" - }, + "partition_desc" : null, "capacity" : "MEDIUM", "segment_config" : { "auto_merge_enabled" : null, @@ -84,9 +79,13 @@ "retention_range" : null, "create_empty_segment_enabled" : false }, - "data_check_desc" : null, + "data_check_desc" : { + "check_options" : 0, + "fault_threshold" : 0, + "fault_actions" : 0 + }, "semantic_version" : 0, - "storage_type" : 0, + "storage_type" : 3, "model_type" : "BATCH", "all_named_columns" : [ { "id" : 0, @@ -180,176 +179,209 @@ "status" : "DIMENSION" }, { "id" : 18, - "name" : "D_WEEKNUMINYEAR", - "column" : "DATES.D_WEEKNUMINYEAR" + "name" : "C_ADDRESS", + "column" : "CUSTOMER.C_ADDRESS", + "status" : "DIMENSION" }, { "id" : 19, - "name" : "D_LASTDAYINWEEKFL", - "column" : "DATES.D_LASTDAYINWEEKFL" + "name" : "C_NATION", + "column" : "CUSTOMER.C_NATION", + "status" : "DIMENSION" }, { "id" : 20, - "name" : "D_LASTDAYINMONTHFL", - "column" : "DATES.D_LASTDAYINMONTHFL" + "name" : "C_CITY", + "column" : "CUSTOMER.C_CITY", + "status" : "DIMENSION" }, { "id" : 21, - "name" : "D_DAYOFWEEK", - "column" : "DATES.D_DAYOFWEEK" + "name" : "C_PHONE", + "column" : "CUSTOMER.C_PHONE", + "status" : "DIMENSION" }, { "id" : 22, - "name" : "D_MONTHNUMINYEAR", - "column" : "DATES.D_MONTHNUMINYEAR" + "name" : "C_REGION", + "column" : "CUSTOMER.C_REGION", + "status" : "DIMENSION" }, { "id" : 23, - "name" : "D_YEARMONTHNUM", - "column" : "DATES.D_YEARMONTHNUM" + "name" : "C_NAME", + "column" : "CUSTOMER.C_NAME", + "status" : "DIMENSION" }, { "id" : 24, - "name" : "D_YEARMONTH", - "column" : "DATES.D_YEARMONTH" + "name" : "C_MKTSEGMENT", + "column" : "CUSTOMER.C_MKTSEGMENT", + "status" : "DIMENSION" }, { "id" : 25, - "name" : "D_DAYNUMINMONTH", - "column" : "DATES.D_DAYNUMINMONTH" + "name" : "C_CUSTKEY", + "column" : "CUSTOMER.C_CUSTKEY", + "status" : "DIMENSION" }, { "id" : 26, - "name" : "D_SELLINGSEASON", - "column" : "DATES.D_SELLINGSEASON" + "name" : "P_PARTKEY", + "column" : "PART.P_PARTKEY", + "status" : "DIMENSION" }, { "id" : 27, - "name" : "D_WEEKDAYFL", - "column" : "DATES.D_WEEKDAYFL" + "name" : "P_CONTAINER", + "column" : "PART.P_CONTAINER", + "status" : "DIMENSION" }, { "id" : 28, - "name" : "D_YEAR", - "column" : "DATES.D_YEAR" + "name" : "P_SIZE", + "column" : "PART.P_SIZE", + "status" : "DIMENSION" }, { "id" : 29, - "name" : "D_HOLIDAYFL", - "column" : "DATES.D_HOLIDAYFL" + "name" : "P_NAME", + "column" : "PART.P_NAME", + "status" : "DIMENSION" }, { "id" : 30, - "name" : "D_DAYNUMINWEEK", - "column" : "DATES.D_DAYNUMINWEEK" + "name" : "P_CATEGORY", + "column" : "PART.P_CATEGORY", + "status" : "DIMENSION" }, { "id" : 31, - "name" : "D_DAYNUMINYEAR", - "column" : "DATES.D_DAYNUMINYEAR" + "name" : "P_TYPE", + "column" : "PART.P_TYPE", + "status" : "DIMENSION" }, { "id" : 32, - "name" : "D_DATE", - "column" : "DATES.D_DATE", + "name" : "P_MFGR", + "column" : "PART.P_MFGR", "status" : "DIMENSION" }, { "id" : 33, - "name" : "D_MONTH", - "column" : "DATES.D_MONTH" + "name" : "P_BRAND", + "column" : "PART.P_BRAND", + "status" : "DIMENSION" }, { "id" : 34, - "name" : "D_DATEKEY", - "column" : "DATES.D_DATEKEY", + "name" : "P_COLOR", + "column" : "PART.P_COLOR", "status" : "DIMENSION" }, { "id" : 35, - "name" : "C_ADDRESS", - "column" : "CUSTOMER.C_ADDRESS" + "name" : "S_ADDRESS", + "column" : "SUPPLIER.S_ADDRESS", + "status" : "DIMENSION" }, { "id" : 36, - "name" : "C_NATION", - "column" : "CUSTOMER.C_NATION" + "name" : "S_NAME", + "column" : "SUPPLIER.S_NAME", + "status" : "DIMENSION" }, { "id" : 37, - "name" : "C_CITY", - "column" : "CUSTOMER.C_CITY" + "name" : "S_NATION", + "column" : "SUPPLIER.S_NATION", + "status" : "DIMENSION" }, { "id" : 38, - "name" : "C_PHONE", - "column" : "CUSTOMER.C_PHONE" + "name" : "S_SUPPKEY", + "column" : "SUPPLIER.S_SUPPKEY", + "status" : "DIMENSION" }, { "id" : 39, - "name" : "C_REGION", - "column" : "CUSTOMER.C_REGION" + "name" : "S_REGION", + "column" : "SUPPLIER.S_REGION", + "status" : "DIMENSION" }, { "id" : 40, - "name" : "C_NAME", - "column" : "CUSTOMER.C_NAME", + "name" : "S_PHONE", + "column" : "SUPPLIER.S_PHONE", "status" : "DIMENSION" }, { "id" : 41, - "name" : "C_MKTSEGMENT", - "column" : "CUSTOMER.C_MKTSEGMENT" + "name" : "S_CITY", + "column" : "SUPPLIER.S_CITY", + "status" : "DIMENSION" }, { "id" : 42, - "name" : "C_CUSTKEY", - "column" : "CUSTOMER.C_CUSTKEY", + "name" : "D_WEEKNUMINYEAR", + "column" : "DATES.D_WEEKNUMINYEAR", "status" : "DIMENSION" }, { "id" : 43, - "name" : "P_PARTKEY", - "column" : "PART.P_PARTKEY", + "name" : "D_LASTDAYINWEEKFL", + "column" : "DATES.D_LASTDAYINWEEKFL", "status" : "DIMENSION" }, { "id" : 44, - "name" : "P_CONTAINER", - "column" : "PART.P_CONTAINER" + "name" : "D_LASTDAYINMONTHFL", + "column" : "DATES.D_LASTDAYINMONTHFL", + "status" : "DIMENSION" }, { "id" : 45, - "name" : "P_SIZE", - "column" : "PART.P_SIZE" + "name" : "D_DAYOFWEEK", + "column" : "DATES.D_DAYOFWEEK", + "status" : "DIMENSION" }, { "id" : 46, - "name" : "P_NAME", - "column" : "PART.P_NAME", + "name" : "D_MONTHNUMINYEAR", + "column" : "DATES.D_MONTHNUMINYEAR", "status" : "DIMENSION" }, { "id" : 47, - "name" : "P_CATEGORY", - "column" : "PART.P_CATEGORY" + "name" : "D_YEARMONTHNUM", + "column" : "DATES.D_YEARMONTHNUM", + "status" : "DIMENSION" }, { "id" : 48, - "name" : "P_TYPE", - "column" : "PART.P_TYPE" + "name" : "D_YEARMONTH", + "column" : "DATES.D_YEARMONTH", + "status" : "DIMENSION" }, { "id" : 49, - "name" : "P_MFGR", - "column" : "PART.P_MFGR" + "name" : "D_DAYNUMINMONTH", + "column" : "DATES.D_DAYNUMINMONTH", + "status" : "DIMENSION" }, { "id" : 50, - "name" : "P_BRAND", - "column" : "PART.P_BRAND" + "name" : "D_SELLINGSEASON", + "column" : "DATES.D_SELLINGSEASON", + "status" : "DIMENSION" }, { "id" : 51, - "name" : "P_COLOR", - "column" : "PART.P_COLOR" + "name" : "D_WEEKDAYFL", + "column" : "DATES.D_WEEKDAYFL", + "status" : "DIMENSION" }, { "id" : 52, - "name" : "S_ADDRESS", - "column" : "SUPPLIER.S_ADDRESS" + "name" : "D_YEAR", + "column" : "DATES.D_YEAR", + "status" : "DIMENSION" }, { "id" : 53, - "name" : "S_NAME", - "column" : "SUPPLIER.S_NAME", + "name" : "D_HOLIDAYFL", + "column" : "DATES.D_HOLIDAYFL", "status" : "DIMENSION" }, { "id" : 54, - "name" : "S_NATION", - "column" : "SUPPLIER.S_NATION" + "name" : "D_DAYNUMINWEEK", + "column" : "DATES.D_DAYNUMINWEEK", + "status" : "DIMENSION" }, { "id" : 55, - "name" : "S_SUPPKEY", - "column" : "SUPPLIER.S_SUPPKEY", + "name" : "D_DAYNUMINYEAR", + "column" : "DATES.D_DAYNUMINYEAR", "status" : "DIMENSION" }, { "id" : 56, - "name" : "S_REGION", - "column" : "SUPPLIER.S_REGION" + "name" : "D_DATE", + "column" : "DATES.D_DATE", + "status" : "DIMENSION" }, { "id" : 57, - "name" : "S_PHONE", - "column" : "SUPPLIER.S_PHONE" + "name" : "D_MONTH", + "column" : "DATES.D_MONTH", + "status" : "DIMENSION" }, { "id" : 58, - "name" : "S_CITY", - "column" : "SUPPLIER.S_CITY" + "name" : "D_DATEKEY", + "column" : "DATES.D_DATEKEY", + "status" : "DIMENSION" } ], "all_measures" : [ { "name" : "COUNT_ALL", @@ -363,47 +395,48 @@ }, "column" : null, "comment" : null, - "id" : 100000 + "id" : 100000, + "type" : "NORMAL", + "internal_ids" : [ ] } ], "recommendations_count" : 0, + "computed_column_uuids" : [ ], "canvas" : { "coordinate" : { "P_LINEORDER" : { - "x" : 625.388895670573, - "y" : 272.38889058430993, - "width" : 220.0, - "height" : 200.0 + "x" : 744.3332926432292, + "y" : 136.49997287326389, + "width" : 200.0, + "height" : 230.0 }, "CUSTOMER" : { - "x" : 315.38889567057305, - "y" : 72.3888905843099, - "width" : 220.0, - "height" : 200.0 + "x" : 350.99995930989576, + "y" : 124.2777506510417, + "width" : 200.0, + "height" : 230.0 }, "DATES" : { - "x" : 275.38889567057294, - "y" : 556.8333350287544, - "width" : 220.0, - "height" : 200.0 + "x" : 495.44440375434027, + "y" : 493.1666395399306, + "width" : 200.0, + "height" : 230.0 }, "PART" : { - "x" : 774.2777845594618, - "y" : 605.7222239176433, - "width" : 220.0, - "height" : 200.0 + "x" : 1119.8888481987847, + "y" : 115.38886176215279, + "width" : 200.0, + "height" : 230.0 }, "SUPPLIER" : { - "x" : 1055.388895670573, - "y" : 122.3888905843099, - "width" : 220.0, - "height" : 200.0 + "x" : 1097.6666259765625, + "y" : 486.4999728732639, + "width" : 200.0, + "height" : 230.0 } }, "zoom" : 9.0 }, "multi_partition_desc" : null, "multi_partition_key_mapping" : null, - "fusion_id" : null, - "computed_column_uuids" : [ ], - "project" : "learn_kylin" + "fusion_id" : null } \ No newline at end of file diff --git a/build/sample_project/template/PROJECT/learn_kylin.json b/build/sample_project/template/core_meta/PROJECT/learn_kylin.json similarity index 75% rename from build/sample_project/template/PROJECT/learn_kylin.json rename to build/sample_project/template/core_meta/PROJECT/learn_kylin.json index 1104e253dd..4e346b9ebb 100644 --- a/build/sample_project/template/PROJECT/learn_kylin.json +++ b/build/sample_project/template/core_meta/PROJECT/learn_kylin.json @@ -1,12 +1,12 @@ { - "uuid" : "6e8e4b33-5873-1a63-799c-3356793620d3", - "last_modified" : 1726220537212, - "create_time" : 1726220531678, - "version" : "%default_version%", + "uuid" : "29a2eb9a-7840-a360-11c5-8f6c0ec694b9", + "last_modified" : 1743406295474, + "create_time" : 1743406292280, + "version" : "5.0.2.0", "name" : "learn_kylin", "owner" : "ADMIN", "status" : "ENABLED", - "create_time_utc" : 1726220531681, + "create_time_utc" : 1743406292280, "default_database" : "DEFAULT", "description" : "", "principal" : null, @@ -15,8 +15,8 @@ "override_kylin_properties" : { "kylin.metadata.semi-automatic-mode" : "false", "kylin.query.metadata.expose-computed-column" : "true", - "kylin.internal-table-enabled" : "true", - "kylin.source.default" : "9" + "kylin.source.default" : "9", + "kylin.internal-table-enabled" : "true" }, "segment_config" : { "auto_merge_enabled" : false, @@ -33,4 +33,4 @@ }, "create_empty_segment_enabled" : false } -} +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/SEGMENT/00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json b/build/sample_project/template/core_meta/SEGMENT/00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json new file mode 100644 index 0000000000..a244940e23 --- /dev/null +++ b/build/sample_project/template/core_meta/SEGMENT/00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243.json @@ -0,0 +1,34 @@ +{ + "uuid" : "00ffe9c0-6ad7-6fd8-fcc1-0ad639b9f243", + "last_modified" : 0, + "create_time" : 1743407020523, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "model_uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382", + "name" : "FULL_BUILD", + "create_time_utc" : 1743407020523, + "status" : "READY", + "segRange" : { + "@class" : "org.apache.kylin.metadata.model.SegmentRange$TimePartitionedSegmentRange", + "date_range_start" : 0, + "date_range_end" : 9223372036854775807 + }, + "timeRange" : null, + "dimension_range_info_map" : { }, + "parameters" : null, + "dictionaries" : null, + "snapshots" : null, + "last_build_time" : 0, + "source_count" : 0, + "source_bytes_size" : 0, + "column_source_bytes" : { }, + "ori_snapshot_size" : { }, + "additionalInfo" : { }, + "is_realtime_segment" : false, + "is_snapshot_ready" : false, + "is_dict_ready" : false, + "is_flat_table_ready" : false, + "is_fact_view_ready" : false, + "multi_partitions" : [ ], + "max_bucket_id" : -1 +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/SYSTEM/UUID.json b/build/sample_project/template/core_meta/SYSTEM/UUID.json new file mode 100644 index 0000000000..6509063c28 --- /dev/null +++ b/build/sample_project/template/core_meta/SYSTEM/UUID.json @@ -0,0 +1,8 @@ +{ + "uuid" : "c1939a97-181b-f261-d603-b06d176e0aeb", + "last_modified" : 0, + "create_time" : 1743406262684, + "version" : "5.0.2.0", + "str" : "3977369b-4cb8-2032-8823-092b237f0ae3", + "name" : "UUID" +} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.CUSTOMER.json b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.CUSTOMER.json similarity index 88% rename from build/sample_project/template/TABLE_INFO/learn_kylin.SSB.CUSTOMER.json rename to build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.CUSTOMER.json index 6687e071fb..cbc802e530 100644 --- a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.CUSTOMER.json +++ b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.CUSTOMER.json @@ -1,8 +1,8 @@ { - "uuid" : "ccc282c6-50a7-0ddf-8e44-d929f69bc3bf", + "uuid" : "4f29ca5b-86a2-6d0f-d9b1-650eeb03e7b7", "last_modified" : 0, - "create_time" : 1726220561417, - "version" : "%default_version%", + "create_time" : 1743406300808, + "version" : "5.0.2.0", "project" : "learn_kylin", "database" : "SSB", "name" : "CUSTOMER", @@ -49,7 +49,7 @@ } ], "source_type" : 9, "table_type" : "EXTERNAL", - "has_Internal" : false, + "has_internal" : false, "top" : false, "increment_loading" : false, "last_snapshot_path" : null, @@ -65,7 +65,7 @@ "temp_snapshot_path" : null, "snapshot_has_broken" : false, "transactional" : false, - "rangePartition" : false, "partition_desc" : null, - "table_comment" : null -} + "table_comment" : null, + "range_partition" : false +} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.DATES.json b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.DATES.json similarity index 93% rename from build/sample_project/template/TABLE_INFO/learn_kylin.SSB.DATES.json rename to build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.DATES.json index ad738e8831..7e739f6c1b 100644 --- a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.DATES.json +++ b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.DATES.json @@ -1,8 +1,8 @@ { - "uuid" : "f09153f1-1a07-e27c-611c-7662d8f5af26", + "uuid" : "7b91ddce-48b1-317a-37e7-61363f744b4e", "last_modified" : 0, - "create_time" : 1726220561245, - "version" : "%default_version%", + "create_time" : 1743406300836, + "version" : "5.0.2.0", "project" : "learn_kylin", "database" : "SSB", "name" : "DATES", @@ -94,7 +94,7 @@ } ], "source_type" : 9, "table_type" : "EXTERNAL", - "has_Internal" : false, + "has_internal" : false, "top" : false, "increment_loading" : false, "last_snapshot_path" : null, @@ -110,7 +110,7 @@ "temp_snapshot_path" : null, "snapshot_has_broken" : false, "transactional" : false, - "rangePartition" : false, "partition_desc" : null, - "table_comment" : null -} + "table_comment" : null, + "range_partition" : false +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.LINEORDER.json b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.LINEORDER.json deleted file mode 100644 index 6b26d5b36c..0000000000 --- a/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.LINEORDER.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "uuid" : "229b72d3-b959-d8ef-18b5-7859627ea3cd", - "last_modified" : 0, - "create_time" : 1726220561529, - "version" : "%default_version%", - "project" : "learn_kylin", - "database" : "SSB", - "name" : "LINEORDER", - "columns" : [ { - "id" : "1", - "name" : "LO_ORDERKEY", - "datatype" : "bigint", - "case_sensitive_name" : "lo_orderkey" - }, { - "id" : "2", - "name" : "LO_LINENUMBER", - "datatype" : "bigint", - "case_sensitive_name" : "lo_linenumber" - }, { - "id" : "3", - "name" : "LO_CUSTKEY", - "datatype" : "integer", - "case_sensitive_name" : "lo_custkey" - }, { - "id" : "4", - "name" : "LO_PARTKEY", - "datatype" : "integer", - "case_sensitive_name" : "lo_partkey" - }, { - "id" : "5", - "name" : "LO_SUPPKEY", - "datatype" : "integer", - "case_sensitive_name" : "lo_suppkey" - }, { - "id" : "6", - "name" : "LO_ORDERDATE", - "datatype" : "date", - "case_sensitive_name" : "lo_orderdate" - }, { - "id" : "7", - "name" : "LO_ORDERPRIOTITY", - "datatype" : "varchar(4096)", - "case_sensitive_name" : "lo_orderpriotity" - }, { - "id" : "8", - "name" : "LO_SHIPPRIOTITY", - "datatype" : "integer", - "case_sensitive_name" : "lo_shippriotity" - }, { - "id" : "9", - "name" : "LO_QUANTITY", - "datatype" : "bigint", - "case_sensitive_name" : "lo_quantity" - }, { - "id" : "10", - "name" : "LO_EXTENDEDPRICE", - "datatype" : "bigint", - "case_sensitive_name" : "lo_extendedprice" - }, { - "id" : "11", - "name" : "LO_ORDTOTALPRICE", - "datatype" : "bigint", - "case_sensitive_name" : "lo_ordtotalprice" - }, { - "id" : "12", - "name" : "LO_DISCOUNT", - "datatype" : "bigint", - "case_sensitive_name" : "lo_discount" - }, { - "id" : "13", - "name" : "LO_REVENUE", - "datatype" : "bigint", - "case_sensitive_name" : "lo_revenue" - }, { - "id" : "14", - "name" : "LO_SUPPLYCOST", - "datatype" : "bigint", - "case_sensitive_name" : "lo_supplycost" - }, { - "id" : "15", - "name" : "LO_TAX", - "datatype" : "bigint", - "case_sensitive_name" : "lo_tax" - }, { - "id" : "16", - "name" : "LO_COMMITDATE", - "datatype" : "date", - "case_sensitive_name" : "lo_commitdate" - }, { - "id" : "17", - "name" : "LO_SHIPMODE", - "datatype" : "varchar(4096)", - "case_sensitive_name" : "lo_shipmode" - } ], - "source_type" : 9, - "table_type" : "EXTERNAL", - "has_Internal" : false, - "top" : false, - "increment_loading" : false, - "last_snapshot_path" : null, - "last_snapshot_size" : 0, - "snapshot_last_modified" : 0, - "query_hit_count" : 0, - "partition_column" : null, - "snapshot_partitions" : { }, - "snapshot_partitions_info" : { }, - "snapshot_total_rows" : 0, - "snapshot_partition_col" : null, - "selected_snapshot_partition_col" : null, - "temp_snapshot_path" : null, - "snapshot_has_broken" : false, - "transactional" : false, - "rangePartition" : false, - "partition_desc" : null, - "table_comment" : null -} diff --git a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.PART.json b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.PART.json similarity index 89% rename from build/sample_project/template/TABLE_INFO/learn_kylin.SSB.PART.json rename to build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.PART.json index df1c39370b..4524d47e2d 100644 --- a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.PART.json +++ b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.PART.json @@ -1,8 +1,8 @@ { - "uuid" : "634c9560-bf98-9c40-5568-a4d4605e15ae", + "uuid" : "f763df6b-0ab6-eeca-402e-fdc8ff39cb86", "last_modified" : 0, - "create_time" : 1726220561317, - "version" : "%default_version%", + "create_time" : 1743406300823, + "version" : "5.0.2.0", "project" : "learn_kylin", "database" : "SSB", "name" : "PART", @@ -54,7 +54,7 @@ } ], "source_type" : 9, "table_type" : "EXTERNAL", - "has_Internal" : false, + "has_internal" : false, "top" : false, "increment_loading" : false, "last_snapshot_path" : null, @@ -70,7 +70,7 @@ "temp_snapshot_path" : null, "snapshot_has_broken" : false, "transactional" : false, - "rangePartition" : false, "partition_desc" : null, - "table_comment" : null -} + "table_comment" : null, + "range_partition" : false +} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json similarity index 93% rename from build/sample_project/template/TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json rename to build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json index 5ab2a78f8a..c68e22e420 100644 --- a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json +++ b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.P_LINEORDER.json @@ -1,8 +1,8 @@ { - "uuid" : "221f1778-b5c6-6d1e-0f21-a6a30b0c7724", + "uuid" : "7ad976bf-fd99-6b7d-d587-b3d6c048b96e", "last_modified" : 0, - "create_time" : 1726220562007, - "version" : "%default_version%", + "create_time" : 1743406300942, + "version" : "5.0.2.0", "project" : "learn_kylin", "database" : "SSB", "name" : "P_LINEORDER", @@ -99,7 +99,7 @@ } ], "source_type" : 9, "table_type" : "VIEW", - "has_Internal" : false, + "has_internal" : false, "top" : false, "increment_loading" : false, "last_snapshot_path" : null, @@ -115,7 +115,7 @@ "temp_snapshot_path" : null, "snapshot_has_broken" : false, "transactional" : false, - "rangePartition" : false, "partition_desc" : null, - "table_comment" : null -} + "table_comment" : null, + "range_partition" : false +} \ No newline at end of file diff --git a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.SUPPLIER.json b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.SUPPLIER.json similarity index 88% rename from build/sample_project/template/TABLE_INFO/learn_kylin.SSB.SUPPLIER.json rename to build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.SUPPLIER.json index 11cb989826..e0495de655 100644 --- a/build/sample_project/template/TABLE_INFO/learn_kylin.SSB.SUPPLIER.json +++ b/build/sample_project/template/core_meta/TABLE_INFO/learn_kylin.SSB.SUPPLIER.json @@ -1,8 +1,8 @@ { - "uuid" : "33559e63-2e7e-a0cd-d309-1215b931b0be", + "uuid" : "c4747b43-7256-6dbd-22ff-744627246bc2", "last_modified" : 0, - "create_time" : 1726220561224, - "version" : "%default_version%", + "create_time" : 1743406300813, + "version" : "5.0.2.0", "project" : "learn_kylin", "database" : "SSB", "name" : "SUPPLIER", @@ -44,7 +44,7 @@ } ], "source_type" : 9, "table_type" : "EXTERNAL", - "has_Internal" : false, + "has_internal" : false, "top" : false, "increment_loading" : false, "last_snapshot_path" : null, @@ -60,7 +60,7 @@ "temp_snapshot_path" : null, "snapshot_has_broken" : false, "transactional" : false, - "rangePartition" : false, "partition_desc" : null, - "table_comment" : null -} + "table_comment" : null, + "range_partition" : false +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/10d671c8-875d-d2b0-3ed0-16de6da933d9.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/10d671c8-875d-d2b0-3ed0-16de6da933d9.json new file mode 100644 index 0000000000..17b9ec5995 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/10d671c8-875d-d2b0-3ed0-16de6da933d9.json @@ -0,0 +1,9 @@ +{ + "uuid" : "10d671c8-875d-d2b0-3ed0-16de6da933d9", + "last_modified" : 0, + "create_time" : 1743406910855, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.DATES", + "model_uuid" : "4f73bc60-ca56-a44e-9b0d-5fde046ef897" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/145b7718-df6c-a83f-2cd6-88c03097aa1e.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/145b7718-df6c-a83f-2cd6-88c03097aa1e.json new file mode 100644 index 0000000000..2f36e98da2 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/145b7718-df6c-a83f-2cd6-88c03097aa1e.json @@ -0,0 +1,9 @@ +{ + "uuid" : "145b7718-df6c-a83f-2cd6-88c03097aa1e", + "last_modified" : 0, + "create_time" : 1743407020505, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.SUPPLIER", + "model_uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/20a357ea-595e-9b47-7855-5a0b74f93673.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/20a357ea-595e-9b47-7855-5a0b74f93673.json new file mode 100644 index 0000000000..ea64fee43a --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/20a357ea-595e-9b47-7855-5a0b74f93673.json @@ -0,0 +1,9 @@ +{ + "uuid" : "20a357ea-595e-9b47-7855-5a0b74f93673", + "last_modified" : 0, + "create_time" : 1743406910859, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.P_LINEORDER", + "model_uuid" : "4f73bc60-ca56-a44e-9b0d-5fde046ef897" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/25abdb1e-4315-ddbe-a4d2-311e93d7f7b9.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/25abdb1e-4315-ddbe-a4d2-311e93d7f7b9.json new file mode 100644 index 0000000000..433ec658b4 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/25abdb1e-4315-ddbe-a4d2-311e93d7f7b9.json @@ -0,0 +1,9 @@ +{ + "uuid" : "25abdb1e-4315-ddbe-a4d2-311e93d7f7b9", + "last_modified" : 0, + "create_time" : 1743407020503, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.DATES", + "model_uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/42a320ee-01c5-7ba3-82b0-ef0989cd2bcb.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/42a320ee-01c5-7ba3-82b0-ef0989cd2bcb.json new file mode 100644 index 0000000000..a248fca6bf --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/42a320ee-01c5-7ba3-82b0-ef0989cd2bcb.json @@ -0,0 +1,9 @@ +{ + "uuid" : "42a320ee-01c5-7ba3-82b0-ef0989cd2bcb", + "last_modified" : 0, + "create_time" : 1743406863334, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.PART", + "model_uuid" : "8de76906-3337-dddf-ab11-1d6e7b2811ec" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/64a36919-b005-b16c-a673-b7fe80e8a1bd.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/64a36919-b005-b16c-a673-b7fe80e8a1bd.json new file mode 100644 index 0000000000..0081020f06 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/64a36919-b005-b16c-a673-b7fe80e8a1bd.json @@ -0,0 +1,9 @@ +{ + "uuid" : "64a36919-b005-b16c-a673-b7fe80e8a1bd", + "last_modified" : 0, + "create_time" : 1743406863333, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.SUPPLIER", + "model_uuid" : "8de76906-3337-dddf-ab11-1d6e7b2811ec" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/68322c9c-8ddd-ab1c-5c1a-208ce9d6479a.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/68322c9c-8ddd-ab1c-5c1a-208ce9d6479a.json new file mode 100644 index 0000000000..e1df16eee4 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/68322c9c-8ddd-ab1c-5c1a-208ce9d6479a.json @@ -0,0 +1,9 @@ +{ + "uuid" : "68322c9c-8ddd-ab1c-5c1a-208ce9d6479a", + "last_modified" : 0, + "create_time" : 1743407020507, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.P_LINEORDER", + "model_uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/8bcf58e6-d431-4721-5fda-0cb957b50091.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/8bcf58e6-d431-4721-5fda-0cb957b50091.json new file mode 100644 index 0000000000..a5ddd6e44b --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/8bcf58e6-d431-4721-5fda-0cb957b50091.json @@ -0,0 +1,9 @@ +{ + "uuid" : "8bcf58e6-d431-4721-5fda-0cb957b50091", + "last_modified" : 0, + "create_time" : 1743406910857, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.CUSTOMER", + "model_uuid" : "4f73bc60-ca56-a44e-9b0d-5fde046ef897" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b05341cb-7e87-e798-ff61-a0ecdfbd1055.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b05341cb-7e87-e798-ff61-a0ecdfbd1055.json new file mode 100644 index 0000000000..46a2f773dd --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b05341cb-7e87-e798-ff61-a0ecdfbd1055.json @@ -0,0 +1,9 @@ +{ + "uuid" : "b05341cb-7e87-e798-ff61-a0ecdfbd1055", + "last_modified" : 0, + "create_time" : 1743407020506, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.CUSTOMER", + "model_uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b067a959-25ef-79fc-2646-0a60c38f961c.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b067a959-25ef-79fc-2646-0a60c38f961c.json new file mode 100644 index 0000000000..2ebe063f46 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b067a959-25ef-79fc-2646-0a60c38f961c.json @@ -0,0 +1,9 @@ +{ + "uuid" : "b067a959-25ef-79fc-2646-0a60c38f961c", + "last_modified" : 0, + "create_time" : 1743406863333, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.CUSTOMER", + "model_uuid" : "8de76906-3337-dddf-ab11-1d6e7b2811ec" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b4955606-d1c3-27c8-7568-ce6235eb6a4a.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b4955606-d1c3-27c8-7568-ce6235eb6a4a.json new file mode 100644 index 0000000000..db292f1263 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/b4955606-d1c3-27c8-7568-ce6235eb6a4a.json @@ -0,0 +1,9 @@ +{ + "uuid" : "b4955606-d1c3-27c8-7568-ce6235eb6a4a", + "last_modified" : 0, + "create_time" : 1743406863335, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.P_LINEORDER", + "model_uuid" : "8de76906-3337-dddf-ab11-1d6e7b2811ec" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/c41767da-12b3-39b1-2685-08b9e3722b31.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/c41767da-12b3-39b1-2685-08b9e3722b31.json new file mode 100644 index 0000000000..4ea8c6ef03 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/c41767da-12b3-39b1-2685-08b9e3722b31.json @@ -0,0 +1,9 @@ +{ + "uuid" : "c41767da-12b3-39b1-2685-08b9e3722b31", + "last_modified" : 0, + "create_time" : 1743406910858, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.PART", + "model_uuid" : "4f73bc60-ca56-a44e-9b0d-5fde046ef897" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/d8f4e4f7-762f-335b-e72f-8a72a4d9210b.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/d8f4e4f7-762f-335b-e72f-8a72a4d9210b.json new file mode 100644 index 0000000000..26beea1be6 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/d8f4e4f7-762f-335b-e72f-8a72a4d9210b.json @@ -0,0 +1,9 @@ +{ + "uuid" : "d8f4e4f7-762f-335b-e72f-8a72a4d9210b", + "last_modified" : 0, + "create_time" : 1743406863331, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.DATES", + "model_uuid" : "8de76906-3337-dddf-ab11-1d6e7b2811ec" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/f74096a3-1e60-7702-a9fd-1888dcfcce49.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/f74096a3-1e60-7702-a9fd-1888dcfcce49.json new file mode 100644 index 0000000000..9194983601 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/f74096a3-1e60-7702-a9fd-1888dcfcce49.json @@ -0,0 +1,9 @@ +{ + "uuid" : "f74096a3-1e60-7702-a9fd-1888dcfcce49", + "last_modified" : 0, + "create_time" : 1743407020506, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.PART", + "model_uuid" : "eccbdc7e-a229-3297-6a10-1ccb41d66382" +} \ No newline at end of file diff --git a/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/fe78f416-12f6-33c5-e6cc-01faf16de176.json b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/fe78f416-12f6-33c5-e6cc-01faf16de176.json new file mode 100644 index 0000000000..e4006925c9 --- /dev/null +++ b/build/sample_project/template/core_meta/TABLE_MODEL_RELATION/fe78f416-12f6-33c5-e6cc-01faf16de176.json @@ -0,0 +1,9 @@ +{ + "uuid" : "fe78f416-12f6-33c5-e6cc-01faf16de176", + "last_modified" : 0, + "create_time" : 1743406910857, + "version" : "5.0.2.0", + "project" : "learn_kylin", + "table_identity" : "SSB.SUPPLIER", + "model_uuid" : "4f73bc60-ca56-a44e-9b0d-5fde046ef897" +} \ No newline at end of file diff --git a/dev-support/release-manager/standalone-docker/all-in-one/Dockerfile b/dev-support/release-manager/standalone-docker/all-in-one/Dockerfile index 1e3a309836..be5cf1d3ec 100644 --- a/dev-support/release-manager/standalone-docker/all-in-one/Dockerfile +++ b/dev-support/release-manager/standalone-docker/all-in-one/Dockerfile @@ -74,8 +74,8 @@ RUN cp /opt/mysql-connector-j-8.0.33.jar $HIVE_HOME/lib/ # install apache kylin RUN mkdir -p /home/kylin -ADD package/apache-kylin-5.0.0-GA-bin.tar.gz /home/kylin -ENV KYLIN_HOME=/home/kylin/apache-kylin-5.0.0-GA-bin +ADD package/apache-kylin-5.0.2-bin.tar.gz /home/kylin +ENV KYLIN_HOME=/home/kylin/apache-kylin-5.0.2-bin RUN cp /opt/mysql-connector-j-8.0.33.jar $KYLIN_HOME/lib/ext/ COPY conf/kylin/kylin.properties.override $KYLIN_HOME/conf/ diff --git a/dev-support/release-manager/standalone-docker/all-in-one/README.md b/dev-support/release-manager/standalone-docker/all-in-one/README.md index b3ba5dc040..d267d37dc0 100644 --- a/dev-support/release-manager/standalone-docker/all-in-one/README.md +++ b/dev-support/release-manager/standalone-docker/all-in-one/README.md @@ -1,13 +1,10 @@ # Preview latest Kylin (5.x) ## [Image Tag Information](https://hub.docker.com/r/apachekylin/apache-kylin-standalone) -| Tag | Image Contents | Comment & Publish Date | -|----------------------|---------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------| -| 5.0.0-GA | [**Recommended for users**] The official 5.0.0-GA with Spark & Gluten bundled. | Uploaded at 2024-09-13 | -| 5.0-beta | The official 5.0.0-beta with Spark bundled. | Uploaded at 2023-09-08, worked fine on Docker Desktop Mac 4.3.0 & 4.22.1(and Windows) , | -| kylin-4.0.1-mondrian | The official Kylin 4.0.1 with **MDX** function enabled | Uploaded at 2022-05-13 | -| 5-dev | [**For developer only**] Kylin 5.X package with some sample data/tools etc | Uploaded at 2023-11-21, this image for developer to debug and test Kylin 5.X source code if he/her didn't have a Hadoop env | -| 5.x-base-dev-only | [**For maintainer only**] Hadoop, Hive, Zookeeper, MySQL, JDK8 | Uploaded at 2023-09-07, this is the base image for all Kylin 5.X image, so it didn't contain Kylin package, see file `Dockerfile_hadoop` for information | +| Tag | Image Contents | Comment & Publish Date | +|----------------------|--------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------| +| 5.0.2-GA | [**Recommended for users**] The official 5.0.2-GA with Spark & Gluten bundled. | Uploaded at 2025-03-31 | +| kylin-4.0.1-mondrian | The official Kylin 4.0.1 with **MDX** function enabled | Uploaded at 2022-05-13 | ## Why you need Kylin 5 @@ -55,320 +52,12 @@ docker run -d \ -p 8032:8032 \ -p 8042:8042 \ -p 2181:2181 \ - apachekylin/apache-kylin-standalone:5.0.0-GA + apachekylin/apache-kylin-standalone:5.0.2-GA docker logs --follow Kylin5-Machine ``` -When you enter these two commands, the logs will scroll -out in terminal and the process will continue for 3-5 minutes. - -``` -=============================================================================== -******************************************************************************* -| -| Start SSH server at Fri Sep 13 12:15:24 UTC 2024 -| Command: /etc/init.d/ssh start -| - * Starting OpenBSD Secure Shell server sshd - ...done. -[Start SSH server] succeed. - -=============================================================================== -******************************************************************************* -| -| Start MySQL at Fri Sep 13 12:15:25 UTC 2024 -| Command: service mysql start -| - * Starting MySQL database server mysqld -su: warning: cannot change directory to /nonexistent: No such file or directory - ...done. -[Start MySQL] succeed. - -=============================================================================== -******************************************************************************* -| -| Create Database kylin at Fri Sep 13 12:15:36 UTC 2024 -| Command: mysql -uroot -p123456 -e CREATE DATABASE IF NOT EXISTS kylin default charset utf8mb4 COLLATE utf8mb4_general_ci; -| -mysql: [Warning] Using a password on the command line interface can be insecure. -[Create Database kylin] succeed. - -=============================================================================== -******************************************************************************* -| -| Create Database hive3 at Fri Sep 13 12:15:36 UTC 2024 -| Command: mysql -uroot -p123456 -e CREATE DATABASE IF NOT EXISTS hive3 default charset utf8mb4 COLLATE utf8mb4_general_ci; -| -mysql: [Warning] Using a password on the command line interface can be insecure. -[Create Database hive3] succeed. - -=============================================================================== -******************************************************************************* -| -| Init Hive at Fri Sep 13 12:15:36 UTC 2024 -| Command: schematool -initSchema -dbType mysql -| -SLF4J: Class path contains multiple SLF4J bindings. -SLF4J: Found binding in [jar:file:/opt/apache-hive-3.1.3-bin/lib/log4j-slf4j-impl-2.17.1.jar!/org/slf4j/impl/StaticLoggerBinder.class] -SLF4J: Found binding in [jar:file:/opt/hadoop-3.2.4/share/hadoop/common/lib/slf4j-reload4j-1.7.35.jar!/org/slf4j/impl/StaticLoggerBinder.class] -SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation. -SLF4J: Actual binding is of type [org.apache.logging.slf4j.Log4jLoggerFactory] -Metastore connection URL: jdbc:mysql://127.0.0.1:3306/hive3?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8 -Metastore Connection Driver : com.mysql.cj.jdbc.Driver -Metastore connection User: root -Starting metastore schema initialization to 3.1.0 -Initialization script hive-schema-3.1.0.mysql.sql -... -Initialization script completed -schemaTool completed -[Init Hive] succeed. - -=============================================================================== -******************************************************************************* -| -| Format HDFS at Fri Sep 13 12:15:50 UTC 2024 -| Command: hdfs namenode -format -| -WARNING: /opt/hadoop-3.2.4/logs does not exist. Creating. -2024-09-13 12:15:51,423 INFO namenode.NameNode: STARTUP_MSG: -/************************************************************ -STARTUP_MSG: Starting NameNode -STARTUP_MSG: host = localhost/127.0.0.1 -STARTUP_MSG: args = [-format] -STARTUP_MSG: version = 3.2.4 -STARTUP_MSG: classpath = /opt/hadoop-3.2.4/etc/hadoop:/opt/hadoop-3.2.4/share/hadoop/common/lib/audience-annotations-0.5.0.jar:/opt/hadoop-3.2.4/share/hadoop/common/lib/httpclient-4.5.13.jar:/opt/hadoop-3.2.4/share/hadoop/common/lib/curator-client-2.13.0.jar:/opt/hadoop-3.2.4/share/hadoop/common/lib/jetty-server-9.4.43.v20210629.jar:/opt/hadoop-3.2.4/share/hadoop/common/lib/checker-qual-2.5.2.jar:/opt/hadoop-3.2.4/share/hadoop/common/lib/woodstox-core-5.3.0.jar:/opt/hadoop-3.2.4/share/ [...] -STARTUP_MSG: build = Unknown -r 7e5d9983b388e372fe640f21f048f2f2ae6e9eba; compiled by 'ubuntu' on 2022-07-12T11:58Z -STARTUP_MSG: java = 1.8.0_422 -************************************************************/ -2024-09-13 12:15:51,434 INFO namenode.NameNode: registered UNIX signal handlers for [TERM, HUP, INT] -2024-09-13 12:15:51,539 INFO namenode.NameNode: createNameNode [-format] -Formatting using clusterid: CID-e9f0293c-adcd-40a6-9c7f-ab7537b2eedf -2024-09-13 12:15:52,059 INFO namenode.FSEditLog: Edit logging is async:true -2024-09-13 12:15:52,090 INFO namenode.FSNamesystem: KeyProvider: null -2024-09-13 12:15:52,092 INFO namenode.FSNamesystem: fsLock is fair: true -2024-09-13 12:15:52,092 INFO namenode.FSNamesystem: Detailed lock hold time metrics enabled: false -2024-09-13 12:15:52,100 INFO namenode.FSNamesystem: fsOwner = root (auth:SIMPLE) -2024-09-13 12:15:52,100 INFO namenode.FSNamesystem: supergroup = supergroup -2024-09-13 12:15:52,100 INFO namenode.FSNamesystem: isPermissionEnabled = true -2024-09-13 12:15:52,100 INFO namenode.FSNamesystem: HA Enabled: false -2024-09-13 12:15:52,153 INFO common.Util: dfs.datanode.fileio.profiling.sampling.percentage set to 0. Disabling file IO profiling -2024-09-13 12:15:52,165 INFO blockmanagement.DatanodeManager: dfs.block.invalidate.limit: configured=1000, counted=60, effected=1000 -2024-09-13 12:15:52,165 INFO blockmanagement.DatanodeManager: dfs.namenode.datanode.registration.ip-hostname-check=true -2024-09-13 12:15:52,169 INFO blockmanagement.BlockManager: dfs.namenode.startup.delay.block.deletion.sec is set to 000:00:00:00.000 -2024-09-13 12:15:52,169 INFO blockmanagement.BlockManager: The block deletion will start around 2024 Sep 13 12:15:52 -2024-09-13 12:15:52,171 INFO util.GSet: Computing capacity for map BlocksMap -2024-09-13 12:15:52,171 INFO util.GSet: VM type = 64-bit -2024-09-13 12:15:52,172 INFO util.GSet: 2.0% max memory 1.7 GB = 34.8 MB -2024-09-13 12:15:52,172 INFO util.GSet: capacity = 2^22 = 4194304 entries -2024-09-13 12:15:52,180 INFO blockmanagement.BlockManager: Storage policy satisfier is disabled -2024-09-13 12:15:52,180 INFO blockmanagement.BlockManager: dfs.block.access.token.enable = false -2024-09-13 12:15:52,186 INFO blockmanagement.BlockManagerSafeMode: dfs.namenode.safemode.threshold-pct = 0.9990000128746033 -2024-09-13 12:15:52,186 INFO blockmanagement.BlockManagerSafeMode: dfs.namenode.safemode.min.datanodes = 0 -2024-09-13 12:15:52,186 INFO blockmanagement.BlockManagerSafeMode: dfs.namenode.safemode.extension = 30000 -2024-09-13 12:15:52,187 INFO blockmanagement.BlockManager: defaultReplication = 1 -2024-09-13 12:15:52,187 INFO blockmanagement.BlockManager: maxReplication = 512 -2024-09-13 12:15:52,187 INFO blockmanagement.BlockManager: minReplication = 1 -2024-09-13 12:15:52,187 INFO blockmanagement.BlockManager: maxReplicationStreams = 2 -2024-09-13 12:15:52,187 INFO blockmanagement.BlockManager: redundancyRecheckInterval = 3000ms -2024-09-13 12:15:52,187 INFO blockmanagement.BlockManager: encryptDataTransfer = false -2024-09-13 12:15:52,188 INFO blockmanagement.BlockManager: maxNumBlocksToLog = 1000 -2024-09-13 12:15:52,238 INFO namenode.FSDirectory: GLOBAL serial map: bits=29 maxEntries=536870911 -2024-09-13 12:15:52,238 INFO namenode.FSDirectory: USER serial map: bits=24 maxEntries=16777215 -2024-09-13 12:15:52,238 INFO namenode.FSDirectory: GROUP serial map: bits=24 maxEntries=16777215 -2024-09-13 12:15:52,238 INFO namenode.FSDirectory: XATTR serial map: bits=24 maxEntries=16777215 -2024-09-13 12:15:52,259 INFO util.GSet: Computing capacity for map INodeMap -2024-09-13 12:15:52,259 INFO util.GSet: VM type = 64-bit -2024-09-13 12:15:52,259 INFO util.GSet: 1.0% max memory 1.7 GB = 17.4 MB -2024-09-13 12:15:52,259 INFO util.GSet: capacity = 2^21 = 2097152 entries -2024-09-13 12:15:52,260 INFO namenode.FSDirectory: ACLs enabled? false -2024-09-13 12:15:52,260 INFO namenode.FSDirectory: POSIX ACL inheritance enabled? true -2024-09-13 12:15:52,260 INFO namenode.FSDirectory: XAttrs enabled? true -2024-09-13 12:15:52,261 INFO namenode.NameNode: Caching file names occurring more than 10 times -2024-09-13 12:15:52,265 INFO snapshot.SnapshotManager: Loaded config captureOpenFiles: false, skipCaptureAccessTimeOnlyChange: false, snapshotDiffAllowSnapRootDescendant: true, maxSnapshotLimit: 65536 -2024-09-13 12:15:52,267 INFO snapshot.SnapshotManager: SkipList is disabled -2024-09-13 12:15:52,272 INFO util.GSet: Computing capacity for map cachedBlocks -2024-09-13 12:15:52,272 INFO util.GSet: VM type = 64-bit -2024-09-13 12:15:52,272 INFO util.GSet: 0.25% max memory 1.7 GB = 4.4 MB -2024-09-13 12:15:52,272 INFO util.GSet: capacity = 2^19 = 524288 entries -2024-09-13 12:15:52,284 INFO metrics.TopMetrics: NNTop conf: dfs.namenode.top.window.num.buckets = 10 -2024-09-13 12:15:52,284 INFO metrics.TopMetrics: NNTop conf: dfs.namenode.top.num.users = 10 -2024-09-13 12:15:52,284 INFO metrics.TopMetrics: NNTop conf: dfs.namenode.top.windows.minutes = 1,5,25 -2024-09-13 12:15:52,288 INFO namenode.FSNamesystem: Retry cache on namenode is enabled -2024-09-13 12:15:52,288 INFO namenode.FSNamesystem: Retry cache will use 0.03 of total heap and retry cache entry expiry time is 600000 millis -2024-09-13 12:15:52,291 INFO util.GSet: Computing capacity for map NameNodeRetryCache -2024-09-13 12:15:52,291 INFO util.GSet: VM type = 64-bit -2024-09-13 12:15:52,292 INFO util.GSet: 0.029999999329447746% max memory 1.7 GB = 535.3 KB -2024-09-13 12:15:52,292 INFO util.GSet: capacity = 2^16 = 65536 entries -2024-09-13 12:15:52,314 INFO namenode.FSImage: Allocated new BlockPoolId: BP-1031271309-127.0.0.1-1726229752306 -2024-09-13 12:15:52,328 INFO common.Storage: Storage directory /data/hadoop/dfs/name has been successfully formatted. -2024-09-13 12:15:52,352 INFO namenode.FSImageFormatProtobuf: Saving image file /data/hadoop/dfs/name/current/fsimage.ckpt_0000000000000000000 using no compression -2024-09-13 12:15:52,435 INFO namenode.FSImageFormatProtobuf: Image file /data/hadoop/dfs/name/current/fsimage.ckpt_0000000000000000000 of size 396 bytes saved in 0 seconds . -2024-09-13 12:15:52,447 INFO namenode.NNStorageRetentionManager: Going to retain 1 images with txid >= 0 -2024-09-13 12:15:52,470 INFO namenode.FSNamesystem: Stopping services started for active state -2024-09-13 12:15:52,470 INFO namenode.FSNamesystem: Stopping services started for standby state -2024-09-13 12:15:52,474 INFO namenode.FSImage: FSImageSaver clean checkpoint: txid=0 when meet shutdown. -2024-09-13 12:15:52,475 INFO namenode.NameNode: SHUTDOWN_MSG: -/************************************************************ -SHUTDOWN_MSG: Shutting down NameNode at localhost/127.0.0.1 -************************************************************/ -[Format HDFS] succeed. - -=============================================================================== -******************************************************************************* -| -| Start Zookeeper at Fri Sep 13 12:15:52 UTC 2024 -| Command: /opt/apache-zookeeper-3.7.2-bin/bin/zkServer.sh start -| -ZooKeeper JMX enabled by default -Using config: /opt/apache-zookeeper-3.7.2-bin/bin/../conf/zoo.cfg -Starting zookeeper ... STARTED -[Start Zookeeper] succeed. - -=============================================================================== -******************************************************************************* -| -| Start Hadoop at Fri Sep 13 12:15:53 UTC 2024 -| Command: /opt/hadoop-3.2.4/sbin/start-all.sh -| -Starting namenodes on [localhost] -localhost: Warning: Permanently added 'localhost' (ED25519) to the list of known hosts. -Starting datanodes -Starting secondary namenodes [localhost] -Starting resourcemanager -Starting nodemanagers -[Start Hadoop] succeed. - -=============================================================================== -******************************************************************************* -| -| Start History Server at Fri Sep 13 12:16:09 UTC 2024 -| Command: /opt/hadoop-3.2.4/sbin/start-historyserver.sh -| -WARNING: Use of this script to start the MR JobHistory daemon is deprecated. -WARNING: Attempting to execute replacement "mapred --daemon start" instead. -[Start History Server] succeed. - -=============================================================================== -******************************************************************************* -| -| Start Hive metastore at Fri Sep 13 12:16:11 UTC 2024 -| Command: /opt/apache-hive-3.1.3-bin/bin/start-hivemetastore.sh -| -[Start Hive metastore] succeed. -Checking Check Hive metastore's status... -+ -Check Check Hive metastore succeed. - -=============================================================================== -******************************************************************************* -| -| Start Hive server at Fri Sep 13 12:16:22 UTC 2024 -| Command: /opt/apache-hive-3.1.3-bin/bin/start-hiveserver2.sh -| -[Start Hive server] succeed. -Checking Check Hive server's status... -+ -Check Check Hive server succeed. - -=============================================================================== -******************************************************************************* -| -| Prepare sample data at Fri Sep 13 12:16:45 UTC 2024 -| Command: /home/kylin/apache-kylin-5.0.0-GA-bin/bin/sample.sh -| -Loading sample data into HDFS tmp path: /tmp/kylin/sample_cube/data -WARNING: log4j.properties is not found. HADOOP_CONF_DIR may be incomplete. -WARNING: log4j.properties is not found. HADOOP_CONF_DIR may be incomplete. -Going to create sample tables in hive to database SSB by hive -WARNING: log4j.properties is not found. HADOOP_CONF_DIR may be incomplete. -SLF4J: Class path contains multiple SLF4J bindings. -SLF4J: Found binding in [jar:file:/opt/apache-hive-3.1.3-bin/lib/log4j-slf4j-impl-2.17.1.jar!/org/slf4j/impl/StaticLoggerBinder.class] -SLF4J: Found binding in [jar:file:/opt/hadoop-3.2.4/share/hadoop/common/lib/slf4j-reload4j-1.7.35.jar!/org/slf4j/impl/StaticLoggerBinder.class] -SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation. -SLF4J: Actual binding is of type [org.apache.logging.slf4j.Log4jLoggerFactory] -Hive Session ID = 2e70c349-7575-4a00-84c8-08b24f1a38cb - -Logging initialized using configuration in jar:file:/opt/apache-hive-3.1.3-bin/lib/hive-common-3.1.3.jar!/hive-log4j2.properties Async: true -Hive Session ID = bc35a6b2-1846-4a03-837f-271679ac6185 -OK -Time taken: 1.136 seconds -WARNING: log4j.properties is not found. HADOOP_CONF_DIR may be incomplete. -SLF4J: Class path contains multiple SLF4J bindings. -SLF4J: Found binding in [jar:file:/opt/apache-hive-3.1.3-bin/lib/log4j-slf4j-impl-2.17.1.jar!/org/slf4j/impl/StaticLoggerBinder.class] -SLF4J: Found binding in [jar:file:/opt/hadoop-3.2.4/share/hadoop/common/lib/slf4j-reload4j-1.7.35.jar!/org/slf4j/impl/StaticLoggerBinder.class] -SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation. -SLF4J: Actual binding is of type [org.apache.logging.slf4j.Log4jLoggerFactory] -Hive Session ID = 2e1f6b0e-4017-4e44-871d-239ab6dadc29 - -Logging initialized using configuration in jar:file:/opt/apache-hive-3.1.3-bin/lib/hive-common-3.1.3.jar!/hive-log4j2.properties Async: true -Hive Session ID = 965d433f-9635-4bfb-9aa6-93705ab733a4 -... -Time taken: 1.946 seconds -Loading data to table ssb.customer -OK -Time taken: 0.517 seconds -Loading data to table ssb.dates -OK -Time taken: 0.256 seconds -Loading data to table ssb.lineorder -OK -Time taken: 0.248 seconds -Loading data to table ssb.part -OK -Time taken: 0.254 seconds -Loading data to table ssb.supplier -OK -Time taken: 0.243 seconds -Sample hive tables are created successfully; Going to create sample project... -kylin version is 5.0.0.0 -The metadata backup path is hdfs://localhost:9000/kylin/kylin/_backup/2024-09-13-12-17-29_backup/core_meta. -Sample model is created successfully in project 'learn_kylin'. Detailed Message is at "logs/shell.stderr". -[Prepare sample data] succeed. - -=============================================================================== -******************************************************************************* -| -| Kylin ENV bypass at Fri Sep 13 12:17:29 UTC 2024 -| Command: touch /home/kylin/apache-kylin-5.0.0-GA-bin/bin/check-env-bypass -| -[Kylin ENV bypass] succeed. - -=============================================================================== -******************************************************************************* -| -| Start Kylin Instance at Fri Sep 13 12:17:29 UTC 2024 -| Command: /home/kylin/apache-kylin-5.0.0-GA-bin/bin/kylin.sh -v start -| -java is /usr/lib/jvm/java-8-openjdk-amd64/bin/java -Starting Kylin... -This user don't have permission to run crontab. -KYLIN_HOME is:/home/kylin/apache-kylin-5.0.0-GA-bin -KYLIN_CONFIG_FILE is:/home/kylin/apache-kylin-5.0.0-GA-bin/conf/kylin.properties -SPARK_HOME is:/home/kylin/apache-kylin-5.0.0-GA-bin/spark -Retrieving hadoop config dir... -KYLIN_JVM_SETTINGS is -server -Xms1g -Xmx8g -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:G1HeapRegionSize=16m -XX:+PrintFlagsFinal -XX:+PrintReferenceGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -XX:+PrintAdaptiveSizePolicy -XX:+UnlockDiagnosticVMOptions -XX:+G1SummarizeConcMark -Xloggc:/home/kylin/apache-kylin-5.0.0-GA-bin/logs/kylin.gc.%p -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=64M -XX:-OmitStackTraceInFastThrow -Dlog4j2. [...] -KYLIN_DEBUG_SETTINGS is not set, will not enable remote debuging -KYLIN_LD_LIBRARY_SETTINGS is not set, it is okay unless you want to specify your own native path -SPARK_HDP_VERSION is set to 'hadoop' -Export SPARK_HOME to /home/kylin/apache-kylin-5.0.0-GA-bin/spark -LD_PRELOAD= is:/home/kylin/apache-kylin-5.0.0-GA-bin/server/libch.so -Checking Zookeeper role... -Checking Spark directory... -Kylin is starting. It may take a while. For status, please visit http://localhost:7070/kylin/index.html. -You may also check status via: PID:4746, or Log: /home/kylin/apache-kylin-5.0.0-GA-bin/logs/kylin.log. -[Start Kylin Instance] succeed. -Checking Check Env Script's status... -/home/kylin/apache-kylin-5.0.0-GA-bin/bin/check-env-bypass -+ -Check Check Env Script succeed. -Checking Kylin Instance's status... -... -Check Kylin Instance succeed. -Kylin service is already available for you to preview. -``` - -Finally, the following message indicates that the Kylin is ready : +The following message indicates that the Kylin is ready : ``` Kylin service is already available for you to preview. diff --git a/dev-support/release-manager/standalone-docker/all-in-one/build.sh b/dev-support/release-manager/standalone-docker/all-in-one/build.sh index ca8638ab16..3129a2f039 100755 --- a/dev-support/release-manager/standalone-docker/all-in-one/build.sh +++ b/dev-support/release-manager/standalone-docker/all-in-one/build.sh @@ -18,7 +18,7 @@ # -TAG=5.0.0-GA +TAG=5.0.2-GA DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd ${DIR} || exit @@ -34,12 +34,12 @@ fi # 2. Execute sbin/download-spark-user.sh and should have a new spark folder at the root of kylin dir # 3. Re-compress kylin folder and put it to the package dir for Dockerfile use # -# wget https://archive.apache.org/dist/kylin/apache-kylin-5.0.0-GA/apache-kylin-5.0.0-GA-bin.tar.gz -P ${DIR}/package/ -# tar zxf apache-kylin-5.0.0-GA-bin.tar.gz -# cd apache-kylin-5.0.0-GA-bin +# wget https://github.com/apache/kylin/releases/download/kylin-5.0.2/apache-kylin-5.0.2-bin.tar.gz -P ${DIR}/package/ +# tar zxf apache-kylin-5.0.0-bin.tar.gz +# cd apache-kylin-5.0.2-bin # bash sbin/download-spark-user.sh -# tar -czf apache-kylin-5.0.0-GA-bin.tar.gz apache-kylin-5.0.0-GA-bin -# Notice - For mac tar command use: tar czf apache-kylin-5.0.0-GA-bin.tar.gz --no-mac-metadata apache-kylin-5.0.0-GA-bin +# tar -czf apache-kylin-5.0.2-bin.tar.gz apache-kylin-5.0.2-bin +# Notice - For mac tar command use: tar czf apache-kylin-5.0.2-bin.tar.gz --no-mac-metadata apache-kylin-5.0.2-bin # to avoid AppleDouble format hidden files inside the compressed file echo "start to build kylin standalone docker image" diff --git a/dev-support/release-manager/standalone-docker/all-in-one/run.sh b/dev-support/release-manager/standalone-docker/all-in-one/run.sh index 8b890ffedc..2ca410b825 100755 --- a/dev-support/release-manager/standalone-docker/all-in-one/run.sh +++ b/dev-support/release-manager/standalone-docker/all-in-one/run.sh @@ -17,7 +17,7 @@ # limitations under the License. # -TAG=5.0.0-GA +TAG=5.0.2-GA docker run -d \ --name Kylin5-Machine \ diff --git a/kystudio/src/components/monitor/batchJobs/locales.js b/kystudio/src/components/monitor/batchJobs/locales.js index 5e24c81e91..ca79aa96ac 100644 --- a/kystudio/src/components/monitor/batchJobs/locales.js +++ b/kystudio/src/components/monitor/batchJobs/locales.js @@ -19,6 +19,7 @@ export default { tip_jobResume: 'Resume the Job', tip_jobPause: 'Pause the Job', tip_jobDiscard: 'Discard the Job', + cubeName: 'Cube Name', NEW: 'NEW', PENDING: 'PENDING', RUNNING: 'RUNNING', @@ -46,8 +47,9 @@ export default { discardJob: 'Are you sure you want to discard the following job(s)? Please note that it couldn\'t be recovered.', discardJobWarning: 'Are you sure you want to discard the following job(s)? Discarding the highlighted job(s) might result in gaps between segments. The query results would be empty for those data ranges. Please note that the discarded jobs couldn’t be recovered.', discardJobTitle: 'Discard Job', + discardChJobTip: 'Some of the loaded data can serve the query. Please check the segment to complete the data, which may cause the query performance degradation before completion.', jobName: 'Job Name', - duration: 'Excuting', + duration: 'Executing', totalDuration: 'Total Duration', waiting: 'Waiting', noSelectJobs: 'Please select at least one job.', @@ -76,6 +78,13 @@ export default { SUB_PARTITION_REFRESH: 'Refresh Sub-partitions Data', SUB_PARTITION_BUILD: 'Build Sub-partitions Data', SNAPSHOT_BUILD: 'Build Snapshot', + SNAPSHOT_REFRESH: 'Refresh Snapshot', + EXPORT_TO_SECOND_STORAGE: 'Load Data to Tiered Storage', + SECOND_STORAGE_MODEL_CLEAN: 'Delete Tiered Storage (Model)', + SECOND_STORAGE_NODE_CLEAN: 'Delete Tiered Storage (Project)', + SECOND_STORAGE_SEGMENT_CLEAN: 'Delete Tiered Storage (Segment)', + SECOND_STORAGE_INDEX_CLEAN: 'Delete Tiered Storage (Index)', + SECOND_STORAGE_REFRESH_SECONDARY_INDEXES: 'Refresh skipping index', INTERNAL_TABLE_BUILD: 'Load internal table', INTERNAL_TABLE_REFRESH: 'Refresh internal table', LAYOUT_DATA_OPTIMIZE: 'Storage Optimization', @@ -101,18 +110,12 @@ export default { buildSnapshot: 'Build Snapshot', increamLoad: 'Incremental Load', filteredTotalSize: '{totalSize} result(s)', - secondaryStorage: 'Tiered Storage', - exportSecondaryStorage: 'Load Data to Tiered Storage', - mergeSecondaryStorage: 'Merge Data to Tiered Storage', - refreshSecondaryStorage: 'Refresh Tiered Storage', - delSecondaryStorage: 'Delete Tiered Storage', waitingYarnResource: 'Waiting for resources', buildOrRefreshSnapshot: 'Build or refresh snapshot', materializeFactTableView: 'Materialize fact table view', generateGlobalDict: 'Generate global dictionary', generateFlatTable: 'Generate flat table', saveFlatTable: 'Save flat table', - costBasedPlanner: 'Cost based planner', getFlatTableStatistics: 'Get flat table statistics', generateDictOfCC: 'Generate global dictionary of computed columns', mergeFlatTable: 'Merge flat table', @@ -130,8 +133,10 @@ export default { jobParams: 'Job Parameters', paramKey: 'Key', paramValue: 'Value', - buildSegmentTips: 'The current step has {segments} segments in parallel, where {successLen} success, {pendingLen} pending, and {runningLen} executing.', + buildSegmentTips: 'The current step has {segments} segments in parallel, where {successLen} success, {warningLen} segments wasn\'t built due to data inconsistency, {pendingLen} pending, and {runningLen} executing.', viewDetails: 'View Details', + DATA_INCONSISTENT: 'this segment wasn\'t built due to data inconsistency', + dataInconsistentInfo: 'The count() number in the Hive table corresponding to the segment is different from the existing indexes, or the count() number of the existing indexes is different from each other. It results in some inedx unbuilt in the segments.<br/> If you still want to build this part of the index, please try one of the following methods:<br/>1）Refresh all indexes in the segment based on Hive.<br/>2) Update the Hive table to resolve the data inconsistency with existing in [...] segmentDetail: 'Segment Details', errorDetail: 'Error Details', resolveErrorBtn: 'View Solution', @@ -144,11 +149,13 @@ export default { step_discarded: 'Discarded', step_stopped: 'Paused', step_skip: 'Skipped', + step_warning: 'A data issue is found', errorStepTips: 'Job interrupted, "{name}" step error', noErrorMsg: 'No error message', chRestartTips: 'Can\'t restart the current job where some data has been loaded.', fullOptimization: 'Full Optimization', loadInternalTableStep: 'Load Internal Table', - loadGlutenCacheStep: 'Load Internal Table Cache' + loadGlutenCacheStep: 'Load Gluten Cache', + partitions: 'Paritions' } } diff --git a/pom.xml b/pom.xml index 3071825103..108905a3b7 100644 --- a/pom.xml +++ b/pom.xml @@ -121,10 +121,6 @@ <libthrift.version>0.14.0</libthrift.version> <libfb303.version>0.9.3</libfb303.version> - <!-- soft affinity --> - <alluxio.version>2.7.4</alluxio.version> - <libthrift.version>0.12.0</libthrift.version> - <!-- Kafka versions --> <kafka.version>2.8.2</kafka.version> diff --git a/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java b/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java index 1e8e7ff913..c0b7f03fd2 100644 --- a/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java +++ b/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java @@ -91,25 +91,25 @@ public class KylinVersion implements Comparable { /** * Require MANUAL updating kylin version per ANY upgrading. */ - private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("5.0-SNAPSHOT"); + private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("5.0.2"); private static final KylinVersion VERSION_200 = new KylinVersion("2.0.0"); private static final Set<KylinVersion> SIGNATURE_INCOMPATIBLE_REVISIONS = new HashSet<KylinVersion>(); /* - * 1.5.1 is actually compatible with 1.5.0's cube. However, + * 1.5.1 is actually compatible with 1.5.0's cube. However, * the "calculate signature" method in 1.5.1 code base somehow - * gives different signature values for 1.5.0 cubes. + * gives different signature values for 1.5.0 cubes. * To prevent from users having to take care of this mess, as people * usually won't expect to take lots of efforts for small upgrade (from 1.5.0 to 1.5.1), a special list of * SIGNATURE_INCOMPATIBLE_REVISIONS is introduced to silently take care of such legacy cubes. * - * We should NEVER add new stuff to SIGNATURE_INCOMPATIBLE_REVISIONS. + * We should NEVER add new stuff to SIGNATURE_INCOMPATIBLE_REVISIONS. * "calculate signature" should always return consistent values - * to compatible versions. If it's impossible to maintain consistent signatures between upgrade, + * to compatible versions. If it's impossible to maintain consistent signatures between upgrade, * we should increase the minor version, - * e.g. it's better to skip 1.5.1 and use 1.6.0 as the next release version to 1.5.0, + * e.g. it's better to skip 1.5.1 and use 1.6.0 as the next release version to 1.5.0, * or even to use 2.0.0, as people tends to accept * doing more (e.g. Having to use sth like a metastore upgrade tool when upgrading Kylin) */ diff --git a/src/core-common/src/main/resources/kylin-defaults0.properties b/src/core-common/src/main/resources/kylin-defaults0.properties index bd4f910e79..dc1b57b9ed 100644 --- a/src/core-common/src/main/resources/kylin-defaults0.properties +++ b/src/core-common/src/main/resources/kylin-defaults0.properties @@ -98,6 +98,7 @@ kylin.engine.spark-conf.spark.sql.hive.metastore.jars=${KYLIN_HOME}/spark/hive_1 # for V3 Dictionary kylin.engine.spark-conf.spark.sql.extensions=io.delta.sql.DeltaSparkSessionExtension +kylin.engine.spark-conf.spark.sql.catalog.spark_catalog=org.apache.spark.sql.delta.catalog.DeltaCatalog kylin.engine.spark-conf.spark.sql.catalog.delta=org.apache.spark.sql.delta.catalog.DeltaCatalog kylin.engine.spark-conf.spark.databricks.delta.retentionDurationCheck.enabled=false kylin.engine.spark-conf.spark.databricks.delta.vacuum.parallelDelete.enabled=true @@ -176,6 +177,7 @@ kylin.storage.columnar.spark-conf.spark.sql.hive.metastore.version=1.2.2 kylin.storage.columnar.spark-conf.spark.sql.hive.metastore.jars=${KYLIN_HOME}/spark/hive_1_2_2/* kylin.storage.columnar.spark-conf.spark.sql.extensions=io.delta.sql.DeltaSparkSessionExtension +kylin.storage.columnar.spark-conf.spark.sql.catalog.spark_catalog=org.apache.spark.sql.delta.catalog.DeltaCatalog kylin.storage.columnar.spark-conf.spark.sql.catalog.delta=org.apache.spark.sql.delta.catalog.DeltaCatalog # to avoid cartesian partition oom, set to -1 or empty to turn off diff --git a/src/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java b/src/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java index 4cdcfdb101..639dc200e0 100644 --- a/src/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java +++ b/src/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java @@ -83,20 +83,20 @@ public final class ExecutableConstants { public static final String STEP_NAME_INDEX_PLAN_OPT = "IndexPlan Optimize"; public static final String STAGE_NAME_COST_BASED_PLANNER = "Cost based planner"; - public static final String STAGE_NAME_WAIT_FOR_RESOURCE = "Wait for yarn resource"; - public static final String STAGE_NAME_REFRESH_SNAPSHOT = "Refresh snapshot"; - public static final String STAGE_NAME_MATERIALIZE_FACT_VIEW = "Materialize fact view"; - public static final String STAGE_NAME_BUILD_GLOBAL_DICT = "Build global dictionary"; - public static final String STAGE_NAME_MATERIALIZE_FLAT_TABLE = "Materialize flat table"; + public static final String STAGE_NAME_WAIT_FOR_RESOURCE = "Waiting for yarn resources"; + public static final String STAGE_NAME_REFRESH_SNAPSHOT = "Build or refresh snapshot"; + public static final String STAGE_NAME_MATERIALIZED_FACT_TABLE = "Materialize fact table view"; + public static final String STAGE_NAME_BUILD_GLOBAL_DICT = "Generate global dictionary"; + public static final String STAGE_NAME_GENERATE_FLAT_TABLE = "Generate flat table"; public static final String STAGE_NAME_OPTIMIZE_INDEX_PLAN = "Optimize index plan"; - public static final String STAGE_NAME_BUILD_FLAT_TABLE_STATS = "Build flat table statistics"; + public static final String STAGE_NAME_GATHER_FLAT_TABLE_STATS = "Get flat table statistics"; public static final String STAGE_NAME_BUILD_LAYER = "Build indexes by layer"; public static final String STAGE_NAME_REFRESH_COLUMN_BYTES = "Update flat table statistics"; public static final String STAGE_NAME_MERGE_FLAT_TABLE = "Merge flat table"; public static final String STAGE_NAME_MERGE_INDICES = "Merge indexes"; public static final String STAGE_NAME_MERGE_COLUMN_BYTES = "Merge flat table statistics"; public static final String STAGE_NAME_TABLE_SAMPLING = "Sample Table Data"; - public static final String STAGE_NAME_BUILD_SNAPSHOT = "Build snapshot"; + public static final String STAGE_NAME_BUILD_SNAPSHOT = "Build Snapshot"; public static final String STAGE_NAME_DELETE_USELESS_LAYOUT_DATA = "delete useless layout data"; public static final String STAGE_NAME_OPTIMIZE_LAYOUT_DATA_REPARTITION = "Optimize layout data by repartition"; public static final String STAGE_NAME_OPTIMIZE_LAYOUT_DATA_ZORDER = "Optimize layout data by zorder"; diff --git a/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/job/StageEnum.java b/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/job/StageEnum.java index 4855e2476b..dfbd676243 100644 --- a/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/job/StageEnum.java +++ b/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/job/StageEnum.java @@ -94,7 +94,7 @@ public enum StageEnum { @Override public StageExecutable createExecutable() { - return new StageExecutable(ExecutableConstants.STAGE_NAME_MATERIALIZE_FACT_VIEW); + return new StageExecutable(ExecutableConstants.STAGE_NAME_MATERIALIZED_FACT_TABLE); } }, @@ -125,7 +125,7 @@ public enum StageEnum { @Override public StageExecutable createExecutable() { - return new StageExecutable(ExecutableConstants.STAGE_NAME_MATERIALIZE_FLAT_TABLE); + return new StageExecutable(ExecutableConstants.STAGE_NAME_GENERATE_FLAT_TABLE); } }, @@ -156,7 +156,7 @@ public enum StageEnum { @Override public StageExecutable createExecutable() { - return new StageExecutable(ExecutableConstants.STAGE_NAME_BUILD_FLAT_TABLE_STATS); + return new StageExecutable(ExecutableConstants.STAGE_NAME_GATHER_FLAT_TABLE_STATS); } }, diff --git a/src/spark-project/sparder/src/main/scala/org/apache/spark/sql/KylinSession.scala b/src/spark-project/sparder/src/main/scala/org/apache/spark/sql/KylinSession.scala index 48d41b403c..e9c86b5394 100644 --- a/src/spark-project/sparder/src/main/scala/org/apache/spark/sql/KylinSession.scala +++ b/src/spark-project/sparder/src/main/scala/org/apache/spark/sql/KylinSession.scala @@ -318,25 +318,6 @@ object KylinSession extends Logging { sparkConf.set("spark.driver.host", AddressUtil.getLocalHostExactAddress) } - var extraJars = Paths.get(KylinConfig.getInstanceFromEnv.getKylinJobJarPath).getFileName.toString - if (KylinConfig.getInstanceFromEnv.queryUseGlutenEnabled) { - if (sparkConf.get(SPARK_MASTER).startsWith("yarn")) { - val distFiles = sparkConf.get(SPARK_YARN_DIST_FILE) - if (distFiles.isEmpty) { - sparkConf.set(SPARK_YARN_DIST_FILE, - sparkConf.get(SPARK_EXECUTOR_JAR_PATH)) - } else { - sparkConf.set(SPARK_YARN_DIST_FILE, - sparkConf.get(SPARK_EXECUTOR_JAR_PATH) + "," + distFiles) - } - extraJars = "gluten.jar" + File.pathSeparator + extraJars - } else { - extraJars = sparkConf.get(SPARK_EXECUTOR_JAR_PATH) + - File.pathSeparator + extraJars - } - } - sparkConf.set("spark.executor.extraClassPath", extraJars) - val krb5conf = " -Djava.security.krb5.conf=./__spark_conf__/__hadoop_conf__/krb5.conf" val executorExtraJavaOptions = sparkConf.get("spark.executor.extraJavaOptions", "")
