You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/06/03 11:34:08 UTC
[2/3] incubator-kylin git commit: KYLIN-809 renaming
KYLIN-809 renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/e2c73de2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/e2c73de2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/e2c73de2
Branch: refs/heads/0.8.0
Commit: e2c73de291ffb7d8cd272a408e00a935a46f36f4
Parents: 473b174
Author: honma <ho...@ebay.com>
Authored: Wed Jun 3 17:07:30 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed Jun 3 17:07:30 2015 +0800
----------------------------------------------------------------------
dictionary/.settings/org.eclipse.core.resources.prefs | 1 -
.../java/org/apache/kylin/job/streaming/KafkaDataLoader.java | 2 +-
.../org/apache/kylin/job/streaming/StreamingBootstrap.java | 2 +-
job/src/test/java/org/apache/kylin/job/DeployUtil.java | 7 +++----
.../java/org/apache/kylin/streaming/StreamingManager.java | 2 +-
.../java/org/apache/kylin/streaming/ITKafkaConsumerTest.java | 2 +-
.../java/org/apache/kylin/streaming/ITKafkaRequesterTest.java | 2 +-
.../java/org/apache/kylin/streaming/OneOffStreamProducer.java | 2 +-
.../java/org/apache/kylin/streaming/StreamingManagerTest.java | 2 +-
9 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/dictionary/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/dictionary/.settings/org.eclipse.core.resources.prefs b/dictionary/.settings/org.eclipse.core.resources.prefs
index 04cfa2c..8bc0e1c 100644
--- a/dictionary/.settings/org.eclipse.core.resources.prefs
+++ b/dictionary/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/job/src/main/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/streaming/KafkaDataLoader.java b/job/src/main/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
index 8db89d3..eb47d15 100644
--- a/job/src/main/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
+++ b/job/src/main/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
@@ -23,7 +23,7 @@ public class KafkaDataLoader {
*/
public static void main(String[] args) throws IOException {
StreamingManager streamingManager = StreamingManager.getInstance(KylinConfig.getInstanceFromEnv());
- StreamingConfig streamingConfig = streamingManager.getKafkaConfig(args[1]);
+ StreamingConfig streamingConfig = streamingManager.getStreamingConfig(args[1]);
List<String> alldata = FileUtils.readLines(new File(args[0]));
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/job/src/main/java/org/apache/kylin/job/streaming/StreamingBootstrap.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/streaming/StreamingBootstrap.java b/job/src/main/java/org/apache/kylin/job/streaming/StreamingBootstrap.java
index 1c96e16..cad8423 100644
--- a/job/src/main/java/org/apache/kylin/job/streaming/StreamingBootstrap.java
+++ b/job/src/main/java/org/apache/kylin/job/streaming/StreamingBootstrap.java
@@ -113,7 +113,7 @@ public class StreamingBootstrap {
}
public void start(String streaming, int partitionId) throws Exception {
- final StreamingConfig streamingConfig = streamingManager.getKafkaConfig(streaming);
+ final StreamingConfig streamingConfig = streamingManager.getStreamingConfig(streaming);
Preconditions.checkArgument(streamingConfig != null, "cannot find kafka config:" + streaming);
if (!StringUtils.isEmpty(streamingConfig.getIiName())) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/job/src/test/java/org/apache/kylin/job/DeployUtil.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/DeployUtil.java b/job/src/test/java/org/apache/kylin/job/DeployUtil.java
index 9a4673f..cff78dc 100644
--- a/job/src/test/java/org/apache/kylin/job/DeployUtil.java
+++ b/job/src/test/java/org/apache/kylin/job/DeployUtil.java
@@ -18,6 +18,7 @@
package org.apache.kylin.job;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.KylinConfig;
@@ -27,8 +28,8 @@ import org.apache.kylin.common.util.AbstractKylinTestCase;
import org.apache.kylin.common.util.CliCommandExecutor;
import org.apache.kylin.common.util.HiveClient;
import org.apache.kylin.common.util.Pair;
-import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeBuilder;
+import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.job.dataGen.FactTableGenerator;
import org.apache.kylin.job.hadoop.hive.SqlHiveDataTypeMapping;
@@ -37,8 +38,6 @@ import org.apache.kylin.metadata.model.ColumnDesc;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.tools.ant.filters.StringInputStream;
-import org.codehaus.plexus.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -170,7 +169,7 @@ public class DeployUtil {
// Write to resource store
ResourceStore store = ResourceStore.getStore(config());
- InputStream in = new StringInputStream(factTableContent);
+ InputStream in = new ByteArrayInputStream(factTableContent.getBytes("UTF-8"));
String factTablePath = "/data/" + factTableName + ".csv";
store.deleteResource(factTablePath);
store.putResource(factTablePath, in, System.currentTimeMillis());
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/streaming/src/main/java/org/apache/kylin/streaming/StreamingManager.java
----------------------------------------------------------------------
diff --git a/streaming/src/main/java/org/apache/kylin/streaming/StreamingManager.java b/streaming/src/main/java/org/apache/kylin/streaming/StreamingManager.java
index 3da35f1..f025216 100644
--- a/streaming/src/main/java/org/apache/kylin/streaming/StreamingManager.java
+++ b/streaming/src/main/java/org/apache/kylin/streaming/StreamingManager.java
@@ -106,7 +106,7 @@ public class StreamingManager {
}
}
- public StreamingConfig getKafkaConfig(String name) {
+ public StreamingConfig getStreamingConfig(String name) {
try {
return getStore().getResource(formatStreamingConfigPath(name), StreamingConfig.class, StreamingConfig.SERIALIZER);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaConsumerTest.java
----------------------------------------------------------------------
diff --git a/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaConsumerTest.java b/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaConsumerTest.java
index db1a27e..2a65206 100644
--- a/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaConsumerTest.java
+++ b/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaConsumerTest.java
@@ -64,7 +64,7 @@ public class ITKafkaConsumerTest extends KafkaBaseTest {
public void before() throws IOException {
producer = new OneOffStreamProducer(TOTAL_SEND_COUNT);
producer.start();
- streamingConfig = StreamingManager.getInstance(KylinConfig.getInstanceFromEnv()).getKafkaConfig("kafka_test");
+ streamingConfig = StreamingManager.getInstance(KylinConfig.getInstanceFromEnv()).getStreamingConfig("kafka_test");
kafkaClusterConfig = streamingConfig.getKafkaClusterConfigs().get(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaRequesterTest.java
----------------------------------------------------------------------
diff --git a/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaRequesterTest.java b/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaRequesterTest.java
index e3cd4a6..4bc9e72 100644
--- a/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaRequesterTest.java
+++ b/streaming/src/test/java/org/apache/kylin/streaming/ITKafkaRequesterTest.java
@@ -52,7 +52,7 @@ public class ITKafkaRequesterTest extends KafkaBaseTest {
@Before
public void before() {
- streamingConfig = StreamingManager.getInstance(KylinConfig.getInstanceFromEnv()).getKafkaConfig("kafka_test");
+ streamingConfig = StreamingManager.getInstance(KylinConfig.getInstanceFromEnv()).getStreamingConfig("kafka_test");
kafkaClusterConfig = streamingConfig.getKafkaClusterConfigs().get(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/streaming/src/test/java/org/apache/kylin/streaming/OneOffStreamProducer.java
----------------------------------------------------------------------
diff --git a/streaming/src/test/java/org/apache/kylin/streaming/OneOffStreamProducer.java b/streaming/src/test/java/org/apache/kylin/streaming/OneOffStreamProducer.java
index 6630256..93da99f 100644
--- a/streaming/src/test/java/org/apache/kylin/streaming/OneOffStreamProducer.java
+++ b/streaming/src/test/java/org/apache/kylin/streaming/OneOffStreamProducer.java
@@ -69,7 +69,7 @@ public class OneOffStreamProducer {
public void start() throws IOException {
final Properties properties = new Properties();
properties.load(ClassLoader.getSystemResourceAsStream("kafka_streaming_test/kafka.properties"));
- final StreamingConfig streamingConfig = StreamingManager.getInstance(KylinConfig.getInstanceFromEnv()).getKafkaConfig("kafka_test");
+ final StreamingConfig streamingConfig = StreamingManager.getInstance(KylinConfig.getInstanceFromEnv()).getStreamingConfig("kafka_test");
final KafkaClusterConfig kafkaClusterConfig = streamingConfig.getKafkaClusterConfigs().get(0);
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e2c73de2/streaming/src/test/java/org/apache/kylin/streaming/StreamingManagerTest.java
----------------------------------------------------------------------
diff --git a/streaming/src/test/java/org/apache/kylin/streaming/StreamingManagerTest.java b/streaming/src/test/java/org/apache/kylin/streaming/StreamingManagerTest.java
index ea76a93..772643b 100644
--- a/streaming/src/test/java/org/apache/kylin/streaming/StreamingManagerTest.java
+++ b/streaming/src/test/java/org/apache/kylin/streaming/StreamingManagerTest.java
@@ -65,7 +65,7 @@ public class StreamingManagerTest extends LocalFileMetadataTestCase {
@Test
public void test() {
- assertNotNull(streamingManager.getKafkaConfig("kafka_test"));
+ assertNotNull(streamingManager.getStreamingConfig("kafka_test"));
}
@Test