You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/07/24 04:19:13 UTC
[45/50] incubator-ignite git commit: Merge branches 'ignite-gg-10576'
and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-gg-10576
Merge branches 'ignite-gg-10576' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10576
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d1dcd027
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d1dcd027
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d1dcd027
Branch: refs/heads/ignite-gg-10576
Commit: d1dcd027ef2d5fc4e1b256407c13fd913199f1d7
Parents: 34f3074 0055b40
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jul 23 14:16:34 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jul 23 14:16:34 2015 +0700
----------------------------------------------------------------------
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 +-
.../ignite/compute/ComputeJobResultPolicy.java | 3 +-
.../configuration/CacheConfiguration.java | 4 +-
.../configuration/IgniteConfiguration.java | 26 ++
.../apache/ignite/internal/IgniteKernal.java | 15 +
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../failover/GridFailoverContextImpl.java | 28 +-
.../managers/failover/GridFailoverManager.java | 13 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheAttributes.java | 8 +-
.../processors/cache/GridCacheContext.java | 45 ++-
.../processors/cache/GridCacheMvccManager.java | 20 +-
.../GridCachePartitionExchangeManager.java | 53 +++
.../processors/cache/GridCacheProcessor.java | 113 ++++--
.../processors/cache/GridCacheUtils.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../processors/cache/IgniteInternalCache.java | 4 +-
.../distributed/dht/GridDhtTopologyFuture.java | 14 -
.../distributed/dht/GridDhtTxFinishFuture.java | 13 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 16 +-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 11 +-
.../GridDhtPartitionsExchangeFuture.java | 41 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 4 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../near/GridNearTxFinishFuture.java | 17 +-
.../cache/transactions/IgniteTxManager.java | 9 +-
.../processors/closure/AffinityTask.java | 35 ++
.../closure/GridClosureProcessor.java | 63 ++-
.../processors/task/GridTaskWorker.java | 24 +-
.../ignite/internal/util/IgniteUtils.java | 35 +-
.../ignite/internal/util/nio/GridNioServer.java | 9 +
.../util/nio/GridSelectorNioSessionImpl.java | 8 +
.../plugin/security/SecurityPermission.java | 7 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 66 +--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
.../tcp/internal/TcpDiscoveryNode.java | 18 +-
.../ignite/spi/failover/FailoverContext.java | 18 +
.../spi/failover/always/AlwaysFailoverSpi.java | 25 ++
.../IgniteClientReconnectFailoverTest.java | 53 ++-
.../cache/CacheAffinityCallSelfTest.java | 174 ++++++++
.../cache/GridCacheAffinityRoutingSelfTest.java | 157 ++++++-
.../cache/GridCachePutAllFailoverSelfTest.java | 3 +
.../cache/IgniteCacheNearLockValueSelfTest.java | 2 +
.../GridCacheAbstractNodeRestartSelfTest.java | 9 +
.../distributed/IgniteCache150ClientsTest.java | 1 +
.../IgniteCacheClientReconnectTest.java | 175 ++++++++
.../IgniteCacheServerNodeConcurrentStart.java | 96 +++++
...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++
.../IgniteCachePutRetryAbstractSelfTest.java | 52 ++-
...gniteCachePutRetryTransactionalSelfTest.java | 17 +-
.../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 ++++
.../spi/failover/GridFailoverTestContext.java | 10 +
.../testframework/junits/GridAbstractTest.java | 8 +-
.../IgniteCacheFailoverTestSuite2.java | 4 +
.../testsuites/IgniteCacheRestartTestSuite.java | 5 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../testsuites/IgniteCacheTestSuite2.java | 2 +-
.../testsuites/IgniteCacheTestSuite4.java | 2 -
.../testsuites/IgniteClientNodesTestSuite.java | 42 ++
.../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 -
.../ignite/schema/ui/SchemaImportApp.java | 36 +-
.../org/apache/ignite/spark/IgniteContext.scala | 14 +
pom.xml | 12 +-
97 files changed, 2011 insertions(+), 686 deletions(-)
----------------------------------------------------------------------