Merge branch 'master' into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7a24bfc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7a24bfc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7a24bfc Branch: refs/heads/ignite-1282 Commit: b7a24bfcafd452a3c2ef99b5cf7e0004d4e5110d Parents: 87fd9ac 40ae364 Author: vozerov-gridgain <[email protected]> Authored: Thu Sep 10 15:03:29 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Sep 10 15:03:29 2015 +0300 ---------------------------------------------------------------------- examples/config/platform/cpp/example-cache.xml | 87 --------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/CacheConfiguration.java | 41 +--- .../ignite/configuration/TopologyValidator.java | 24 ++- .../internal/portable/PortableReaderExImpl.java | 3 - .../processors/cache/CacheMetricsImpl.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 13 ++ .../cache/GridCacheEvictionManager.java | 18 +- .../processors/cache/GridCacheMapEntry.java | 45 ++++- .../cache/GridCacheSwapEntryImpl.java | 24 +-- .../processors/cache/GridCacheSwapManager.java | 168 +++++++++++++--- .../processors/cache/GridCacheUtils.java | 21 +- .../distributed/dht/GridDhtLocalPartition.java | 7 +- .../offheap/GridOffHeapProcessor.java | 25 ++- .../util/offheap/GridOffHeapEvictListener.java | 5 + .../internal/util/offheap/GridOffHeapMap.java | 13 +- .../util/offheap/GridOffHeapMapFactory.java | 28 +-- .../util/offheap/GridOffHeapPartitionedMap.java | 11 ++ .../util/offheap/unsafe/GridUnsafeMap.java | 128 +++++++++---- .../unsafe/GridUnsafePartitionedMap.java | 9 + .../core/src/main/resources/ignite.properties | 2 +- ...idPortableMarshallerCtxDisabledSelfTest.java | 168 ++++++++++++++-- .../GridPortableMarshallerSelfTest.java | 1 - .../cache/CacheSwapUnswapGetTest.java | 85 ++++++++- .../processors/cache/GridCacheTestEntryEx.java | 6 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 191 +++++++------------ .../offheap/GridOffHeapMapAbstractSelfTest.java | 16 +- .../GridOffHeapMapPerformanceAbstractTest.java | 4 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 20 ++ .../unsafe/GridUnsafeMapPerformanceTest.java | 2 +- .../offheap/unsafe/GridUnsafeMapSelfTest.java | 2 +- .../GridOffHeapMapPerformanceAbstractTest.java | 4 +- .../unsafe/GridUnsafeMapPerformanceTest.java | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 9 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/platform/pom.xml | 2 +- .../platform/src/main/cpp/common/configure.ac | 2 +- .../src/main/cpp/core-test/configure.ac | 2 +- modules/platform/src/main/cpp/core/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 86 files changed, 823 insertions(+), 477 deletions(-) ----------------------------------------------------------------------
