You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/03 11:28:36 UTC
[22/50] incubator-kylin git commit: Fix failed Unit test on mini
cluster
Fix failed Unit test on mini cluster
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/e5970b16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/e5970b16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/e5970b16
Branch: refs/heads/master
Commit: e5970b16f7c0c960bb2de6c951c7e9aab1975cc2
Parents: eb4ea7d
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Sun Feb 15 18:01:29 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Sun Feb 15 18:01:29 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/dict/DictionaryManager.java | 1 +
.../org/apache/kylin/job/impl/threadpool/DefaultScheduler.java | 2 +-
.../org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java | 4 ++--
pom.xml | 1 +
.../src/test/java/org/apache/kylin/query/test/KylinTestBase.java | 4 ++--
5 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5970b16/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java b/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
index e240efd..d61c4fa 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
@@ -341,6 +341,7 @@ public class DictionaryManager {
DictionaryInfo load(String resourcePath, boolean loadDictObj) throws IOException {
ResourceStore store = MetadataManager.getInstance(config).getStore();
+ logger.debug("Going to load DictionaryInfo from " + resourcePath);
DictionaryInfo info = store.getResource(resourcePath, DictionaryInfo.class, loadDictObj ? DictionaryInfoSerializer.FULL_SERIALIZER : DictionaryInfoSerializer.INFO_SERIALIZER);
if (loadDictObj)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5970b16/job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java b/job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
index 7d87c93..b486a3e 100644
--- a/job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
+++ b/job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
@@ -160,7 +160,7 @@ public class DefaultScheduler implements Scheduler<AbstractExecutable>, Connecti
private String getZKConnectString(JobEngineConfig context) {
Configuration conf = HadoopUtil.newHBaseConfiguration(context.getConfig().getStorageUrl());
- return conf.get(HConstants.ZOOKEEPER_QUORUM);
+ return conf.get(HConstants.ZOOKEEPER_QUORUM) + ":" + conf.get(HConstants.ZOOKEEPER_CLIENT_PORT);
}
public static DefaultScheduler getInstance() {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5970b16/job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java b/job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java
index 61b8984..9da0f73 100644
--- a/job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java
+++ b/job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java
@@ -19,7 +19,7 @@
package org.apache.kylin.job.impl.threadpool;
import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.util.LocalFileMetadataTestCase;
+import org.apache.kylin.common.util.HBaseMetadataTestCase;
import org.apache.kylin.job.constant.ExecutableConstants;
import org.apache.kylin.job.engine.JobEngineConfig;
import org.apache.kylin.job.execution.AbstractExecutable;
@@ -34,7 +34,7 @@ import java.lang.reflect.Modifier;
/**
* Created by qianzhou on 12/26/14.
*/
-public abstract class BaseSchedulerTest extends LocalFileMetadataTestCase {
+public abstract class BaseSchedulerTest extends HBaseMetadataTestCase {
private DefaultScheduler scheduler;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5970b16/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a85ba2..af38a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -576,6 +576,7 @@
<exclude>**/KylinQueryTest.java</exclude>
<exclue>**/SnapshotManagerTest.java</exclue>
<exclue>**/HiveTableReaderTest.java</exclue>
+ <exclude>**/TableControllerTest.java</exclude>
</excludes>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5970b16/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
index 5f81f22..55699d3 100644
--- a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
+++ b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
@@ -209,7 +209,7 @@ public class KylinTestBase {
if (needSort) {
queryTable = new SortedTable(queryTable, columnNames);
}
- printResult(queryTable);
+ // printResult(queryTable);
return queryTable;
}
@@ -265,7 +265,7 @@ public class KylinTestBase {
if (needSort) {
queryTable = new SortedTable(queryTable, columnNames);
}
- printResult(queryTable);
+ // printResult(queryTable);
return queryTable;
}