Merge branch 'master' into ignite-gg-10561
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74b8fdb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74b8fdb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74b8fdb4 Branch: refs/heads/ignite-gg-10561 Commit: 74b8fdb435136831666641a6ca5f830945b6ebe7 Parents: 1f86c20 0055b40 Author: ashutak <ashu...@gridgain.com> Authored: Thu Jul 23 13:03:02 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Thu Jul 23 13:03:02 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 | 3 +- .../distributed/dht/GridDhtTxFinishFuture.java | 13 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 7 +- .../GridDhtPartitionsExchangeFuture.java | 10 +- .../near/GridNearOptimisticTxPrepareFuture.java | 4 +- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 17 +- .../cache/transactions/IgniteTxManager.java | 5 +- .../ignite/internal/util/IgniteUtils.java | 27 +- .../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 +- .../cache/CacheAffinityCallSelfTest.java | 10 +- .../cache/GridCachePutAllFailoverSelfTest.java | 3 + .../GridCacheAbstractNodeRestartSelfTest.java | 9 + ...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++ .../GridCachePartitionedFailoverSelfTest.java | 5 - ...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 + 64 files changed, 906 insertions(+), 530 deletions(-) ----------------------------------------------------------------------
