Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 91ED9185C2 for ; Wed, 5 Aug 2015 01:46:17 +0000 (UTC) Received: (qmail 27688 invoked by uid 500); 5 Aug 2015 01:46:17 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 27658 invoked by uid 500); 5 Aug 2015 01:46:17 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 27649 invoked by uid 99); 5 Aug 2015 01:46:17 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Aug 2015 01:46:17 +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 18509C022F for ; Wed, 5 Aug 2015 01:46:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-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 XEZHHUnziyUe for ; Wed, 5 Aug 2015 01:46:09 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 0F1E224F90 for ; Wed, 5 Aug 2015 01:46:02 +0000 (UTC) Received: (qmail 26725 invoked by uid 99); 5 Aug 2015 01:46:01 -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; Wed, 05 Aug 2015 01:46:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B083CE35D0; Wed, 5 Aug 2015 01:46:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 05 Aug 2015 01:46:06 -0000 Message-Id: In-Reply-To: <489740c065db4af789521b6ea6a06fe2@git.apache.org> References: <489740c065db4af789521b6ea6a06fe2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/19] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98ad8925 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98ad8925 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98ad8925 Branch: refs/heads/ignite-104 Commit: 98ad89253b8e252d36a2e3c45d44466cb5b97d02 Parents: 2421fee 90adeae Author: Valentin Kulichenko Authored: Tue Aug 4 10:35:34 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 4 10:35:34 2015 -0700 ---------------------------------------------------------------------- .../h2/twostep/GridReduceQueryExecutor.java | 34 ++++- ...idCacheReduceQueryMultithreadedSelfTest.java | 21 ++- .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 11 ++ .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++++++++++++++++++ 6 files changed, 198 insertions(+), 7 deletions(-) ----------------------------------------------------------------------