KYLIN-1922 fix CI
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3c4537dc Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3c4537dc Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3c4537dc Branch: refs/heads/KYLIN-1726 Commit: 3c4537dc8f15ccd8b0f1102ed67b3f5a21ec29d6 Parents: 6ed643b Author: Hongbin Ma <mahong...@apache.org> Authored: Tue Sep 13 11:29:17 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue Sep 13 11:29:17 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/query/ITKylinQueryTest.java | 11 ++++++---- .../src/test/resources/query/sql/query45.sql | 4 ++-- .../test/resources/query/sql_limit/query02.sql | 4 ++-- .../query/sql_topn/query45.sql.disable | 23 ++++++++++++++++++++ .../routing/rules/RealizationSortRule.java | 10 +++++++++ 5 files changed, 44 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3c4537dc/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java index b9895e8..2417d68 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.debug.BackdoorToggles; import org.apache.kylin.gridtable.GTScanSelfTerminatedException; -import org.apache.kylin.gridtable.GTScanTimeoutException; import org.apache.kylin.gridtable.StorageSideBehavior; import org.apache.kylin.metadata.realization.RealizationType; import org.apache.kylin.query.routing.Candidate; @@ -141,9 +140,13 @@ public class ITKylinQueryTest extends KylinTestBase { //don't try to ignore this test, try to clean your "temp" folder @Test public void testTempQuery() throws Exception { - PRINT_RESULT = true; - execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/temp", null, true); - PRINT_RESULT = false; + try { + PRINT_RESULT = true; + execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/temp", null, true); + } finally { + PRINT_RESULT = false; + } + } @Ignore http://git-wip-us.apache.org/repos/asf/kylin/blob/3c4537dc/kylin-it/src/test/resources/query/sql/query45.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql/query45.sql b/kylin-it/src/test/resources/query/sql/query45.sql index 7b55443..d3cfb06 100644 --- a/kylin-it/src/test/resources/query/sql/query45.sql +++ b/kylin-it/src/test/resources/query/sql/query45.sql @@ -18,6 +18,6 @@ -select seller_id, sum(price) as s from test_kylin_fact +select seller_id,lstg_format_name, sum(price) as s from test_kylin_fact where lstg_format_name='FP-GTC' - group by seller_id limit 20 + group by seller_id,lstg_format_name http://git-wip-us.apache.org/repos/asf/kylin/blob/3c4537dc/kylin-it/src/test/resources/query/sql_limit/query02.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_limit/query02.sql b/kylin-it/src/test/resources/query/sql_limit/query02.sql index 53f7bd7..4346dd9 100644 --- a/kylin-it/src/test/resources/query/sql_limit/query02.sql +++ b/kylin-it/src/test/resources/query/sql_limit/query02.sql @@ -18,7 +18,7 @@ -select seller_id, sum(price) from test_kylin_fact +select seller_id,lstg_format_name,sum(price) from test_kylin_fact where lstg_format_name='FP-GTC' - group by seller_id limit 20 + group by seller_id,lstg_format_name limit 20 http://git-wip-us.apache.org/repos/asf/kylin/blob/3c4537dc/kylin-it/src/test/resources/query/sql_topn/query45.sql.disable ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_topn/query45.sql.disable b/kylin-it/src/test/resources/query/sql_topn/query45.sql.disable new file mode 100644 index 0000000..39f9571 --- /dev/null +++ b/kylin-it/src/test/resources/query/sql_topn/query45.sql.disable @@ -0,0 +1,23 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + + + +select seller_id, sum(price) as s from test_kylin_fact + where lstg_format_name='FP-GTC' + group by seller_id http://git-wip-us.apache.org/repos/asf/kylin/blob/3c4537dc/query/src/main/java/org/apache/kylin/query/routing/rules/RealizationSortRule.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/routing/rules/RealizationSortRule.java b/query/src/main/java/org/apache/kylin/query/routing/rules/RealizationSortRule.java index d3c67d7..bd83af1 100644 --- a/query/src/main/java/org/apache/kylin/query/routing/rules/RealizationSortRule.java +++ b/query/src/main/java/org/apache/kylin/query/routing/rules/RealizationSortRule.java @@ -23,12 +23,22 @@ import java.util.List; import org.apache.kylin.query.routing.Candidate; import org.apache.kylin.query.routing.RoutingRule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** */ public class RealizationSortRule extends RoutingRule { + private static final Logger logger = LoggerFactory.getLogger(RealizationSortRule.class); + @Override public void apply(List<Candidate> candidates) { + StringBuilder sb = new StringBuilder(); + for (Candidate candidate : candidates) { + sb.append(candidate.getRealization().getCanonicalName() + " priority " + candidate.getPriority() + " cost " + candidate.getCapability().cost + ". "); + } + logger.info(sb.toString()); + Collections.sort(candidates); } }
