This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push: new 34fd447 KYLIN-3592, reorder static and synchronized in method declaration. 34fd447 is described below commit 34fd447c2f8b1852c530168e344d24f6efce4a3c Author: tttMelody <245915...@qq.com> AuthorDate: Tue Sep 25 15:17:54 2018 +0800 KYLIN-3592, reorder static and synchronized in method declaration. --- .../java/org/apache/kylin/common/metrics/common/MetricsFactory.java | 4 ++-- .../java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java | 4 ++-- .../java/org/apache/kylin/dimension/DimensionEncodingFactory.java | 2 +- .../org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core-common/src/main/java/org/apache/kylin/common/metrics/common/MetricsFactory.java b/core-common/src/main/java/org/apache/kylin/common/metrics/common/MetricsFactory.java index 269c7dc..37be1b4 100644 --- a/core-common/src/main/java/org/apache/kylin/common/metrics/common/MetricsFactory.java +++ b/core-common/src/main/java/org/apache/kylin/common/metrics/common/MetricsFactory.java @@ -36,7 +36,7 @@ public class MetricsFactory { /** * Initializes static Metrics instance. */ - public synchronized static void init() { + public static synchronized void init() { if (metrics == null) { Class metricsClass = MetricsFactory.class; metrics = new CodahaleMetrics(); @@ -53,7 +53,7 @@ public class MetricsFactory { /** * Closes and removes static Metrics instance. */ - public synchronized static void close() throws Exception { + public static synchronized void close() throws Exception { if (metrics != null) { metrics.close(); metrics = null; diff --git a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java index 9b99d71..c243757 100644 --- a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java +++ b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java @@ -56,13 +56,13 @@ public class DefaultScheduler implements Scheduler<AbstractExecutable>, Connecti return INSTANCE; } - public synchronized static DefaultScheduler createInstance() { + public static synchronized DefaultScheduler createInstance() { destroyInstance(); INSTANCE = new DefaultScheduler(); return INSTANCE; } - public synchronized static void destroyInstance() { + public static synchronized void destroyInstance() { DefaultScheduler tmp = INSTANCE; INSTANCE = null; if (tmp != null) { diff --git a/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java b/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java index 8f1fcd6..2750463 100644 --- a/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java +++ b/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java @@ -97,7 +97,7 @@ public abstract class DimensionEncodingFactory { }); } - private synchronized static void initFactoryMap() { + private static synchronized void initFactoryMap() { if (factoryMap == null) { Map<Pair<String, Integer>, DimensionEncodingFactory> map = Maps.newConcurrentMap(); diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java index 6cd29d2..7781ca0 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java @@ -411,7 +411,7 @@ public class DeployCoprocessorCLI { return path; } - public synchronized static Path uploadCoprocessorJar(String localCoprocessorJar, FileSystem fileSystem, Set<String> oldJarPaths) throws IOException { + public static synchronized Path uploadCoprocessorJar(String localCoprocessorJar, FileSystem fileSystem, Set<String> oldJarPaths) throws IOException { Path uploadPath = null; File localCoprocessorFile = new File(localCoprocessorJar);