You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/10/10 05:38:02 UTC
[5/6] kylin git commit: KYLIN-2072 further cleanup old streaming code
KYLIN-2072 further cleanup old streaming code
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ed643e6b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ed643e6b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ed643e6b
Branch: refs/heads/master
Commit: ed643e6b20e31a4c3a45d72dc8e5ff1287584764
Parents: c67fa74
Author: shaofengshi <sh...@apache.org>
Authored: Sun Oct 9 22:16:38 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Oct 10 13:32:44 2016 +0800
----------------------------------------------------------------------
.../kylin/common/util/StreamingBatch.java | 44 --------------------
.../kylin/common/util/StreamingMessage.java | 3 --
.../org/apache/kylin/engine/EngineFactory.java | 14 +------
.../kylin/engine/IStreamingCubingEngine.java | 26 ------------
4 files changed, 1 insertion(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed643e6b/core-common/src/main/java/org/apache/kylin/common/util/StreamingBatch.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/StreamingBatch.java b/core-common/src/main/java/org/apache/kylin/common/util/StreamingBatch.java
deleted file mode 100644
index e000aa6..0000000
--- a/core-common/src/main/java/org/apache/kylin/common/util/StreamingBatch.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-package org.apache.kylin.common.util;
-
-import java.util.List;
-
-/**
- */
-public final class StreamingBatch {
-
- private final List<StreamingMessage> messages;
-
- private final Pair<Long, Long> timeRange;
-
- public StreamingBatch(List<StreamingMessage> messages, Pair<Long, Long> timeRange) {
- this.messages = messages;
- this.timeRange = timeRange;
- }
-
- public List<StreamingMessage> getMessages() {
- return messages;
- }
-
- public Pair<Long, Long> getTimeRange() {
- return timeRange;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed643e6b/core-common/src/main/java/org/apache/kylin/common/util/StreamingMessage.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/StreamingMessage.java b/core-common/src/main/java/org/apache/kylin/common/util/StreamingMessage.java
index 53ab195..981c8a8 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/StreamingMessage.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/StreamingMessage.java
@@ -18,7 +18,6 @@
package org.apache.kylin.common.util;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -34,8 +33,6 @@ public class StreamingMessage {
private Map<String, Object> params;
- public static final StreamingMessage EOF = new StreamingMessage(Collections.<String> emptyList(), 0L, 0L, Collections.<String, Object> emptyMap());
-
public StreamingMessage(List<String> data, long offset, long timestamp, Map<String, Object> params) {
this.data = data;
this.offset = offset;
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed643e6b/core-job/src/main/java/org/apache/kylin/engine/EngineFactory.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/engine/EngineFactory.java b/core-job/src/main/java/org/apache/kylin/engine/EngineFactory.java
index 7044a3e..acaa7da 100644
--- a/core-job/src/main/java/org/apache/kylin/engine/EngineFactory.java
+++ b/core-job/src/main/java/org/apache/kylin/engine/EngineFactory.java
@@ -31,23 +31,15 @@ import org.apache.kylin.metadata.model.IJoinedFlatTableDesc;
public class EngineFactory {
private static ImplementationSwitch<IBatchCubingEngine> batchEngines;
- private static ImplementationSwitch<IStreamingCubingEngine> streamingEngines;
static {
Map<Integer, String> impls = KylinConfig.getInstanceFromEnv().getJobEngines();
- batchEngines = new ImplementationSwitch<IBatchCubingEngine>(impls, IBatchCubingEngine.class);
-
- impls.clear();
- streamingEngines = new ImplementationSwitch<IStreamingCubingEngine>(impls, IStreamingCubingEngine.class); // TODO
+ batchEngines = new ImplementationSwitch<>(impls, IBatchCubingEngine.class);
}
public static IBatchCubingEngine batchEngine(IEngineAware aware) {
return batchEngines.get(aware.getEngineType());
}
- public static IStreamingCubingEngine streamingEngine(IEngineAware aware) {
- return streamingEngines.get(aware.getEngineType());
- }
-
/** Mark deprecated to indicate for test purpose only */
@Deprecated
public static IJoinedFlatTableDesc getJoinedFlatTableDesc(CubeDesc cubeDesc) {
@@ -68,8 +60,4 @@ public class EngineFactory {
return batchEngine(mergeSegment).createBatchMergeJob(mergeSegment, submitter);
}
- public static Runnable createStreamingCubingBuilder(CubeSegment seg) {
- return streamingEngine(seg).createStreamingCubingBuilder(seg);
- }
-
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed643e6b/core-job/src/main/java/org/apache/kylin/engine/IStreamingCubingEngine.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/engine/IStreamingCubingEngine.java b/core-job/src/main/java/org/apache/kylin/engine/IStreamingCubingEngine.java
deleted file mode 100644
index cec57a7..0000000
--- a/core-job/src/main/java/org/apache/kylin/engine/IStreamingCubingEngine.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.kylin.engine;
-
-import org.apache.kylin.cube.CubeSegment;
-
-public interface IStreamingCubingEngine {
-
- public Runnable createStreamingCubingBuilder(CubeSegment seg);
-}