Repository: kylin Updated Branches: refs/heads/KYLIN_1431 5f0117a9b -> ac2a0ba43
KYLIN-1431 remove redundant method in StreamingManager.java Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ac2a0ba4 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ac2a0ba4 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ac2a0ba4 Branch: refs/heads/KYLIN_1431 Commit: ac2a0ba430dcc30626b7371f8af5f72254286eb0 Parents: 5f0117a Author: shaofengshi <[email protected]> Authored: Wed Mar 2 14:05:53 2016 +0800 Committer: shaofengshi <[email protected]> Committed: Wed Mar 2 14:05:53 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/engine/streaming/StreamingManager.java | 4 ---- .../java/org/apache/kylin/provision/BuildCubeWithStream.java | 2 +- .../org/apache/kylin/rest/controller/StreamingController.java | 2 +- .../java/org/apache/kylin/rest/service/StreamingService.java | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ac2a0ba4/engine-streaming/src/main/java/org/apache/kylin/engine/streaming/StreamingManager.java ---------------------------------------------------------------------- diff --git a/engine-streaming/src/main/java/org/apache/kylin/engine/streaming/StreamingManager.java b/engine-streaming/src/main/java/org/apache/kylin/engine/streaming/StreamingManager.java index 81c5c38..3c380a8 100644 --- a/engine-streaming/src/main/java/org/apache/kylin/engine/streaming/StreamingManager.java +++ b/engine-streaming/src/main/java/org/apache/kylin/engine/streaming/StreamingManager.java @@ -133,10 +133,6 @@ public class StreamingManager { return ResourceStore.STREAMING_OUTPUT_RESOURCE_ROOT + "/" + streaming + "_" + StringUtils.join(partitions, "_") + ".json"; } - public StreamingConfig getStreamingConfig(String name) { - return streamingMap.get(name); - } - public List<StreamingConfig> listAllStreaming() { return new ArrayList<>(streamingMap.values()); } http://git-wip-us.apache.org/repos/asf/kylin/blob/ac2a0ba4/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java index eeff999..f58e254 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java @@ -80,7 +80,7 @@ public class BuildCubeWithStream { kylinConfig = KylinConfig.getInstanceFromEnv(); final CubeInstance cubeInstance = CubeManager.getInstance(kylinConfig).getCube(cubeName); final String factTable = cubeInstance.getFactTable(); - final StreamingConfig config = StreamingManager.getInstance(kylinConfig).getStreamingConfig(factTable); + final StreamingConfig config = StreamingManager.getInstance(kylinConfig).getConfig(factTable); //Use a random topic for kafka data stream KafkaConfig streamingConfig = KafkaConfigManager.getInstance(kylinConfig).getKafkaConfig(config.getName()); http://git-wip-us.apache.org/repos/asf/kylin/blob/ac2a0ba4/server/src/main/java/org/apache/kylin/rest/controller/StreamingController.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/controller/StreamingController.java b/server/src/main/java/org/apache/kylin/rest/controller/StreamingController.java index ecd7571..60d0761 100644 --- a/server/src/main/java/org/apache/kylin/rest/controller/StreamingController.java +++ b/server/src/main/java/org/apache/kylin/rest/controller/StreamingController.java @@ -158,7 +158,7 @@ public class StreamingController extends BasicController { @RequestMapping(value = "/{configName}", method = { RequestMethod.DELETE }) @ResponseBody public void deleteConfig(@PathVariable String configName) throws IOException { - StreamingConfig config = streamingService.getStreamingManager().getStreamingConfig(configName); + StreamingConfig config = streamingService.getStreamingManager().getConfig(configName); KafkaConfig kafkaConfig = kafkaConfigService.getKafkaConfig(configName); if (null == config) { throw new NotFoundException("StreamingConfig with name " + configName + " not found.."); http://git-wip-us.apache.org/repos/asf/kylin/blob/ac2a0ba4/server/src/main/java/org/apache/kylin/rest/service/StreamingService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/StreamingService.java b/server/src/main/java/org/apache/kylin/rest/service/StreamingService.java index a0473e9..f95595f 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/StreamingService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/StreamingService.java @@ -68,7 +68,7 @@ public class StreamingService extends BasicService { } public StreamingConfig createStreamingConfig(StreamingConfig config) throws IOException { - if (getStreamingManager().getStreamingConfig(config.getName()) != null) { + if (getStreamingManager().getConfig(config.getName()) != null) { throw new InternalErrorException("The streamingConfig named " + config.getName() + " already exists"); } StreamingConfig streamingConfig = getStreamingManager().saveStreamingConfig(config);
