Revert "Add new realization type HYBRID2" This reverts commit aa977f00d86cc3e5c9f94a704465adf14d7a0da8.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/604b3e0d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/604b3e0d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/604b3e0d Branch: refs/heads/ranger Commit: 604b3e0da007f6f0a29579188c3857a205a8edc0 Parents: 263791d Author: nichunen <chunen...@kyligence.io> Authored: Fri Sep 8 17:56:11 2017 +0800 Committer: Hongbin Ma <m...@kyligence.io> Committed: Fri Sep 8 17:59:52 2017 +0800 ---------------------------------------------------------------------- .../src/test/java/org/apache/kylin/RealizationRegistryTest.java | 2 +- .../org/apache/kylin/metadata/realization/RealizationType.java | 2 +- .../main/java/org/apache/kylin/storage/hybrid/HybridManager.java | 2 +- query/src/main/java/org/apache/kylin/query/routing/Candidate.java | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/604b3e0d/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java b/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java index 3590431..11723c8 100644 --- a/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java +++ b/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java @@ -47,6 +47,6 @@ public class RealizationRegistryTest extends LocalFileMetadataTestCase { public void test() throws Exception { final RealizationRegistry registry = RealizationRegistry.getInstance(KylinConfig.getInstanceFromEnv()); final Set<RealizationType> realizationTypes = registry.getRealizationTypes(); - assertEquals(RealizationType.values().length - 2, realizationTypes.size()); + assertEquals(RealizationType.values().length - 1, realizationTypes.size()); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/604b3e0d/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationType.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationType.java index fb58145..3fcfe63 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationType.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationType.java @@ -23,5 +23,5 @@ package org.apache.kylin.metadata.realization; //TODO: change to String for plugin public enum RealizationType { - CUBE, INVERTED_INDEX, HYBRID, HYBRID2 + CUBE, INVERTED_INDEX, HYBRID } http://git-wip-us.apache.org/repos/asf/kylin/blob/604b3e0d/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java ---------------------------------------------------------------------- diff --git a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java index 815d0ea..2b1c2cc 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java @@ -106,7 +106,7 @@ public class HybridManager implements IRealizationProvider { @Override public void onProjectSchemaChange(Broadcaster broadcaster, String project) throws IOException { for (IRealization real : ProjectManager.getInstance(config).listAllRealizations(project)) { - if (real instanceof HybridInstance && real.getType().equals(RealizationType.HYBRID)) { + if (real instanceof HybridInstance) { reloadHybridInstance(real.getName()); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/604b3e0d/query/src/main/java/org/apache/kylin/query/routing/Candidate.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/routing/Candidate.java b/query/src/main/java/org/apache/kylin/query/routing/Candidate.java index 8e8ce5e..bc17721 100644 --- a/query/src/main/java/org/apache/kylin/query/routing/Candidate.java +++ b/query/src/main/java/org/apache/kylin/query/routing/Candidate.java @@ -35,7 +35,6 @@ public class Candidate implements Comparable<Candidate> { static { DEFAULT_PRIORITIES.put(RealizationType.HYBRID, 0); - DEFAULT_PRIORITIES.put(RealizationType.HYBRID2, 0); DEFAULT_PRIORITIES.put(RealizationType.CUBE, 1); DEFAULT_PRIORITIES.put(RealizationType.INVERTED_INDEX, 1); }
