kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject [22/50] [abbrv] kylin git commit: KYLIN-2105 quick review changes
Date Thu, 20 Oct 2016 23:22:46 GMT
KYLIN-2105 quick review changes


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/047a2365
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/047a2365
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/047a2365

Branch: refs/heads/KYLIN-1971
Commit: 047a23652f36012b5da03bb4c1cd57d079085717
Parents: db09f5f
Author: Li Yang <liyang@apache.org>
Authored: Wed Oct 19 13:26:57 2016 +0800
Committer: Li Yang <liyang@apache.org>
Committed: Wed Oct 19 13:26:57 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/rest/service/QueryService.java | 3 +--
 .../main/java/org/apache/kylin/rest/util/QueryIdGenerator.java    | 3 ++-
 server/src/main/resources/applicationContext.xml                  | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/047a2365/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
index 2803125..42136f9 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
@@ -116,8 +116,7 @@ public class QueryService extends BasicService {
     private final String hbaseUrl;
     private final String userTableName;
 
-    @Autowired
-    private QueryIdGenerator queryIdGenerator;
+    private QueryIdGenerator queryIdGenerator = new QueryIdGenerator();
 
     @Autowired
     private CacheManager cacheManager;

http://git-wip-us.apache.org/repos/asf/kylin/blob/047a2365/server-base/src/main/java/org/apache/kylin/rest/util/QueryIdGenerator.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/util/QueryIdGenerator.java b/server-base/src/main/java/org/apache/kylin/rest/util/QueryIdGenerator.java
index d9913e4..0156d46 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/util/QueryIdGenerator.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/util/QueryIdGenerator.java
@@ -40,6 +40,7 @@ public class QueryIdGenerator {
             postfix[i] = base26[ThreadLocalRandom.current().nextInt(base26.length)];
         }
 
-        return String.format("%s_%s_%s", dateFormat.format(System.currentTimeMillis()), project,
new String(postfix));
+        return new String(postfix);
+        //return String.format("%s_%s_%s", dateFormat.format(System.currentTimeMillis()),
project, new String(postfix));
     }
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/047a2365/server/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/server/src/main/resources/applicationContext.xml b/server/src/main/resources/applicationContext.xml
index c8a4e54..081dc53 100644
--- a/server/src/main/resources/applicationContext.xml
+++ b/server/src/main/resources/applicationContext.xml
@@ -39,7 +39,6 @@
     <aop:aspectj-autoproxy/>
 
     <bean class="org.apache.kylin.rest.init.InitialTaskManager" />
-    <bean class="org.apache.kylin.rest.util.QueryIdGenerator" />
 
     <context:component-scan base-package="org.apache.kylin.rest"/>
 


Mime
View raw message