This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this
push:
new c23ab54 KYLIN-4631 Set the default build engine type to spark for
Kylin on Parquet
c23ab54 is described below
commit c23ab54ac858e68ade579da3e70fed37d2cc7365
Author: rupengwang <wangrup...@live.cn>
AuthorDate: Fri Jul 10 14:20:57 2020 +0800
KYLIN-4631 Set the default build engine type to spark for Kylin on Parquet
---
build/bin/sample.sh | 4 ++--
.../main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++--
core-common/src/main/resources/kylin-defaults.properties | 4 ++--
.../java/org/apache/kylin/metadata/model/IEngineAware.java | 12 ++++++------
.../java/org/apache/kylin/metadata/model/IStorageAware.java | 10 +++++-----
.../parquet_test/cube_desc/ci_inner_join_cube.json | 2 +-
.../parquet_test/cube_desc/ci_left_join_cube.json | 2 +-
examples/test_case_data/parquet_test/cube_desc/ssb.json | 4 ++--
.../java/org/apache/kylin/rest/service/AdminServiceTest.java | 2 +-
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/build/bin/sample.sh b/build/bin/sample.sh
index a6bea85..2e7e1bb 100755
--- a/build/bin/sample.sh
+++ b/build/bin/sample.sh
@@ -74,12 +74,12 @@ hadoop ${hadoop_conf_param} fs -rm -r
${hdfs_tmp_dir}/sample_cube
# set engine type and storage type to cube desc
default_engine_type=`bash ${KYLIN_HOME}/bin/get-properties.sh
kylin.engine.default`
if [ -z "$default_engine_type" ]; then
- default_engine_type=2
+ default_engine_type=6
fi
default_storage_type=`bash ${KYLIN_HOME}/bin/get-properties.sh
kylin.storage.default`
if [ -z "$default_storage_type" ]; then
- default_storage_type=2
+ default_storage_type=4
fi
mkdir -p ${KYLIN_HOME}/sample_cube/metadata
diff --git
a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 41f6f1a..516eda4 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -1250,7 +1250,7 @@ public abstract class KylinConfigBase implements
Serializable {
}
public int getDefaultStorageEngine() {
- return Integer.parseInt(getOptional("kylin.storage.default", "2"));
+ return Integer.parseInt(getOptional("kylin.storage.default", "4"));
}
public StorageURL getStorageUrl() {
@@ -1428,7 +1428,7 @@ public abstract class KylinConfigBase implements
Serializable {
}
public int getDefaultCubeEngine() {
- return Integer.parseInt(getOptional("kylin.engine.default", "2"));
+ return Integer.parseInt(getOptional("kylin.engine.default", "6"));
}
public String getKylinParquetJobJarPath() {
diff --git a/core-common/src/main/resources/kylin-defaults.properties
b/core-common/src/main/resources/kylin-defaults.properties
index 0a3d4ee..00f433d 100644
--- a/core-common/src/main/resources/kylin-defaults.properties
+++ b/core-common/src/main/resources/kylin-defaults.properties
@@ -68,8 +68,8 @@ kylin.restclient.connection.default-max-per-route=20
kylin.restclient.connection.max-total=200
### PUBLIC CONFIG ###
-kylin.engine.default=2
-kylin.storage.default=2
+kylin.engine.default=6
+kylin.storage.default=4
kylin.web.hive-limit=20
kylin.web.help.length=4
kylin.web.help.0=start|Getting
Started|http://kylin.apache.org/docs/tutorial/kylin_sample.html
diff --git
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
index d41ac88..3bbd5f8 100644
---
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
+++
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
@@ -21,14 +21,14 @@ package org.apache.kylin.metadata.model;
public interface IEngineAware {
@Deprecated
- public static final int ID_MR_V1 = 0;
+ int ID_MR_V1 = 0;
- public static final int ID_MR_V2 = 2;
- public static final int ID_MR_II = 3;
- public static final int ID_SPARK = 4;
- public static final int ID_FLINK = 5;
+ int ID_MR_V2 = 2;
+ int ID_MR_II = 3;
+ int ID_SPARK = 4;
+ int ID_FLINK = 5;
- public static final int ID_SPARK_II= 6;
+ int ID_SPARK_II= 6;
int getEngineType();
}
diff --git
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IStorageAware.java
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IStorageAware.java
index bf00b39..1066042 100644
---
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IStorageAware.java
+++
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IStorageAware.java
@@ -20,11 +20,11 @@ package org.apache.kylin.metadata.model;
public interface IStorageAware {
- public static final int ID_HBASE = 0;
- public static final int ID_HYBRID = 1;
- public static final int ID_SHARDED_HBASE = 2;
- public static final int ID_REALTIME_AND_HBASE = 3;
- public static final int ID_PARQUET = 4;
+ int ID_HBASE = 0;
+ int ID_HYBRID = 1;
+ int ID_SHARDED_HBASE = 2;
+ int ID_REALTIME_AND_HBASE = 3;
+ int ID_PARQUET = 4;
int getStorageType();
}
diff --git
a/examples/test_case_data/parquet_test/cube_desc/ci_inner_join_cube.json
b/examples/test_case_data/parquet_test/cube_desc/ci_inner_join_cube.json
index 5e8b519..dccaa1c 100644
--- a/examples/test_case_data/parquet_test/cube_desc/ci_inner_join_cube.json
+++ b/examples/test_case_data/parquet_test/cube_desc/ci_inner_join_cube.json
@@ -369,7 +369,7 @@
"volatile_range" : 0,
"retention_range" : 0,
"engine_type" : 6,
- "storage_type" : 2,
+ "storage_type" : 4,
"override_kylin_properties" : {
"kylin.cube.algorithm" : "LAYER",
"kylin.dictionary.shrunken-from-global-enabled" : "false"
diff --git
a/examples/test_case_data/parquet_test/cube_desc/ci_left_join_cube.json
b/examples/test_case_data/parquet_test/cube_desc/ci_left_join_cube.json
index 98a75ee..f4d0fd1 100644
--- a/examples/test_case_data/parquet_test/cube_desc/ci_left_join_cube.json
+++ b/examples/test_case_data/parquet_test/cube_desc/ci_left_join_cube.json
@@ -369,7 +369,7 @@
"volatile_range" : 0,
"retention_range" : 0,
"engine_type" : 6,
- "storage_type" : 2,
+ "storage_type" : 4,
"override_kylin_properties" : {
"kylin.cube.algorithm" : "INMEM",
"kylin.dictionary.shrunken-from-global-enabled" : "true"
diff --git a/examples/test_case_data/parquet_test/cube_desc/ssb.json
b/examples/test_case_data/parquet_test/cube_desc/ssb.json
index 280fc82..732f010 100644
--- a/examples/test_case_data/parquet_test/cube_desc/ssb.json
+++ b/examples/test_case_data/parquet_test/cube_desc/ssb.json
@@ -180,8 +180,8 @@
"partition_date_end" : 3153600000000,
"auto_merge_time_ranges" : [ 604800000, 2419200000 ],
"retention_range" : 0,
- "engine_type" : 2,
- "storage_type" : 2,
+ "engine_type" : 6,
+ "storage_type" : 4,
"override_kylin_properties" : {
"kylin.storage.hbase.compression-codec" : "lz4",
"kylin.cube.aggrgroup.is-mandatory-only-valid" : "true"
diff --git
a/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java
b/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java
index 27b59a0..dcbe492 100644
--- a/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java
@@ -71,7 +71,7 @@ public class AdminServiceTest extends ServiceTestBase {
"kylin.web.export-allow-admin=true\n" +
"kylin.env=QA\n" +
"kylin.web.hive-limit=20\n" +
- "kylin.engine.default=2\n" +
+ "kylin.engine.default=6\n" +
"kylin.web.help.3=onboard|Cube Design
Tutorial|http://kylin.apache.org/docs/howto/howto_optimize_cubes.html\n"; +
"kylin.web.default-time-filter=1\n" +
"kylin.web.help.2=tableau|Tableau
Guide|http://kylin.apache.org/docs/tutorial/tableau_91.html\n"; +
