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 D73E118006 for ; Mon, 28 Dec 2015 14:42:15 +0000 (UTC) Received: (qmail 17928 invoked by uid 500); 28 Dec 2015 14:42:15 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17842 invoked by uid 500); 28 Dec 2015 14:42:15 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 17360 invoked by uid 99); 28 Dec 2015 14:42:14 -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; Mon, 28 Dec 2015 14:42:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9752AE057A; Mon, 28 Dec 2015 14:42:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 28 Dec 2015 14:42:22 -0000 Message-Id: In-Reply-To: <617739e3b9554f84a8e29a947213f9fb@git.apache.org> References: <617739e3b9554f84a8e29a947213f9fb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/31] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2 Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0cfc6a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0cfc6a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0cfc6a7 Branch: refs/heads/master Commit: c0cfc6a784ab94430b730d200d37788b70dc930b Parents: b534c42 bbdb202 Author: Anton Vinogradov Authored: Tue Dec 22 11:54:01 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 22 11:54:01 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 44 +++- .../internal/binary/BinaryClassDescriptor.java | 56 ++++- .../ignite/internal/binary/BinaryUtils.java | 11 + .../processors/cache/IgniteCacheProxy.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../cache/VisorCacheQueryConfiguration.java | 11 + .../cache/VisorCacheStoreConfiguration.java | 13 +- .../internal/visor/query/VisorQueryJob.java | 6 + .../binary/BinaryMarshallerSelfTest.java | 110 +++++++++ .../processors/query/h2/IgniteH2Indexing.java | 118 ++++++--- .../processors/query/h2/sql/GridSqlQuery.java | 3 + .../query/h2/sql/GridSqlQuerySplitter.java | 113 +++++---- .../query/IgniteSqlSchemaIndexingTest.java | 240 +++++++++++++++++++ .../query/IgniteSqlSplitterSelfTest.java | 52 ++++ .../query/h2/sql/GridQueryParsingTest.java | 9 +- .../IgniteBinaryCacheQueryTestSuite.java | 3 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../commands/cache/VisorCacheCommand.scala | 14 +- .../config/benchmark-multicast.properties | 2 +- 19 files changed, 709 insertions(+), 107 deletions(-) ----------------------------------------------------------------------