Merge remote-tracking branch 'remotes/origin/master' into ignite-964-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43ab9398 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43ab9398 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43ab9398 Branch: refs/heads/ignite-964-1 Commit: 43ab9398d42e6cb5fb6d3fd6e10fe3561737cb27 Parents: 5c86f3b 4c9d8c2 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Jul 8 19:32:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Jul 8 19:32:17 2015 +0300 ---------------------------------------------------------------------- dev-tools/slurp.sh | 2 +- .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 - .../cache/eviction/lru/LruEvictionPolicy.java | 5 - .../eviction/sorted/SortedEvictionPolicy.java | 19 +- .../configuration/CacheConfiguration.java | 4 + .../configuration/TransactionConfiguration.java | 23 +++ .../internal/interop/InteropIgnition.java | 17 +- .../internal/interop/InteropProcessor.java | 7 + .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheProcessor.java | 21 +- .../cache/GridCacheSharedContext.java | 15 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 35 +++- .../processors/query/GridQueryProcessor.java | 5 + .../visor/cache/VisorCacheConfiguration.java | 11 - .../ignite/spi/discovery/tcp/ServerImpl.java | 46 +++++ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- .../cache/CacheFutureExceptionSelfTest.java | 161 +++++++-------- .../GridCachePartitionedNodeRestartTest.java | 5 - ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 - .../GridCacheReplicatedNodeRestartSelfTest.java | 5 - ...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +- ...heConcurrentEvictionConsistencySelfTest.java | 15 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++ .../IgniteSpiDiscoverySelfTestSuite.java | 3 + .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - .../CacheAbstractQueryMetricsSelfTest.java | 157 +++++++++++++- .../cache/CacheLocalQueryMetricsSelfTest.java | 33 +++ ...titionedQueryMetricsDistributedSelfTest.java | 33 +++ ...chePartitionedQueryMetricsLocalSelfTest.java | 33 +++ .../CachePartitionedQueryMetricsSelfTest.java | 32 --- ...plicatedQueryMetricsDistributedSelfTest.java | 33 +++ ...acheReplicatedQueryMetricsLocalSelfTest.java | 33 +++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 --- .../IgniteCacheQuerySelfTestSuite.java | 7 +- .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 ++++++- .../cache/jta/GridCacheXAResource.java | 16 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +++-- .../GridTmLookupLifecycleAwareSelfTest.java | 29 ++- modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++ modules/kafka/pom.xml | 11 - .../commands/cache/VisorCacheCommand.scala | 2 - .../config/benchmark-put-indexed-val.properties | 64 ++++++ modules/yardstick/config/ignite-base-config.xml | 23 +++ .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++ .../ignite/yardstick/cache/model/Person1.java | 55 +++++ .../ignite/yardstick/cache/model/Person2.java | 67 ++++++ .../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++ scripts/git-patch-prop.sh | 2 +- 62 files changed, 1450 insertions(+), 323 deletions(-) ----------------------------------------------------------------------
