kylin git commit: KYLIN-2688 When the model has a ready cube, should not allow user to edit model JSON in web.
Repository: kylin
Updated Branches:
refs/heads/master d851c51d2 -> a8627e8a9
KYLIN-2688 When the model has a ready cube, should not allow user to edit model
JSON in web.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a8627e8a
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a8627e8a
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a8627e8a
Branch: refs/heads/master
Commit: a8627e8a9f264cc138124f3825d490463fa58480
Parents: d851c51
Author: 10069681
Authored: Tue Jun 27 15:09:56 2017 +0800
Committer: chenzhx <346839...@qq.com>
Committed: Thu Jun 29 19:16:02 2017 +0800
--
webapp/app/js/controllers/models.js | 13 -
webapp/app/partials/models/models_tree.html | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/kylin/blob/a8627e8a/webapp/app/js/controllers/models.js
--
diff --git a/webapp/app/js/controllers/models.js
b/webapp/app/js/controllers/models.js
index fd21845..1cc0c84 100644
--- a/webapp/app/js/controllers/models.js
+++ b/webapp/app/js/controllers/models.js
@@ -127,7 +127,7 @@ KylinApp.controller('ModelsCtrl', function ($scope, $q,
$routeParams, $location,
});
};
- $scope.editModel = function(model){
+ $scope.editModel = function(model, isEditJson){
var cubename = [];
var modelstate=false;
var i=0;
@@ -145,10 +145,13 @@ KylinApp.controller('ModelsCtrl', function ($scope, $q,
$routeParams, $location,
})
}
- if(modelstate==false){
-$location.path("/models/edit/"+model.name);
- }
- else{
+ if (modelstate==false){
+ if (isEditJson) {
+ $location.path("/models/edit/" + model.name +
"/descriptionjson");
+ } else {
+ $location.path("/models/edit/" + model.name);
+ }
+ } else {
SweetAlert.swal('Sorry','This model is still used by '+
cubename.join(','));
}
})
http://git-wip-us.apache.org/repos/asf/kylin/blob/a8627e8a/webapp/app/partials/models/models_tree.html
--
diff --git a/webapp/app/partials/models/models_tree.html
b/webapp/app/partials/models/models_tree.html
index c7b55a3..399f839 100644
--- a/webapp/app/partials/models/models_tree.html
+++ b/webapp/app/partials/models/models_tree.html
@@ -53,11 +53,11 @@
Action
- Edit
+ Edit
Clone
Drop
-Edit(JSON)
+Edit(JSON)
kylin git commit: KYLIN-2695 Should allow user to override spark conf in cube
Repository: kylin
Updated Branches:
refs/heads/master a8627e8a9 -> 804a1aa38
KYLIN-2695 Should allow user to override spark conf in cube
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/804a1aa3
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/804a1aa3
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/804a1aa3
Branch: refs/heads/master
Commit: 804a1aa3809e67d8e701f147bee794eec19d57e2
Parents: a8627e8
Author: kangkaisen
Authored: Wed Jun 28 20:21:52 2017 +0800
Committer: kangkaisen
Committed: Thu Jun 29 21:03:20 2017 +0800
--
.../java/org/apache/kylin/engine/spark/SparkExecutable.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/kylin/blob/804a1aa3/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
--
diff --git
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
index 1ed2235..1e032c6 100644
---
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
+++
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
@@ -23,6 +23,8 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.CliCommandExecutor;
+import org.apache.kylin.cube.CubeInstance;
+import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.job.common.PatternedLogger;
import org.apache.kylin.job.exception.ExecuteException;
import org.apache.kylin.job.execution.AbstractExecutable;
@@ -70,7 +72,10 @@ public class SparkExecutable extends AbstractExecutable {
@Override
protected ExecuteResult doWork(ExecutableContext context) throws
ExecuteException {
-final KylinConfig config = context.getConfig();
+String cubeName =
this.getParam(SparkCubingByLayer.OPTION_CUBE_NAME.getOpt());
+CubeInstance cube =
CubeManager.getInstance(context.getConfig()).getCube(cubeName);
+final KylinConfig config = cube.getConfig();
+
if (KylinConfig.getSparkHome() == null) {
throw new NullPointerException();
}
kylin git commit: KYLIN-2694 Fix ArrayIndexOutOfBoundsException in SparkCubingByLayer
Repository: kylin
Updated Branches:
refs/heads/master 804a1aa38 -> 547722d6a
KYLIN-2694 Fix ArrayIndexOutOfBoundsException in SparkCubingByLayer
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/547722d6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/547722d6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/547722d6
Branch: refs/heads/master
Commit: 547722d6a35344a5675d6d6ce9b885d8fdc58fc7
Parents: 804a1aa
Author: kangkaisen
Authored: Mon Jun 26 15:33:15 2017 +0800
Committer: kangkaisen
Committed: Thu Jun 29 21:13:06 2017 +0800
--
.../java/org/apache/kylin/engine/spark/SparkCubingByLayer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/kylin/blob/547722d6/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingByLayer.java
--
diff --git
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingByLayer.java
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingByLayer.java
index f70fd30..91aa9f7 100644
---
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingByLayer.java
+++
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingByLayer.java
@@ -269,7 +269,7 @@ public class SparkCubingByLayer extends AbstractApplication
implements Serializa
saveToHDFS(allRDDs[level], vCubeDesc.getValue(), outputPath,
level, confOverwrite);
allRDDs[level - 1].unpersist();
}
-allRDDs[totalLevels - 1].unpersist();
+allRDDs[totalLevels].unpersist();
logger.info("Finished on calculating all level cuboids.");
}
kylin git commit: KYLIN-2693 Should use overrideHiveConfig for LookupHiveViewMaterialization and RedistributeFlatHiveTable
Repository: kylin
Updated Branches:
refs/heads/master 547722d6a -> 772a95f3a
KYLIN-2693 Should use overrideHiveConfig for LookupHiveViewMaterialization and
RedistributeFlatHiveTable
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/772a95f3
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/772a95f3
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/772a95f3
Branch: refs/heads/master
Commit: 772a95f3a0aaafca5260140c461edb053990cfe8
Parents: 547722d
Author: kangkaisen
Authored: Tue Jun 27 20:02:04 2017 +0800
Committer: kangkaisen
Committed: Thu Jun 29 21:17:45 2017 +0800
--
.../src/main/java/org/apache/kylin/source/hive/HiveMRInput.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/kylin/blob/772a95f3/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
--
diff --git
a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
index 337bafd..4747cb9 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
@@ -206,6 +206,7 @@ public class HiveMRInput implements IMRInput {
}
HiveCmdBuilder hiveCmdBuilder = new HiveCmdBuilder();
+
hiveCmdBuilder.overwriteHiveProps(kylinConfig.getHiveConfigOverride());
hiveCmdBuilder.addStatement(hiveInitStatements);
for (TableDesc lookUpTableDesc : lookupViewsTables) {
String identity = lookUpTableDesc.getIdentity();
@@ -273,6 +274,7 @@ public class HiveMRInput implements IMRInput {
private void redistributeTable(KylinConfig config, int numReducers)
throws IOException {
final HiveCmdBuilder hiveCmdBuilder = new HiveCmdBuilder();
+hiveCmdBuilder.overwriteHiveProps(config.getHiveConfigOverride());
hiveCmdBuilder.addStatement(getInitStatement());
hiveCmdBuilder.addStatement("set mapreduce.job.reduces=" +
numReducers + ";\n");
hiveCmdBuilder.addStatement("set hive.merge.mapredfiles=false;\n");
kylin git commit: KYLIN-2652 Make kylinConfig threadsafe in CubeVisitService
Repository: kylin
Updated Branches:
refs/heads/master 772a95f3a -> a1e055a6b
KYLIN-2652 Make kylinConfig threadsafe in CubeVisitService
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a1e055a6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a1e055a6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a1e055a6
Branch: refs/heads/master
Commit: a1e055a6b448f7e797ea29bc97e84325b3056638
Parents: 772a95f
Author: kangkaisen
Authored: Fri May 26 12:30:17 2017 +0800
Committer: kangkaisen
Committed: Thu Jun 29 21:20:22 2017 +0800
--
.../hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/kylin/blob/a1e055a6/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
--
diff --git
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
index cde127e..c66af66 100644
---
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
+++
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
@@ -238,9 +238,8 @@ public class CubeVisitService extends
CubeVisitProtos.CubeVisitService implement
region.startRegionOperation();
// if user change kylin.properties on kylin server, need to
manually redeploy coprocessor jar to update KylinConfig of Env.
-String serverPropString = request.getKylinProperties();
-KylinConfig.setKylinConfigInEnvIfMissing(serverPropString);
-KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv();
+KylinConfig kylinConfig =
KylinConfig.createKylinConfig(request.getKylinProperties());
+KylinConfig.setKylinConfigThreadLocal(kylinConfig);
debugGitTag =
region.getTableDesc().getValue(IRealizationConstants.HTableGitTag);
@@ -425,8 +424,6 @@ public class CubeVisitService extends
CubeVisitProtos.CubeVisitService implement
@Override
public void stop(CoprocessorEnvironment env) throws IOException {
-// destroy KylinConfig when coprocessor stop
-KylinConfig.destroyInstance();
}
@Override
kylin git commit: KYLIN-2674 Should not catch OutOfMemoryError in coprocessor
Repository: kylin
Updated Branches:
refs/heads/master a1e055a6b -> 1eb32c3e6
KYLIN-2674 Should not catch OutOfMemoryError in coprocessor
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1eb32c3e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1eb32c3e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1eb32c3e
Branch: refs/heads/master
Commit: 1eb32c3e62d92142b4f7330ac10edd606c870307
Parents: a1e055a
Author: kangkaisen
Authored: Mon Jun 12 12:17:20 2017 +0800
Committer: kangkaisen
Committed: Thu Jun 29 21:23:43 2017 +0800
--
.../hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/kylin/blob/1eb32c3e/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
--
diff --git
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
index c66af66..3b26b71 100644
---
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
+++
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
@@ -394,10 +394,6 @@ public class CubeVisitService extends
CubeVisitProtos.CubeVisitService implement
logger.error(ioe.toString(), ioe);
IOException wrapped = new IOException("Error in coprocessor " +
debugGitTag, ioe);
ResponseConverter.setControllerException(controller, wrapped);
-} catch (OutOfMemoryError oom) {
-logger.error(oom.toString(), oom);
-IOException wrapped = new IOException("OOM in coprocessor " +
debugGitTag, oom);
-ResponseConverter.setControllerException(controller, wrapped);
} finally {
for (RegionScanner innerScanner : regionScanners) {
IOUtils.closeQuietly(innerScanner);
