minor, fix false positive warning in test output
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/85a1eb39 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/85a1eb39 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/85a1eb39 Branch: refs/heads/KYLIN-2361 Commit: 85a1eb399d8dcd099d4607aa802faa5ccdf4d2bf Parents: 1e4ae54 Author: Billy Liu <billy...@apache.org> Authored: Fri Jan 20 08:13:11 2017 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Fri Jan 20 08:13:11 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/common/util/AbstractKylinTestCase.java | 7 ++++++- .../java/org/apache/kylin/dict/lookup/SnapshotManager.java | 6 ++++++ .../src/main/java/org/apache/kylin/job/dao/ExecutableDao.java | 6 ++++++ .../java/org/apache/kylin/metadata/cachesync/Broadcaster.java | 2 +- examples/test_case_data/localmeta/cube_desc/ssb.json | 4 ++-- examples/test_case_data/localmeta/cube_desc/ssb_cube1.json | 4 ++-- examples/test_case_data/localmeta/cube_desc/ssb_cube2.json | 4 ++-- examples/test_case_data/localmeta/cube_desc/ssb_cube3.json | 4 ++-- .../cube_desc/test_kylin_cube_without_slr_left_join_desc.json | 4 ++-- .../localmeta/cube_desc/test_streaming_table_cube_desc.json | 2 +- examples/test_case_data/localmeta/kylin.properties | 2 +- examples/test_case_data/sandbox/kylin.properties | 2 +- kylin-it/pom.xml | 2 +- 13 files changed, 33 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java b/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java index 2154c32..4a9804d 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java @@ -31,12 +31,17 @@ public abstract class AbstractKylinTestCase { public static final String[] SERVICES_WITH_CACHE = { // "org.apache.kylin.cube.CubeManager", // "org.apache.kylin.cube.CubeDescManager", // + "org.apache.kylin.dict.lookup.SnapshotManager", // + "org.apache.kylin.dict.DictionaryManager", // "org.apache.kylin.storage.hybrid.HybridManager", // "org.apache.kylin.metadata.realization.RealizationRegistry", // "org.apache.kylin.metadata.project.ProjectManager", // "org.apache.kylin.metadata.MetadataManager", // + "org.apache.kylin.metadata.cachesync.Broadcaster", // + "org.apache.kylin.metadata.badquery.BadQueryHistoryManager", // "org.apache.kylin.job.impl.threadpool.DistributedScheduler", // - "org.apache.kylin.job.manager.ExecutableManager", // + "org.apache.kylin.job.execution.ExecutableManager", // + "org.apache.kylin.job.dao.ExecutableDao" // }; public abstract void createTestMetadata() throws Exception; http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/core-dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java b/core-dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java index 085158a..b45d017 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java @@ -66,6 +66,12 @@ public class SnapshotManager { return r; } + public static void clearCache() { + synchronized (SERVICE_CACHE) { + SERVICE_CACHE.clear(); + } + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/core-job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java b/core-job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java index 5cae5ac..96505e6 100644 --- a/core-job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java +++ b/core-job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java @@ -64,6 +64,12 @@ public class ExecutableDao { return r; } + public static void clearCache() { + synchronized (CACHE) { + CACHE.clear(); + } + } + private ExecutableDao(KylinConfig config) { logger.info("Using metadata url: " + config); this.store = MetadataManager.getInstance(config).getStore(); http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java b/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java index d00c490..17b644d 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java @@ -83,7 +83,7 @@ public class Broadcaster { } // call Broadcaster.getInstance().notifyClearAll() to clear cache - static void clearCache() { + public static void clearCache() { synchronized (CACHE) { CACHE.clear(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/localmeta/cube_desc/ssb.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/ssb.json b/examples/test_case_data/localmeta/cube_desc/ssb.json index a13ac53..280fc82 100644 --- a/examples/test_case_data/localmeta/cube_desc/ssb.json +++ b/examples/test_case_data/localmeta/cube_desc/ssb.json @@ -183,7 +183,7 @@ "engine_type" : 2, "storage_type" : 2, "override_kylin_properties" : { - "kylin.hbase.default.compression.codec" : "lz4", - "kylin.cube.aggrgroup.isMandatoryOnlyValid" : "true" + "kylin.storage.hbase.compression-codec" : "lz4", + "kylin.cube.aggrgroup.is-mandatory-only-valid" : "true" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/localmeta/cube_desc/ssb_cube1.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/ssb_cube1.json b/examples/test_case_data/localmeta/cube_desc/ssb_cube1.json index 5986057..861e67d 100644 --- a/examples/test_case_data/localmeta/cube_desc/ssb_cube1.json +++ b/examples/test_case_data/localmeta/cube_desc/ssb_cube1.json @@ -149,7 +149,7 @@ "engine_type" : 2, "storage_type" : 2, "override_kylin_properties" : { - "kylin.hbase.default.compression.codec" : "lz4", - "kylin.cube.aggrgroup.isMandatoryOnlyValid" : "true" + "kylin.storage.hbase.compression-codec" : "lz4", + "kylin.cube.aggrgroup.is-mandatory-only-valid" : "true" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/localmeta/cube_desc/ssb_cube2.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/ssb_cube2.json b/examples/test_case_data/localmeta/cube_desc/ssb_cube2.json index fc75ea8..c2bf3c0 100644 --- a/examples/test_case_data/localmeta/cube_desc/ssb_cube2.json +++ b/examples/test_case_data/localmeta/cube_desc/ssb_cube2.json @@ -149,7 +149,7 @@ "engine_type" : 2, "storage_type" : 2, "override_kylin_properties" : { - "kylin.hbase.default.compression.codec" : "lz4", - "kylin.cube.aggrgroup.isMandatoryOnlyValid" : "true" + "kylin.storage.hbase.compression-codec" : "lz4", + "kylin.cube.aggrgroup.is-mandatory-only-valid" : "true" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/localmeta/cube_desc/ssb_cube3.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/ssb_cube3.json b/examples/test_case_data/localmeta/cube_desc/ssb_cube3.json index 4509116..d45b6a7 100644 --- a/examples/test_case_data/localmeta/cube_desc/ssb_cube3.json +++ b/examples/test_case_data/localmeta/cube_desc/ssb_cube3.json @@ -137,7 +137,7 @@ "engine_type" : 2, "storage_type" : 2, "override_kylin_properties" : { - "kylin.hbase.default.compression.codec" : "lz4", - "kylin.cube.aggrgroup.isMandatoryOnlyValid" : "true" + "kylin.storage.hbase.compression-codec" : "lz4", + "kylin.cube.aggrgroup.is-mandatory-only-valid" : "true" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json index 9aeaa2e..25b66f2 100644 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json +++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json @@ -287,8 +287,8 @@ "engine_type" : 2, "storage_type" : 2, "override_kylin_properties": { - "kylin.job.cubing.inmem.sampling.hll.precision": "16", - "kylin.hive.create.flat.table.method": "2" + "kylin.job.sampling-hll-precision": "16", + "kylin.source.hive.create-flat-table-method": "2" }, "partition_date_start": 0 } http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json b/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json index 640b91c..0065b02 100644 --- a/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json +++ b/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json @@ -106,7 +106,7 @@ } ], "override_kylin_properties": { "kylin.cube.algorithm": "inmem", - "kylin.cube.building.segment.max": "5" + "kylin.cube.max-building-segments": "5" }, "notify_list" : [ ], "status_need_notify" : [ ], http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/localmeta/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties index f4c6772..e89c767 100644 --- a/examples/test_case_data/localmeta/kylin.properties +++ b/examples/test_case_data/localmeta/kylin.properties @@ -133,4 +133,4 @@ kylin.engine.mr.config-override.test2=test2 kylin.job.lock=org.apache.kylin.job.lock.MockJobLock kylin.engine.provider.0=org.apache.kylin.engine.mr.MRBatchCubingEngine -kylin.cube.engine.2=org.apache.kylin.engine.mr.MRBatchCubingEngine2 \ No newline at end of file +kylin.engine.provider.2=org.apache.kylin.engine.mr.MRBatchCubingEngine2 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/examples/test_case_data/sandbox/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties index 06f8e4b..6c512dc 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -25,7 +25,7 @@ kylin.server.mode=all kylin.storage.hbase.owner-tag=who...@kylin.apache.org # List of web servers in use, this enables one web server instance to sync up with other servers. -kylin.server.cluster-servers=localhost:7070 +#kylin.server.cluster-servers=localhost:7070 # Display timezone on UI,format like[GMT+N or GMT-N] kylin.web.timezone=GMT+8 http://git-wip-us.apache.org/repos/asf/kylin/blob/85a1eb39/kylin-it/pom.xml ---------------------------------------------------------------------- diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index 080558b..f972b4b 100644 --- a/kylin-it/pom.xml +++ b/kylin-it/pom.xml @@ -282,7 +282,7 @@ <value>file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</value> </property> </systemProperties> - <argLine>-Xms1G -Xmx2G -XX:PermSize=128M -XX:MaxPermSize=512M</argLine> + <argLine>-Xms1G -Xmx2G -XX:PermSize=128M -XX:MaxPermSize=512M -Dkylin.server.cluster-servers=localhost:7070</argLine> </configuration> </plugin> <plugin>