KYLIN-2255 drop v1 coprocessor in DeployCoprocessorCLI
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/af8940d5 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/af8940d5 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/af8940d5 Branch: refs/heads/master-hbase1.x Commit: af8940d5b38087f71edfe4d3eb4bb32af1177bab Parents: 8b64620 Author: Li Yang <liy...@apache.org> Authored: Thu Dec 8 15:06:04 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Dec 8 15:06:04 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/af8940d5/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java index 8f69c18..c8410f9 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java @@ -64,9 +64,9 @@ import com.google.common.collect.Lists; */ public class DeployCoprocessorCLI { - public static final String CubeObserverClass = "org.apache.kylin.storage.hbase.cube.v1.coprocessor.observer.AggregateRegionObserver"; public static final String CubeEndpointClass = "org.apache.kylin.storage.hbase.cube.v2.coprocessor.endpoint.CubeVisitService"; public static final String CubeObserverClassOld = "org.apache.kylin.storage.hbase.coprocessor.observer.AggregateRegionObserver"; + public static final String CubeObserverClassOld2 = "org.apache.kylin.storage.hbase.cube.v1.coprocessor.observer.AggregateRegionObserver"; public static final String IIEndpointClassOld = "org.apache.kylin.storage.hbase.coprocessor.endpoint.IIEndpoint"; public static final String IIEndpointClass = "org.apache.kylin.storage.hbase.ii.coprocessor.endpoint.IIEndpoint"; @@ -187,7 +187,6 @@ public class DeployCoprocessorCLI { public static void addCoprocessorOnHTable(HTableDescriptor desc, Path hdfsCoprocessorJar) throws IOException { logger.info("Add coprocessor on " + desc.getNameAsString()); desc.addCoprocessor(CubeEndpointClass, hdfsCoprocessorJar, 1001, null); - desc.addCoprocessor(CubeObserverClass, hdfsCoprocessorJar, 1002, null); } public static boolean resetCoprocessor(String tableName, HBaseAdmin hbaseAdmin, Path hdfsCoprocessorJar) throws IOException { @@ -207,8 +206,8 @@ public class DeployCoprocessorCLI { logger.info("Disable " + tableName); hbaseAdmin.disableTable(tableName); - while (desc.hasCoprocessor(CubeObserverClass)) { - desc.removeCoprocessor(CubeObserverClass); + while (desc.hasCoprocessor(CubeObserverClassOld2)) { + desc.removeCoprocessor(CubeObserverClassOld2); } while (desc.hasCoprocessor(CubeEndpointClass)) { desc.removeCoprocessor(CubeEndpointClass);
