[39/50] [abbrv] kylin git commit: KYLIN-2245 further minor refactor

[lidong]

KYLIN-2245 further minor refactor


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

Branch: refs/heads/master-cdh5.7
Commit: 9968c2257c2a8605637a93830d1d95db94185dce
Parents: fc1e11a
Author: Li Yang 
Authored: Tue Dec 6 11:10:26 2016 +0800
Committer: Li Yang 
Committed: Tue Dec 6 11:10:26 2016 +0800

--
 .../org/apache/kylin/cube/CubeInstance.java |  2 +-
 .../java/org/apache/kylin/cube/CubeSegment.java |  3 ++-
 .../apache/kylin/metadata/model/ISegment.java   |  3 +++
 .../apache/kylin/metadata/model/Segments.java   | 15 +++
 .../test_case_data/sandbox/kylin_hive_conf.xml  | 20 +---
 5 files changed, 10 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/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 a3665f5..1d60575 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
@@ -368,7 +368,7 @@ public class CubeInstance extends RootPersistentEntity 
implements IRealization,
 }
 
 public Segments calculateToBeSegments(CubeSegment newSegment) {
-return segments.calculateToBeSegments(newSegment, 
getModel().getPartitionDesc().isPartitioned());
+return segments.calculateToBeSegments(newSegment);
 }
 
 public CubeSegment getLastSegment() {

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
index 5339d81..e155f86 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
@@ -361,7 +361,8 @@ public class CubeSegment implements 
Comparable, IBuildable, ISegmen
 return Segments.sourceOffsetContains(this, seg);
 }
 
-public void validate() {
+@Override
+public void validate() throws IllegalStateException {
 if 
(cubeInstance.getDescriptor().getModel().getPartitionDesc().isPartitioned()) {
 if (!isSourceOffsetsOn() && dateRangeStart >= dateRangeEnd)
 throw new IllegalStateException("Invalid segment, 
dateRangeStart(" + dateRangeStart + ") must be smaller than dateRangeEnd(" + 
dateRangeEnd + ") in segment " + this);

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
index f006613..d46ea96 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
@@ -37,4 +37,7 @@ public interface ISegment {
 public SegmentStatusEnum getStatus();
 
 public long getLastBuildTime();
+
+public void validate() throws IllegalStateException;
+
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
index 5198dc7..9371f76 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
@@ -229,7 +229,7 @@ public class Segments extends 
ArrayList {
  * - Favors new segments over the old
  * - Favors big segments over the small
  */
-public Segments calculateToBeSegments(ISegment newSegment, boolean 
isPartitioned) {
+public Segments calculateToBeSegments(ISegment newSegment) {
 
 Segments tobe = (Segments) this.clone();
 if (newSegment != null && !tobe.contains(newSegment)) {
@@ -242,12 +242,12 @@ public class Segments extends 
ArrayList {
 Collections.sort(tobe);
 
 ISegment firstSeg = tobe.getFirst();
-

[40/50] [abbrv] kylin git commit: KYLIN-2245 further minor refactor

[lidong]

KYLIN-2245 further minor refactor


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

Branch: refs/heads/master-hbase1.x
Commit: 9968c2257c2a8605637a93830d1d95db94185dce
Parents: fc1e11a
Author: Li Yang 
Authored: Tue Dec 6 11:10:26 2016 +0800
Committer: Li Yang 
Committed: Tue Dec 6 11:10:26 2016 +0800

--
 .../org/apache/kylin/cube/CubeInstance.java |  2 +-
 .../java/org/apache/kylin/cube/CubeSegment.java |  3 ++-
 .../apache/kylin/metadata/model/ISegment.java   |  3 +++
 .../apache/kylin/metadata/model/Segments.java   | 15 +++
 .../test_case_data/sandbox/kylin_hive_conf.xml  | 20 +---
 5 files changed, 10 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/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 a3665f5..1d60575 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
@@ -368,7 +368,7 @@ public class CubeInstance extends RootPersistentEntity 
implements IRealization,
 }
 
 public Segments calculateToBeSegments(CubeSegment newSegment) {
-return segments.calculateToBeSegments(newSegment, 
getModel().getPartitionDesc().isPartitioned());
+return segments.calculateToBeSegments(newSegment);
 }
 
 public CubeSegment getLastSegment() {

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
index 5339d81..e155f86 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
@@ -361,7 +361,8 @@ public class CubeSegment implements 
Comparable, IBuildable, ISegmen
 return Segments.sourceOffsetContains(this, seg);
 }
 
-public void validate() {
+@Override
+public void validate() throws IllegalStateException {
 if 
(cubeInstance.getDescriptor().getModel().getPartitionDesc().isPartitioned()) {
 if (!isSourceOffsetsOn() && dateRangeStart >= dateRangeEnd)
 throw new IllegalStateException("Invalid segment, 
dateRangeStart(" + dateRangeStart + ") must be smaller than dateRangeEnd(" + 
dateRangeEnd + ") in segment " + this);

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
index f006613..d46ea96 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
@@ -37,4 +37,7 @@ public interface ISegment {
 public SegmentStatusEnum getStatus();
 
 public long getLastBuildTime();
+
+public void validate() throws IllegalStateException;
+
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
index 5198dc7..9371f76 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
@@ -229,7 +229,7 @@ public class Segments extends 
ArrayList {
  * - Favors new segments over the old
  * - Favors big segments over the small
  */
-public Segments calculateToBeSegments(ISegment newSegment, boolean 
isPartitioned) {
+public Segments calculateToBeSegments(ISegment newSegment) {
 
 Segments tobe = (Segments) this.clone();
 if (newSegment != null && !tobe.contains(newSegment)) {
@@ -242,12 +242,12 @@ public class Segments extends 
ArrayList {
 Collections.sort(tobe);
 
 ISegment firstSeg = tobe.getFirst();
-

kylin git commit: KYLIN-2245 further minor refactor

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/master fc1e11aa8 -> 9968c2257


KYLIN-2245 further minor refactor


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

Branch: refs/heads/master
Commit: 9968c2257c2a8605637a93830d1d95db94185dce
Parents: fc1e11a
Author: Li Yang 
Authored: Tue Dec 6 11:10:26 2016 +0800
Committer: Li Yang 
Committed: Tue Dec 6 11:10:26 2016 +0800

--
 .../org/apache/kylin/cube/CubeInstance.java |  2 +-
 .../java/org/apache/kylin/cube/CubeSegment.java |  3 ++-
 .../apache/kylin/metadata/model/ISegment.java   |  3 +++
 .../apache/kylin/metadata/model/Segments.java   | 15 +++
 .../test_case_data/sandbox/kylin_hive_conf.xml  | 20 +---
 5 files changed, 10 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/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 a3665f5..1d60575 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
@@ -368,7 +368,7 @@ public class CubeInstance extends RootPersistentEntity 
implements IRealization,
 }
 
 public Segments calculateToBeSegments(CubeSegment newSegment) {
-return segments.calculateToBeSegments(newSegment, 
getModel().getPartitionDesc().isPartitioned());
+return segments.calculateToBeSegments(newSegment);
 }
 
 public CubeSegment getLastSegment() {

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
index 5339d81..e155f86 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
@@ -361,7 +361,8 @@ public class CubeSegment implements 
Comparable, IBuildable, ISegmen
 return Segments.sourceOffsetContains(this, seg);
 }
 
-public void validate() {
+@Override
+public void validate() throws IllegalStateException {
 if 
(cubeInstance.getDescriptor().getModel().getPartitionDesc().isPartitioned()) {
 if (!isSourceOffsetsOn() && dateRangeStart >= dateRangeEnd)
 throw new IllegalStateException("Invalid segment, 
dateRangeStart(" + dateRangeStart + ") must be smaller than dateRangeEnd(" + 
dateRangeEnd + ") in segment " + this);

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
index f006613..d46ea96 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java
@@ -37,4 +37,7 @@ public interface ISegment {
 public SegmentStatusEnum getStatus();
 
 public long getLastBuildTime();
+
+public void validate() throws IllegalStateException;
+
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/9968c225/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
index 5198dc7..9371f76 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
@@ -229,7 +229,7 @@ public class Segments extends 
ArrayList {
  * - Favors new segments over the old
  * - Favors big segments over the small
  */
-public Segments calculateToBeSegments(ISegment newSegment, boolean 
isPartitioned) {
+public Segments calculateToBeSegments(ISegment newSegment) {
 
 Segments tobe = (Segments) this.clone();
 if (newSegment != null && !tobe.contains(newSegment)) {
@@ -242,12 +242,12 @@ public class Segments extends 
ArrayList {