[21/50] [abbrv] kylin git commit: KYLIN-2012 rename RealizationStatusEnum.DESCBROKEN to RealizationStatusEnum.BROKEN

2016-10-18 Thread lidong 
KYLIN-2012 rename RealizationStatusEnum.DESCBROKEN to 
RealizationStatusEnum.BROKEN


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5974fc08
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5974fc08
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5974fc08

Branch: refs/heads/master-cdh5.7
Commit: 5974fc0870be17a8801c55c7496093d42dbb7c4f
Parents: 36cf99e
Author: gaodayue 
Authored: Thu Oct 13 17:16:02 2016 +0800
Committer: gaodayue 
Committed: Thu Oct 13 17:16:02 2016 +0800

--
 .../main/java/org/apache/kylin/cube/CubeDescManager.java  |  4 ++--
 .../src/main/java/org/apache/kylin/cube/CubeInstance.java |  2 +-
 .../src/main/java/org/apache/kylin/cube/CubeManager.java  |  6 +++---
 .../java/org/apache/kylin/cube/CubeManagerCacheTest.java  |  4 ++--
 .../kylin/metadata/realization/RealizationStatusEnum.java |  2 +-
 .../org/apache/kylin/rest/controller/CubeController.java  |  2 +-
 .../java/org/apache/kylin/rest/service/JobService.java|  2 +-
 webapp/app/partials/cubes/cubes.html  | 10 +-
 8 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
index d6364fe..602707f 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
@@ -158,10 +158,10 @@ public class CubeDescManager {
 cubeDescMap.putLocal(ndesc.getName(), ndesc);
 Cuboid.reloadCache(name);
 
-// if related cube is in DESCBROKEN state before, change it back to 
DISABLED
+// if related cube is in BROKEN state before, change it back to 
DISABLED
 CubeManager cubeManager = CubeManager.getInstance(config);
 for (CubeInstance cube : cubeManager.getCubesByDesc(name)) {
-if (cube.getStatus() == RealizationStatusEnum.DESCBROKEN) {
+if (cube.getStatus() == RealizationStatusEnum.BROKEN) {
 cubeManager.reloadCubeLocal(cube.getName());
 }
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index 720690d..b8e9394 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -153,7 +153,7 @@ public class CubeInstance extends RootPersistentEntity 
implements IRealization,
 // in a temporary broken state, so that user can edit and fix it. Broken 
state is often due to
 // schema changes at source.
 public boolean allowBrokenDescriptor() {
-return (getStatus() == RealizationStatusEnum.DISABLED  || getStatus() 
== RealizationStatusEnum.DESCBROKEN) && segments.isEmpty();
+return (getStatus() == RealizationStatusEnum.DISABLED  || getStatus() 
== RealizationStatusEnum.BROKEN) && segments.isEmpty();
 }
 
 public String getResourcePath() {

http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index c558c6d..1ebeb60 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -994,12 +994,12 @@ public class CubeManager implements IRealizationProvider {
 checkNotNull(cubeDesc, "cube descriptor '%s' (for cube '%s') not 
found", cube.getDescName(), cubeName);
 
 if (!cubeDesc.getError().isEmpty()) {
-cube.setStatus(RealizationStatusEnum.DESCBROKEN);
+cube.setStatus(RealizationStatusEnum.BROKEN);
 logger.warn("cube descriptor {} (for cube '{}') is broken", 
cubeDesc.getResourcePath(), cubeName);
 
-} else if (cube.getStatus() == RealizationStatusEnum.DESCBROKEN) {
+} else if (cube.getStatus() == RealizationStatusEnum.BROKEN) {
 cube.setStatus(RealizationStatusEnum.DISABLED);
-logger.info("cube {} changed from DESCBROKEN to DISABLED", 
cubeName);
+logger.info("cube {} changed fro

[22/50] [abbrv] kylin git commit: KYLIN-2012 rename RealizationStatusEnum.DESCBROKEN to RealizationStatusEnum.BROKEN

2016-10-18 Thread lidong 
KYLIN-2012 rename RealizationStatusEnum.DESCBROKEN to 
RealizationStatusEnum.BROKEN


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5974fc08
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5974fc08
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5974fc08

Branch: refs/heads/master-hbase1.x
Commit: 5974fc0870be17a8801c55c7496093d42dbb7c4f
Parents: 36cf99e
Author: gaodayue 
Authored: Thu Oct 13 17:16:02 2016 +0800
Committer: gaodayue 
Committed: Thu Oct 13 17:16:02 2016 +0800

--
 .../main/java/org/apache/kylin/cube/CubeDescManager.java  |  4 ++--
 .../src/main/java/org/apache/kylin/cube/CubeInstance.java |  2 +-
 .../src/main/java/org/apache/kylin/cube/CubeManager.java  |  6 +++---
 .../java/org/apache/kylin/cube/CubeManagerCacheTest.java  |  4 ++--
 .../kylin/metadata/realization/RealizationStatusEnum.java |  2 +-
 .../org/apache/kylin/rest/controller/CubeController.java  |  2 +-
 .../java/org/apache/kylin/rest/service/JobService.java|  2 +-
 webapp/app/partials/cubes/cubes.html  | 10 +-
 8 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
index d6364fe..602707f 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
@@ -158,10 +158,10 @@ public class CubeDescManager {
 cubeDescMap.putLocal(ndesc.getName(), ndesc);
 Cuboid.reloadCache(name);
 
-// if related cube is in DESCBROKEN state before, change it back to 
DISABLED
+// if related cube is in BROKEN state before, change it back to 
DISABLED
 CubeManager cubeManager = CubeManager.getInstance(config);
 for (CubeInstance cube : cubeManager.getCubesByDesc(name)) {
-if (cube.getStatus() == RealizationStatusEnum.DESCBROKEN) {
+if (cube.getStatus() == RealizationStatusEnum.BROKEN) {
 cubeManager.reloadCubeLocal(cube.getName());
 }
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index 720690d..b8e9394 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -153,7 +153,7 @@ public class CubeInstance extends RootPersistentEntity 
implements IRealization,
 // in a temporary broken state, so that user can edit and fix it. Broken 
state is often due to
 // schema changes at source.
 public boolean allowBrokenDescriptor() {
-return (getStatus() == RealizationStatusEnum.DISABLED  || getStatus() 
== RealizationStatusEnum.DESCBROKEN) && segments.isEmpty();
+return (getStatus() == RealizationStatusEnum.DISABLED  || getStatus() 
== RealizationStatusEnum.BROKEN) && segments.isEmpty();
 }
 
 public String getResourcePath() {

http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index c558c6d..1ebeb60 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -994,12 +994,12 @@ public class CubeManager implements IRealizationProvider {
 checkNotNull(cubeDesc, "cube descriptor '%s' (for cube '%s') not 
found", cube.getDescName(), cubeName);
 
 if (!cubeDesc.getError().isEmpty()) {
-cube.setStatus(RealizationStatusEnum.DESCBROKEN);
+cube.setStatus(RealizationStatusEnum.BROKEN);
 logger.warn("cube descriptor {} (for cube '{}') is broken", 
cubeDesc.getResourcePath(), cubeName);
 
-} else if (cube.getStatus() == RealizationStatusEnum.DESCBROKEN) {
+} else if (cube.getStatus() == RealizationStatusEnum.BROKEN) {
 cube.setStatus(RealizationStatusEnum.DISABLED);
-logger.info("cube {} changed from DESCBROKEN to DISABLED", 
cubeName);
+logger.info("cube {} changed f

kylin git commit: KYLIN-2012 rename RealizationStatusEnum.DESCBROKEN to RealizationStatusEnum.BROKEN

2016-10-13 Thread gaodayue 
Repository: kylin
Updated Branches:
  refs/heads/master 36cf99ef7 -> 5974fc087


KYLIN-2012 rename RealizationStatusEnum.DESCBROKEN to 
RealizationStatusEnum.BROKEN


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5974fc08
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5974fc08
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5974fc08

Branch: refs/heads/master
Commit: 5974fc0870be17a8801c55c7496093d42dbb7c4f
Parents: 36cf99e
Author: gaodayue 
Authored: Thu Oct 13 17:16:02 2016 +0800
Committer: gaodayue 
Committed: Thu Oct 13 17:16:02 2016 +0800

--
 .../main/java/org/apache/kylin/cube/CubeDescManager.java  |  4 ++--
 .../src/main/java/org/apache/kylin/cube/CubeInstance.java |  2 +-
 .../src/main/java/org/apache/kylin/cube/CubeManager.java  |  6 +++---
 .../java/org/apache/kylin/cube/CubeManagerCacheTest.java  |  4 ++--
 .../kylin/metadata/realization/RealizationStatusEnum.java |  2 +-
 .../org/apache/kylin/rest/controller/CubeController.java  |  2 +-
 .../java/org/apache/kylin/rest/service/JobService.java|  2 +-
 webapp/app/partials/cubes/cubes.html  | 10 +-
 8 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
index d6364fe..602707f 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
@@ -158,10 +158,10 @@ public class CubeDescManager {
 cubeDescMap.putLocal(ndesc.getName(), ndesc);
 Cuboid.reloadCache(name);
 
-// if related cube is in DESCBROKEN state before, change it back to 
DISABLED
+// if related cube is in BROKEN state before, change it back to 
DISABLED
 CubeManager cubeManager = CubeManager.getInstance(config);
 for (CubeInstance cube : cubeManager.getCubesByDesc(name)) {
-if (cube.getStatus() == RealizationStatusEnum.DESCBROKEN) {
+if (cube.getStatus() == RealizationStatusEnum.BROKEN) {
 cubeManager.reloadCubeLocal(cube.getName());
 }
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index 720690d..b8e9394 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -153,7 +153,7 @@ public class CubeInstance extends RootPersistentEntity 
implements IRealization,
 // in a temporary broken state, so that user can edit and fix it. Broken 
state is often due to
 // schema changes at source.
 public boolean allowBrokenDescriptor() {
-return (getStatus() == RealizationStatusEnum.DISABLED  || getStatus() 
== RealizationStatusEnum.DESCBROKEN) && segments.isEmpty();
+return (getStatus() == RealizationStatusEnum.DISABLED  || getStatus() 
== RealizationStatusEnum.BROKEN) && segments.isEmpty();
 }
 
 public String getResourcePath() {

http://git-wip-us.apache.org/repos/asf/kylin/blob/5974fc08/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index c558c6d..1ebeb60 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -994,12 +994,12 @@ public class CubeManager implements IRealizationProvider {
 checkNotNull(cubeDesc, "cube descriptor '%s' (for cube '%s') not 
found", cube.getDescName(), cubeName);
 
 if (!cubeDesc.getError().isEmpty()) {
-cube.setStatus(RealizationStatusEnum.DESCBROKEN);
+cube.setStatus(RealizationStatusEnum.BROKEN);
 logger.warn("cube descriptor {} (for cube '{}') is broken", 
cubeDesc.getResourcePath(), cubeName);
 
-} else if (cube.getStatus() == RealizationStatusEnum.DESCBROKEN) {
+} else if (cube.getStatus() == RealizationStatusEnum.BROKEN) {
 cube.setStatus(RealizationStatusEnum.DISABLED);
-logger.info("cube {} changed from DESCBROKEN t