You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/11 13:36:32 UTC
[21/22] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1093-2
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/62926548
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/62926548
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/62926548
Branch: refs/heads/ignite-1093-2
Commit: 629265487a068fc4633611af267271375bde142a
Parents: 53e0d97 b736c46
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Sep 11 14:16:50 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 11 14:16:50 2015 +0300
----------------------------------------------------------------------
examples/config/platform/cpp/example-cache.xml | 87 ------
examples/platform/cpp/Makefile.am | 39 ---
examples/platform/cpp/README.txt | 42 ---
examples/platform/cpp/configure.ac | 30 --
examples/platform/cpp/include/Makefile.am | 21 --
.../cpp/include/ignite/examples/address.h | 109 --------
.../cpp/include/ignite/examples/organization.h | 111 --------
.../platform/cpp/project/vs/ignite-examples.sln | 19 --
.../cpp/project/vs/ignite-examples.vcxproj | 107 --------
.../project/vs/ignite-examples.vcxproj.filters | 30 --
examples/platform/cpp/src/putgetexample.cpp | 126 ---------
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 +--
.../configuration/IgniteConfiguration.java | 22 --
.../configuration/PlatformConfiguration.java | 25 --
.../ignite/configuration/TopologyValidator.java | 34 ++-
.../apache/ignite/internal/IgniteKernal.java | 8 +-
.../internal/portable/PortableContext.java | 6 +-
.../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 +-
.../platform/PlatformConfiguration.java | 25 ++
.../dotnet/PlatformDotNetConfiguration.java | 119 ++++++++
.../PlatformDotNetPortableConfiguration.java | 228 ++++++++++++++++
...PlatformDotNetPortableTypeConfiguration.java | 248 +++++++++++++++++
.../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 +
.../dotnet/PlatformDotNetConfiguration.java | 119 --------
.../PlatformDotNetPortableConfiguration.java | 228 ----------------
...PlatformDotNetPortableTypeConfiguration.java | 248 -----------------
.../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 +-
modules/platform/src/main/cpp/README.txt | 103 +++++++
.../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 +-
.../main/cpp/core/project/vs/core.vcxprojrel | 272 -------------------
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
.../platform/PlatformProcessorImpl.java | 3 +-
.../cpp/PlatformCppConfigurationClosure.java | 6 +-
.../PlatformDotNetConfigurationClosure.java | 7 +-
.../dotnet/PlatformDotNetConfigurationEx.java | 1 -
.../platform/cpp/PlatformCppConfiguration.java | 2 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Config/Compute/compute-standalone.xml | 8 +-
.../Config/cache-portables.xml | 4 +-
.../Config/cache-query.xml | 4 +-
.../native-client-test-cache-affinity.xml | 6 +-
.../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 +-
118 files changed, 1582 insertions(+), 2054 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/62926548/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/62926548/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/62926548/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/62926548/modules/yardstick/pom.xml
----------------------------------------------------------------------