kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mahong...@apache.org
Subject [1/5] incubator-kylin git commit: new
Date Thu, 22 Oct 2015 06:07:53 GMT
Repository: incubator-kylin
Updated Branches:
  refs/heads/KYLIN-942 ca4552565 -> cd81a8d1b


new


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

Branch: refs/heads/KYLIN-942
Commit: 4541752f858fef97d8554a444db35114e1661a86
Parents: ca45525
Author: honma <honma@ebay.com>
Authored: Thu Oct 15 13:21:57 2015 +0800
Committer: honma <honma@ebay.com>
Committed: Thu Oct 15 13:21:57 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kylin/storage/hybrid/HybridInstance.java     | 2 +-
 .../java/org/apache/kylin/query/routing/RoutingRule.java    | 9 +++------
 .../java/org/apache/kylin/query/test/ITKylinQueryTest.java  | 2 +-
 .../java/org/apache/kylin/query/test/KylinTestBase.java     | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4541752f/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
----------------------------------------------------------------------
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
index e9f0975..7d3bedf 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
@@ -163,7 +163,7 @@ public class HybridInstance extends RootPersistentEntity implements IRealization
 
     @Override
     public int getCost(SQLDigest digest) {
-        cost = 100;
+        cost = Integer.MAX_VALUE;
         for (IRealization realization : this.getRealizations()) {
             if (realization.isCapable(digest))
                 cost = Math.min(cost, realization.getCost(digest));

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4541752f/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java b/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
index d80763c..1cd55d4 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
@@ -49,13 +49,10 @@ public abstract class RoutingRule {
 
     public static void applyRules(List<IRealization> realizations, OLAPContext olapContext)
{
         for (RoutingRule rule : rules) {
-            logger.info("Initial realizations order:");
-            logger.info(getPrintableText(realizations));
-            logger.info("Applying rule " + rule);
-
+            logger.info("Realizations order before: " + getPrintableText(realizations));
+            logger.info("Applying rule : " + rule);
             rule.apply(realizations, olapContext);
-
-            logger.info(getPrintableText(realizations));
+            logger.info("Realizations order after: " + getPrintableText(realizations));
             logger.info("===================================================");
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4541752f/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
index 6425f11..eaa716e 100644
--- a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
@@ -95,7 +95,7 @@ public class ITKylinQueryTest extends KylinTestBase {
     @Test
     public void testSingleRunQuery() throws Exception {
 
-        String queryFileName = "src/test/resources/query/sql/query85.sql";
+        String queryFileName = "src/test/resources/query/sql_orderby/query02.sql";
 
         File sqlFile = new File(queryFileName);
         if (sqlFile.exists()) {

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4541752f/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 0399f8c..b94542c 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
@@ -208,7 +208,7 @@ public class KylinTestBase {
         if (needSort) {
             queryTable = new SortedTable(queryTable, columnNames);
         }
-        //printResult(queryTable);
+        printResult(queryTable);
 
         return queryTable;
     }


Mime
View raw message