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 D16B118EA7 for ; Thu, 23 Jul 2015 16:06:02 +0000 (UTC) Received: (qmail 87766 invoked by uid 500); 23 Jul 2015 16:06:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87733 invoked by uid 500); 23 Jul 2015 16:06:02 -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 87724 invoked by uid 99); 23 Jul 2015 16:06:02 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 16:06:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 50B8118D5BC for ; Thu, 23 Jul 2015 16:06:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, 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 (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id vdDckrpzDN0T for ; Thu, 23 Jul 2015 16:05:58 +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 1A13A2C6DB for ; Thu, 23 Jul 2015 16:05:50 +0000 (UTC) Received: (qmail 84819 invoked by uid 99); 23 Jul 2015 16:04:34 -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 16:04:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE791E6836; Thu, 23 Jul 2015 16:04:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 23 Jul 2015 16:04:52 -0000 Message-Id: <2e5686d80f5a4ca6b56bf155df3cad5e@git.apache.org> In-Reply-To: <16d0f7f1a07541d190be3eead304498d@git.apache.org> References: <16d0f7f1a07541d190be3eead304498d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/20] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-630 Merge remote-tracking branch 'remotes/origin/master' into ignite-630 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80cec1be Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80cec1be Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80cec1be Branch: refs/heads/master Commit: 80cec1be0ef9887894e67e580c2e22e9be585c29 Parents: df0c86a 0055b40 Author: Anton Vinogradov Authored: Thu Jul 23 14:49:01 2015 +0300 Committer: Anton Vinogradov Committed: Thu Jul 23 14:49:01 2015 +0300 ---------------------------------------------------------------------- modules/apache-license-gen/pom.xml | 13 - .../java/org/apache/ignite/IgniteCache.java | 3 +- .../apache/ignite/IgniteSystemProperties.java | 8 + .../AffinityNodeAddressHashResolver.java | 8 +- .../affinity/AffinityNodeHashResolver.java | 5 + .../affinity/AffinityNodeIdHashResolver.java | 6 + .../rendezvous/RendezvousAffinityFunction.java | 22 +- .../configuration/CacheConfiguration.java | 4 +- .../configuration/IgniteConfiguration.java | 26 ++ .../apache/ignite/internal/IgniteKernal.java | 3 + .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheMvccManager.java | 14 + .../processors/cache/GridCacheProcessor.java | 113 ++++-- .../processors/cache/IgniteInternalCache.java | 4 +- .../distributed/dht/GridDhtTxFinishFuture.java | 13 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 16 +- .../GridDhtPartitionsExchangeFuture.java | 10 +- .../near/GridNearOptimisticTxPrepareFuture.java | 4 +- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 17 +- .../cache/transactions/IgniteTxManager.java | 5 +- .../ignite/internal/util/IgniteUtils.java | 31 +- .../ignite/internal/util/nio/GridNioServer.java | 9 + .../util/nio/GridSelectorNioSessionImpl.java | 8 + .../ignite/spi/discovery/tcp/ServerImpl.java | 58 +-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 18 +- .../IgniteClientReconnectFailoverTest.java | 6 + .../cache/CacheAffinityCallSelfTest.java | 10 +- .../cache/GridCachePutAllFailoverSelfTest.java | 3 + .../GridCacheAbstractNodeRestartSelfTest.java | 9 + ...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++ .../GridCachePartitionedFailoverSelfTest.java | 5 - ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +- .../internal/util/nio/GridNioSelfTest.java | 88 +++- .../internal/util/nio/GridNioSslSelfTest.java | 16 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 ++++ .../testframework/junits/GridAbstractTest.java | 3 +- .../IgniteCacheFailoverTestSuite2.java | 4 + .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../IgniteSpiDiscoverySelfTestSuite.java | 1 + .../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 + pom.xml | 12 +- 67 files changed, 928 insertions(+), 544 deletions(-) ----------------------------------------------------------------------