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 8081D186FC for ; Thu, 23 Jul 2015 13:10:22 +0000 (UTC) Received: (qmail 48475 invoked by uid 500); 23 Jul 2015 13:10:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 48444 invoked by uid 500); 23 Jul 2015 13:10:00 -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 48433 invoked by uid 99); 23 Jul 2015 13:10:00 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 13:10:00 +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 24431C0B8F for ; Thu, 23 Jul 2015 13:10:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] 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 U2cuDP-wAkHq for ; Thu, 23 Jul 2015 13:09:45 +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 38822254A6 for ; Thu, 23 Jul 2015 13:09:44 +0000 (UTC) Received: (qmail 46797 invoked by uid 99); 23 Jul 2015 13:09:43 -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; Thu, 23 Jul 2015 13:09:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 473BFE6814; Thu, 23 Jul 2015 13:09:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 23 Jul 2015 13:10:07 -0000 Message-Id: <12438c6566ae44d4b2f0f18e7f115f73@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/26] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961-master Merge remote-tracking branch 'remotes/origin/master' into ignite-961-master Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb4f38d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb4f38d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb4f38d3 Branch: refs/heads/ignite-961-master Commit: fb4f38d3a02843795174621a40e357b108ffffa7 Parents: 9dd00ac c4a4bd4 Author: ivasilinets Authored: Thu Jul 23 16:09:19 2015 +0300 Committer: ivasilinets Committed: Thu Jul 23 16:09:19 2015 +0300 ---------------------------------------------------------------------- modules/apache-license-gen/pom.xml | 13 - .../apache/ignite/IgniteSystemProperties.java | 8 + .../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 14 + .../distributed/dht/GridDhtTxFinishFuture.java | 13 +- .../GridDhtPartitionsExchangeFuture.java | 10 +- .../near/GridNearOptimisticTxPrepareFuture.java | 4 +- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 17 +- .../cache/transactions/IgniteTxManager.java | 5 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 58 +-- .../cache/GridCachePutAllFailoverSelfTest.java | 3 + .../GridCacheAbstractNodeRestartSelfTest.java | 9 + ...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++ .../GridCachePartitionedFailoverSelfTest.java | 5 - ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + .../IgniteCacheFailoverTestSuite2.java | 4 + .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../processors/query/h2/sql/GridSqlAlias.java | 4 + .../processors/query/h2/sql/GridSqlColumn.java | 4 + .../processors/query/h2/sql/GridSqlConst.java | 4 + .../processors/query/h2/sql/GridSqlElement.java | 40 +- .../query/h2/sql/GridSqlFunction.java | 2 + .../processors/query/h2/sql/GridSqlJoin.java | 4 + .../query/h2/sql/GridSqlOperation.java | 21 +- .../query/h2/sql/GridSqlOperationType.java | 2 + .../query/h2/sql/GridSqlParameter.java | 4 + .../query/h2/sql/GridSqlPlaceholder.java | 4 + .../processors/query/h2/sql/GridSqlQuery.java | 25 +- .../query/h2/sql/GridSqlQueryParser.java | 11 +- .../query/h2/sql/GridSqlQuerySplitter.java | 405 ++++++++++++------- .../processors/query/h2/sql/GridSqlSelect.java | 91 ++--- .../query/h2/sql/GridSqlSubquery.java | 4 + .../processors/query/h2/sql/GridSqlTable.java | 4 + .../processors/query/h2/sql/GridSqlType.java | 10 +- .../processors/query/h2/sql/GridSqlUnion.java | 11 - .../cache/GridCacheCrossCacheQuerySelfTest.java | 77 +--- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + .../IgniteCacheQueryNodeRestartSelfTest.java | 5 - .../org/apache/ignite/spark/IgniteContext.scala | 14 + 42 files changed, 532 insertions(+), 442 deletions(-) ----------------------------------------------------------------------