You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/06/16 06:52:33 UTC

[kylin] 03/04: KYLIN-3408 update web links from front end

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch v2.4.0-release
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit b7d0e4786ca90e74cfbf33a8661f4404b8214ac3
Author: shaofengshi <sh...@apache.org>
AuthorDate: Sat Jun 16 14:13:17 2018 +0800

    KYLIN-3408 update web links from front end
---
 core-common/src/main/resources/kylin-defaults.properties | 16 ++++++++--------
 .../sample_cube/template/cube_desc/kylin_sales_cube.json |  4 +++-
 .../org/apache/kylin/rest/service/AdminServiceTest.java  | 10 +++++-----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties
index 37520ef..a69f4ea 100644
--- a/core-common/src/main/resources/kylin-defaults.properties
+++ b/core-common/src/main/resources/kylin-defaults.properties
@@ -66,11 +66,11 @@ kylin.engine.default=2
 kylin.storage.default=2
 kylin.web.hive-limit=20
 kylin.web.help.length=4
-kylin.web.help.0=start|Getting Started|http://kylin.apache.org/docs21/tutorial/kylin_sample.html
-kylin.web.help.1=odbc|ODBC Driver|http://kylin.apache.org/docs21/tutorial/odbc.html
-kylin.web.help.2=tableau|Tableau Guide|http://kylin.apache.org/docs21/tutorial/tableau_91.html
-kylin.web.help.3=onboard|Cube Design Tutorial|http://kylin.apache.org/docs21/howto/howto_optimize_cubes.html
-kylin.web.link-streaming-guide=http://kylin.apache.org/
+kylin.web.help.0=start|Getting Started|http://kylin.apache.org/docs/tutorial/kylin_sample.html
+kylin.web.help.1=odbc|ODBC Driver|http://kylin.apache.org/docs/tutorial/odbc.html
+kylin.web.help.2=tableau|Tableau Guide|http://kylin.apache.org/docs/tutorial/tableau_91.html
+kylin.web.help.3=onboard|Cube Design Tutorial|http://kylin.apache.org/docs/tutorial/create_cube.html
+kylin.web.link-streaming-guide=https://kylin.apache.org/docs/tutorial/cube_streaming.html
 kylin.htrace.show-gui-trace-toggle=false
 kylin.web.link-hadoop=
 kylin.web.link-diagnostic=
@@ -303,9 +303,9 @@ kylin.engine.spark-conf.spark.hadoop.yarn.timeline-service.enabled=false
 #kylin.engine.spark-conf.spark.io.compression.codec=org.apache.spark.io.SnappyCompressionCodec
 
 # uncomment for HDP
-#kylin.engine.spark-conf.spark.driver.extraJavaOptions=-Dhdp.version=current
-#kylin.engine.spark-conf.spark.yarn.am.extraJavaOptions=-Dhdp.version=current
-#kylin.engine.spark-conf.spark.executor.extraJavaOptions=-Dhdp.version=current
+kylin.engine.spark-conf.spark.driver.extraJavaOptions=-Dhdp.version=current
+kylin.engine.spark-conf.spark.yarn.am.extraJavaOptions=-Dhdp.version=current
+kylin.engine.spark-conf.spark.executor.extraJavaOptions=-Dhdp.version=current
 
 
 ### QUERY PUSH DOWN ###
diff --git a/examples/sample_cube/template/cube_desc/kylin_sales_cube.json b/examples/sample_cube/template/cube_desc/kylin_sales_cube.json
index 124fc73..230623f 100644
--- a/examples/sample_cube/template/cube_desc/kylin_sales_cube.json
+++ b/examples/sample_cube/template/cube_desc/kylin_sales_cube.json
@@ -275,7 +275,9 @@
   "engine_type" : %default_engine_type%,
   "storage_type" : %default_storage_type%,
   "override_kylin_properties" : {
-    "kylin.cube.aggrgroup.is-mandatory-only-valid" : "true"
+    "kylin.cube.aggrgroup.is-mandatory-only-valid" : "true",
+    "kylin.cube.size-estimate-ratio": "0.01",
+    "kylin.engine.spark.rdd-partition-cut-mb": "50"
   },
   "cuboid_black_list" : [ ],
   "parent_forward" : 3,
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 cc0421a..600897a 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
@@ -49,7 +49,7 @@ public class AdminServiceTest extends ServiceTestBase {
         KylinConfig config = KylinConfig.createInstanceFromUri(path);
         try (SetAndUnsetThreadLocalConfig autoUnset = KylinConfig.setAndUnsetThreadLocalConfig(config)) {
         
-            String expected = "kylin.web.link-streaming-guide=http://kylin.apache.org/\n" +
+            String expected = "kylin.web.link-streaming-guide=https://kylin.apache.org/docs/tutorial/cube_streaming.html\n" +
                     "kylin.web.dashboard-enabled=\n" +
                     "kylin.web.contact-mail=\n" +
                     "kylin.query.cache-enabled=true\n" +
@@ -69,10 +69,10 @@ public class AdminServiceTest extends ServiceTestBase {
                     "kylin.env=QA\n" +
                     "kylin.web.hive-limit=20\n" +
                     "kylin.engine.default=2\n" +
-                    "kylin.web.help.3=onboard|Cube Design Tutorial|http://kylin.apache.org/docs21/howto/howto_optimize_cubes.html\n" +
-                    "kylin.web.help.2=tableau|Tableau Guide|http://kylin.apache.org/docs21/tutorial/tableau_91.html\n" +
-                    "kylin.web.help.1=odbc|ODBC Driver|http://kylin.apache.org/docs21/tutorial/odbc.html\n" +
-                    "kylin.web.help.0=start|Getting Started|http://kylin.apache.org/docs21/tutorial/kylin_sample.html\n" +
+                    "kylin.web.help.3=onboard|Cube Design Tutorial|http://kylin.apache.org/docs/tutorial/create_cube.html\n" +
+                    "kylin.web.help.2=tableau|Tableau Guide|http://kylin.apache.org/docs/tutorial/tableau_91.html\n" +
+                    "kylin.web.help.1=odbc|ODBC Driver|http://kylin.apache.org/docs/tutorial/odbc.html\n" +
+                    "kylin.web.help.0=start|Getting Started|http://kylin.apache.org/docs/tutorial/kylin_sample.html\n" +
                     "kylin.security.profile=testing\n";
             Assert.assertEquals(expected, adminService.getPublicConfig());
         }

-- 
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.