From 93fb092b649228a5f5b309c0e839f9f1bce7bbdc Mon Sep 17 00:00:00 2001 From: shaofengshi Date: Wed, 3 Dec 2014 11:25:28 +0800 Subject: [PATCH] =?UTF-8?q?Need=20attache=20=E2=80=9C/model=5Fdesc?= =?UTF-8?q?=E2=80=9D=20as=20well=20as=20other=20metadata=20resources;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localmeta/cube_desc/test_kylin_cube_without_slr_desc.json | 1 - .../cube_desc/test_kylin_cube_without_slr_left_join_desc.json | 6 +++--- job/src/main/java/com/kylinolap/job/hadoop/AbstractHadoopJob.java | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json index 547f4f6..5716569 100644 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json +++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json @@ -19,7 +19,6 @@ }, { "name": "category", - "table": "test_category_groupings", "column": ["test_category_groupings.meta_categ_name", "test_category_groupings.categ_lvl2_name", "test_category_groupings.categ_lvl3_name"], "derived": [ "USER_DEFINED_FIELD1", diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json index 15f6e78..bab8c2c 100644 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json +++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json @@ -116,9 +116,9 @@ "parameter": { "type": "column", "value": "seller_id" - }, - "dependent_measure_ref" : "seller_cnt_hll" - } + } + }, + "dependent_measure_ref" : "seller_cnt_hll" }, { "id": "7", diff --git a/job/src/main/java/com/kylinolap/job/hadoop/AbstractHadoopJob.java b/job/src/main/java/com/kylinolap/job/hadoop/AbstractHadoopJob.java index 8131a72..5ec2d49 100644 --- a/job/src/main/java/com/kylinolap/job/hadoop/AbstractHadoopJob.java +++ b/job/src/main/java/com/kylinolap/job/hadoop/AbstractHadoopJob.java @@ -170,9 +170,10 @@ protected void attachKylinPropsAndMetadata(CubeInstance cube, Configuration conf File kylinPropsFile = new File(metaDir, "kylin.properties"); kylinConfig.writeProperties(kylinPropsFile); - // write cube / cube_desc / dict / table + // write cube / model_desc / cube_desc / dict / table ArrayList dumpList = new ArrayList(); dumpList.add(cube.getResourcePath()); + dumpList.add(cube.getDescriptor().getModel().getResourcePath()); dumpList.add(cube.getDescriptor().getResourcePath()); if (cube.isInvertedIndex()) { dumpList.add(cube.getInvertedIndexDesc().getResourcePath());