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/09 15:41:57 UTC
[50/50] 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/53e0d97e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53e0d97e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53e0d97e
Branch: refs/heads/ignite-1093-2
Commit: 53e0d97e5a6dfd4e3fb1e5bc82aa496c53193098
Parents: ce23c05 8521b89
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 9 16:38:32 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 9 16:38:32 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 +-
.../CacheClientPortableQueryExample.java | 4 +-
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 +-
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +-
.../configuration/CacheConfiguration.java | 3 +-
.../ignite/internal/GridUpdateNotifier.java | 82 ++++--
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../affinity/GridAffinityProcessor.java | 8 +-
.../processors/cache/GridCacheAdapter.java | 11 +-
.../processors/cache/GridCacheEntryEx.java | 12 +-
.../cache/GridCacheEvictionManager.java | 2 +
.../processors/cache/GridCacheMapEntry.java | 11 +-
.../cache/GridCacheMvccCandidate.java | 6 +-
.../cache/GridCacheSharedContext.java | 7 +
.../processors/cache/GridCacheSwapManager.java | 2 +-
.../processors/cache/IgniteCacheProxy.java | 27 +-
.../distributed/dht/GridDhtCacheAdapter.java | 14 +-
.../distributed/dht/GridDhtLocalPartition.java | 23 +-
.../distributed/dht/GridDhtLockFuture.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 22 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 3 +
.../colocated/GridDhtColocatedLockFuture.java | 14 +-
.../dht/preloader/GridDhtPreloader.java | 20 +-
.../distributed/near/GridNearLockFuture.java | 14 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 7 +-
.../distributed/near/GridNearTxRemote.java | 6 +-
.../cache/query/GridCacheLocalQueryFuture.java | 5 +-
.../cache/query/GridCacheQueryAdapter.java | 43 +--
.../query/GridCacheQueryFutureAdapter.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 11 +-
.../query/GridCacheQueryMetricsAdapter.java | 125 +++++----
.../transactions/IgniteTxLocalAdapter.java | 20 +-
.../processors/igfs/IgfsDataManager.java | 14 +-
.../callback/PlatformCallbackGateway.java | 5 +-
.../callback/PlatformCallbackUtils.java | 3 +-
.../processors/query/GridQueryProcessor.java | 50 ++--
.../core/src/main/resources/ignite.properties | 2 +-
.../ignite/GridSuppressedExceptionSelfTest.java | 22 --
.../ignite/internal/GridStartStopSelfTest.java | 13 +-
.../internal/GridUpdateNotifierSelfTest.java | 23 +-
.../ignite/internal/GridVersionSelfTest.java | 20 +-
.../cache/CacheAffinityCallSelfTest.java | 16 +-
.../cache/CacheSwapUnswapGetTest.java | 234 ++++++++++++++++
...cheAbstractFullApiMultithreadedSelfTest.java | 69 +++--
.../processors/cache/GridCacheMvccSelfTest.java | 29 +-
.../processors/cache/GridCacheStopSelfTest.java | 49 ++--
...gniteCacheTransactionalStopBusySelfTest.java | 5 -
...GridCacheQueueMultiNodeAbstractSelfTest.java | 34 +--
...dCacheQueueMultiNodeConsistencySelfTest.java | 58 ++--
.../GridCacheSetFailoverAbstractSelfTest.java | 2 -
.../IgniteCacheMessageRecoveryAbstractTest.java | 14 +-
.../IgniteCacheTxMessageRecoveryTest.java | 5 -
...PartitionedFullApiMultithreadedSelfTest.java | 5 -
...CachePartitionedTxMultiThreadedSelfTest.java | 2 +-
...eReplicatedFullApiMultithreadedSelfTest.java | 5 -
...dCacheLocalFullApiMultithreadedSelfTest.java | 5 -
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +
.../unsafe/GridUnsafeMemoryPerformanceTest.java | 65 +++++
.../unsafe/GridUnsafeMemorySelfTest.java | 38 ---
.../tcp/TcpDiscoveryMultiThreadedTest.java | 2 +
.../junits/common/GridCommonAbstractTest.java | 59 ++--
.../IgniteCacheFailoverTestSuite2.java | 3 +
.../testsuites/IgniteCacheTestSuite4.java | 3 +
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 +-
.../CacheAbstractQueryMetricsSelfTest.java | 279 +++++++++----------
.../h2/GridIndexingSpiAbstractSelfTest.java | 13 -
.../query/h2/sql/BaseH2CompareQueryTest.java | 5 -
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 +-
.../cpp/common/include/ignite/common/java.h | 4 +-
.../main/cpp/common/project/vs/common.vcxproj | 8 +-
.../platform/src/main/cpp/common/src/java.cpp | 6 +-
.../src/main/cpp/core-test/configure.ac | 2 +-
.../cpp/core-test/project/vs/core-test.vcxproj | 4 +-
.../main/cpp/core-test/src/cache_query_test.cpp | 5 +
.../src/main/cpp/core-test/src/cache_test.cpp | 5 +
.../main/cpp/core-test/src/ignition_test.cpp | 9 +-
modules/platform/src/main/cpp/core/configure.ac | 2 +-
.../cpp/core/src/impl/ignite_environment.cpp | 3 +-
.../platform/src/main/cpp/project/vs/ignite.sln | 48 ++++
.../main/dotnet/Apache.Ignite.Core/Ignition.cs | 28 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 10 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 8 +-
.../Impl/Unmanaged/UnmanagedUtils.cs | 13 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
.../platform/PlatformProcessorImpl.java | 2 +-
.../platform/cache/PlatformCache.java | 23 +-
.../cache/PlatformCacheEntryProcessorImpl.java | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../IgniteStartStopTest.cs | 70 +++++
.../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 +-
scripts/apply-pull-request.sh | 141 +++++++---
145 files changed, 2144 insertions(+), 763 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/53e0d97e/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/53e0d97e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/53e0d97e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/53e0d97e/modules/yardstick/pom.xml
----------------------------------------------------------------------