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 14:14:02 UTC
[kylin] branch v2.4.0-release updated (89f3ce7 -> 6864a38)
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a change to branch v2.4.0-release
in repository https://gitbox.apache.org/repos/asf/kylin.git.
discard 89f3ce7 Revert "KYLIN-3250 Upgrade jetty version to 9.3.22.v20171030"
discard b7d0e47 KYLIN-3408 update web links from front end
discard 111cb28 KYLIN-3400 wipeCache and createCubeDesc make deadlock
new a8a3d15 KYLIN-3408 update web links from front end
new 0ebc58a Revert "KYLIN-3250 Upgrade jetty version to 9.3.22.v20171030"
new 6864a38 KYLIN-3400 wipeCache and createCubeDesc make deadlock
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (89f3ce7)
\
N -- N -- N refs/heads/v2.4.0-release (6864a38)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/kylin/cube/CubeDescManager.java | 2 +-
.../java/org/apache/kylin/cube/CubeManager.java | 22 +++----
.../kylin/metadata/TableMetadataManager.java | 22 ++++---
.../kylin/metadata/project/ProjectL2Cache.java | 4 --
.../kylin/metadata/project/ProjectManager.java | 68 ++++++++++------------
.../apache/kylin/rest/service/CacheService.java | 2 +-
6 files changed, 54 insertions(+), 66 deletions(-)
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.
[kylin] 01/03: KYLIN-3408 update web links from front end
Posted by sh...@apache.org.
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 a8a3d158144b57acf3e5f46ec555417dbf2f64b2
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.
[kylin] 03/03: KYLIN-3400 wipeCache and createCubeDesc make deadlock
Posted by sh...@apache.org.
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 6864a38ec2e6d4eb4f7a22e66da676ae759edae2
Author: shaofengshi <sh...@apache.org>
AuthorDate: Sat Jun 16 22:13:39 2018 +0800
KYLIN-3400 wipeCache and createCubeDesc make deadlock
---
.../src/main/java/org/apache/kylin/metadata/project/ProjectManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
index aae692d..5122fd8 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
@@ -124,7 +124,7 @@ public class ProjectManager {
public ProjectInstance reloadProjectQuietly(String project) throws IOException {
try (AutoLock lock = prjMapLock.lockForWrite()) {
ProjectInstance prj = crud.reloadQuietly(project);
- reloadProjectL2Cache(project);
+ clearL2Cache();
return prj;
}
}
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.
[kylin] 02/03: Revert "KYLIN-3250 Upgrade jetty version to
9.3.22.v20171030"
Posted by sh...@apache.org.
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 0ebc58a64402d78d0b5940d1b72a7b8672c59657
Author: shaofengshi <sh...@apache.org>
AuthorDate: Sat Jun 16 14:14:30 2018 +0800
Revert "KYLIN-3250 Upgrade jetty version to 9.3.22.v20171030"
This reverts commit 999f1f0089baf41bf4e3b546abe0af6384ab1b25.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bfcbcb2..54ef7eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
<mrunit.version>1.1.0</mrunit.version>
<dbunit.version>2.5.4</dbunit.version>
<h2.version>1.4.196</h2.version>
- <jetty.version>9.3.22.v20171030</jetty.version>
+ <jetty.version>9.2.20.v20161216</jetty.version>
<jamm.version>0.3.1</jamm.version>
<mockito.version>2.7.14</mockito.version>
<powermock.version>1.7.0</powermock.version>
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.