minor, fix manager inconsistence with thread-local KylinConfig
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4f20ba32 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4f20ba32 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4f20ba32 Branch: refs/heads/master Commit: 4f20ba32a8e93c05957d6da8e71b71920828a4f3 Parents: 450845c Author: lidongsjtu <[email protected]> Authored: Sun Jun 25 18:18:55 2017 +0800 Committer: Hongbin Ma <[email protected]> Committed: Tue Jun 27 18:28:14 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/cube/CubeDescManager.java | 5 +++++ .../src/main/java/org/apache/kylin/cube/CubeManager.java | 5 +++++ .../main/java/org/apache/kylin/dict/DictionaryManager.java | 5 +++++ .../org/apache/kylin/job/execution/ExecutableManager.java | 5 +++++ .../main/java/org/apache/kylin/metadata/MetadataManager.java | 5 +++++ .../kylin/metadata/badquery/BadQueryHistoryManager.java | 5 +++++ .../org/apache/kylin/metadata/cachesync/Broadcaster.java | 8 ++++++++ .../java/org/apache/kylin/metadata/draft/DraftManager.java | 5 +++++ .../org/apache/kylin/metadata/project/ProjectManager.java | 5 +++++ .../kylin/metadata/realization/RealizationRegistry.java | 4 ++++ .../java/org/apache/kylin/storage/hybrid/HybridManager.java | 5 +++++ 11 files changed, 57 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java index 4e4daf2..2d44454 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java @@ -94,6 +94,11 @@ public class CubeDescManager { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java index 32e2316..da3abf1 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java @@ -124,6 +124,11 @@ public class CubeManager implements IRealizationProvider { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java index 1628f4e..857ee30 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java @@ -83,6 +83,11 @@ public class DictionaryManager { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java b/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java index 170a254..f16cfde 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java @@ -83,6 +83,11 @@ public class ExecutableManager { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + private static ExecutablePO parse(AbstractExecutable executable) { ExecutablePO result = new ExecutablePO(); result.setName(executable.getName()); http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java index 2a894b9..96ae294 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java @@ -103,6 +103,11 @@ public class MetadataManager { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java index c7eb133..d7cd425 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java @@ -72,6 +72,11 @@ public class BadQueryHistoryManager { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + private ResourceStore getStore() { return ResourceStore.getStore(this.kylinConfig); } http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/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 c9e1130..4b0ef57 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 @@ -93,6 +93,14 @@ public class Broadcaster { } } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) { + synchronized (CACHE) { + CACHE.remove(kylinConfig); + } + } + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-metadata/src/main/java/org/apache/kylin/metadata/draft/DraftManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/draft/DraftManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/draft/DraftManager.java index 56ee251..bf3c3c3 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/draft/DraftManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/draft/DraftManager.java @@ -72,6 +72,11 @@ public class DraftManager { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java index 213b136..ea03c3c 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java @@ -85,6 +85,11 @@ public class ProjectManager { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + // ============================================================================ private KylinConfig config; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java index 2d1a4a5..2ae4fa1 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java @@ -68,6 +68,10 @@ public class RealizationRegistry { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + CACHE.remove(kylinConfig); + } + // ============================================================================ private Map<RealizationType, IRealizationProvider> providers; http://git-wip-us.apache.org/repos/asf/kylin/blob/4f20ba32/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java ---------------------------------------------------------------------- diff --git a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java index cf40416..114f2c7 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridManager.java @@ -79,6 +79,11 @@ public class HybridManager implements IRealizationProvider { CACHE.clear(); } + public static void clearCache(KylinConfig kylinConfig) { + if (kylinConfig != null) + CACHE.remove(kylinConfig); + } + // ============================================================================ private KylinConfig config;
