Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63B5317C7C for ; Tue, 29 Sep 2015 01:04:14 +0000 (UTC) Received: (qmail 7000 invoked by uid 500); 29 Sep 2015 01:04:11 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 6961 invoked by uid 500); 29 Sep 2015 01:04:11 -0000 Mailing-List: contact commits-help@kylin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.incubator.apache.org Delivered-To: mailing list commits@kylin.incubator.apache.org Received: (qmail 6950 invoked by uid 99); 29 Sep 2015 01:04:11 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Sep 2015 01:04:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id BF456C081E for ; Tue, 29 Sep 2015 01:04:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.794 X-Spam-Level: X-Spam-Status: No, score=0.794 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 4U0c6u5RIweh for ; Tue, 29 Sep 2015 01:03:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 6C86020925 for ; Tue, 29 Sep 2015 01:03:54 +0000 (UTC) Received: (qmail 5603 invoked by uid 99); 29 Sep 2015 01:03:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Sep 2015 01:03:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32A3BE04B0; Tue, 29 Sep 2015 01:03:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shaofengshi@apache.org To: commits@kylin.incubator.apache.org Date: Tue, 29 Sep 2015 01:04:03 -0000 Message-Id: In-Reply-To: <02bc6849f3034b18ba5384077469e67d@git.apache.org> References: <02bc6849f3034b18ba5384077469e67d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/27] incubator-kylin git commit: KYLIN-943 update test sql for topN KYLIN-943 update test sql for topN Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/a01c2132 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a01c2132 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a01c2132 Branch: refs/heads/2.x-staging Commit: a01c2132c7cfec7346d0781dbe24168ff2821f71 Parents: 26f9412 Author: shaofengshi Authored: Fri Sep 18 16:07:27 2015 +0800 Committer: shaofengshi Committed: Tue Sep 29 09:01:23 2015 +0800 ---------------------------------------------------------------------- .../test/java/org/apache/kylin/common/topn/TopNCounterTest.java | 2 ++ .../localmeta/cube_desc/test_kylin_cube_topn_desc.json | 1 + query/src/test/resources/query/sql/query81.sql | 2 +- query/src/test/resources/query/sql/query82.sql | 3 +-- 4 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a01c2132/core-common/src/test/java/org/apache/kylin/common/topn/TopNCounterTest.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/topn/TopNCounterTest.java b/core-common/src/test/java/org/apache/kylin/common/topn/TopNCounterTest.java index edc9ce2..dab45b1 100644 --- a/core-common/src/test/java/org/apache/kylin/common/topn/TopNCounterTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/topn/TopNCounterTest.java @@ -22,6 +22,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.math3.distribution.ZipfDistribution; import org.apache.kylin.common.util.Pair; +import org.junit.Ignore; import org.junit.Test; import java.io.*; @@ -30,6 +31,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +@Ignore("For collecting accuracy statistics, not for functional test") public class TopNCounterTest { protected static int TOP_K; http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a01c2132/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json index 96c3ace..7c2c6ff 100644 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json +++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json @@ -2,6 +2,7 @@ "uuid": "4334a905-1fc6-4f67-985c-38fa5aeafd92", "name": "test_kylin_cube_topn_desc", "description": null, + "engine_type": 2, "dimensions": [ { "id": 0, http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a01c2132/query/src/test/resources/query/sql/query81.sql ---------------------------------------------------------------------- diff --git a/query/src/test/resources/query/sql/query81.sql b/query/src/test/resources/query/sql/query81.sql index 93868e7..895718b 100644 --- a/query/src/test/resources/query/sql/query81.sql +++ b/query/src/test/resources/query/sql/query81.sql @@ -25,4 +25,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt inner JOIN edw.test_sites as test_sites ON test_kylin_fact.lstg_site_id = test_sites.site_id where test_cal_dt.week_beg_dt between DATE '2013-09-01' and DATE '2013-10-01' and (lstg_format_name='FP-GTC' or 'a' = 'b') - group by test_cal_dt.week_beg_dt \ No newline at end of file + group by test_cal_dt.week_beg_dt http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a01c2132/query/src/test/resources/query/sql/query82.sql ---------------------------------------------------------------------- diff --git a/query/src/test/resources/query/sql/query82.sql b/query/src/test/resources/query/sql/query82.sql index 6b62753..29d67b8 100644 --- a/query/src/test/resources/query/sql/query82.sql +++ b/query/src/test/resources/query/sql/query82.sql @@ -18,9 +18,8 @@ SELECT test_kylin_fact.cal_dt, seller_id - ,sum(test_kylin_fact.price) as GMV FROM test_kylin_fact left JOIN edw.test_cal_dt as test_cal_dt ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt group by - test_kylin_fact.cal_dt, test_kylin_fact.seller_id order by gmv desc limit 100 + test_kylin_fact.cal_dt, test_kylin_fact.seller_id order by sum(test_kylin_fact.price) desc limit 100