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 2017/05/31 12:47:21 UTC
[11/13] ignite git commit: Merge remote-tracking branch
'origin/ignite-5075' into ignite-5075
Merge remote-tracking branch 'origin/ignite-5075' into ignite-5075
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
# modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a36d186d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a36d186d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a36d186d
Branch: refs/heads/ignite-5075
Commit: a36d186d24dd651535a7e32f0fbcb1eaa7683685
Parents: 56af061 6250119
Author: sboikov <sb...@gridgain.com>
Authored: Wed May 31 15:35:28 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed May 31 15:35:28 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteEx.java | 9 +-
.../apache/ignite/internal/IgniteKernal.java | 19 +-
.../ignite/internal/pagemem/PageSupport.java | 2 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../internal/processors/cache/CacheData.java | 13 +
.../cache/CacheGroupInfrastructure.java | 175 ++++-
.../cache/CacheJoinNodeDiscoveryData.java | 15 +-
.../cache/CacheOffheapEvictionManager.java | 11 +-
.../processors/cache/ClusterCachesInfo.java | 61 +-
.../cache/DynamicCacheChangeRequest.java | 21 +-
.../cache/DynamicCacheDescriptor.java | 13 +
.../processors/cache/GridCacheAdapter.java | 4 +-
.../cache/GridCacheAffinityManager.java | 2 +-
.../processors/cache/GridCacheAttributes.java | 21 +-
.../cache/GridCacheConcurrentMap.java | 32 +-
.../cache/GridCacheConcurrentMapImpl.java | 56 +-
.../processors/cache/GridCacheContext.java | 20 +-
.../cache/GridCacheLocalConcurrentMap.java | 23 +-
.../processors/cache/GridCacheMapEntry.java | 51 +-
.../processors/cache/GridCacheProcessor.java | 86 ++-
.../processors/cache/GridNoStorageCacheMap.java | 4 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 25 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../cache/database/CacheDataRowAdapter.java | 21 +-
.../processors/cache/database/RowStore.java | 5 +
.../cache/database/tree/BPlusTree.java | 2 +
.../GridDistributedCacheAdapter.java | 8 +-
.../dht/GridCachePartitionedConcurrentMap.java | 8 +-
.../distributed/dht/GridDhtCacheEntry.java | 10 +-
.../distributed/dht/GridDhtGetSingleFuture.java | 30 +-
.../distributed/dht/GridDhtLocalPartition.java | 248 +++----
.../dht/GridDhtPartitionTopologyImpl.java | 1 -
.../dht/GridPartitionedSingleGetFuture.java | 4 +-
.../dht/preloader/GridDhtPartitionDemander.java | 5 +-
.../GridDhtPartitionsExchangeFuture.java | 10 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 21 +-
.../CacheContinuousQueryEventBuffer.java | 5 +-
.../continuous/CacheContinuousQueryHandler.java | 106 ++-
.../CacheContinuousQueryListener.java | 17 +
.../continuous/CacheContinuousQueryManager.java | 51 +-
.../query/continuous/CounterSkipContext.java | 78 ++
.../cluster/GridClusterStateProcessor.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 1 +
.../datastructures/GridCacheLockImpl.java | 10 +-
.../processors/query/GridQueryProcessor.java | 7 +-
.../internal/processors/query/QueryUtils.java | 30 +-
.../handlers/cache/GridCacheCommandHandler.java | 2 +-
.../processors/cache/IgniteCacheGroupsTest.java | 717 +++++++++++++++++--
.../cache/IgniteDynamicCacheStartSelfTest.java | 4 +-
...nuousQueryConcurrentPartitionUpdateTest.java | 137 +++-
.../processors/igfs/IgfsIgniteMock.java | 4 +-
.../junits/multijvm/IgniteProcessProxy.java | 4 +-
.../processors/query/h2/database/H2Tree.java | 6 +-
.../query/h2/database/H2TreeIndex.java | 7 +-
.../cache/index/H2DynamicTableSelfTest.java | 79 +-
modules/platforms/cpp/examples/Makefile.am | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
.../cpp/examples/odbc-example/Makefile.am | 12 +-
.../cpp/examples/project/vs/ignite-examples.sln | 12 +-
.../cpp/examples/put-get-example/Makefile.am | 58 ++
.../put-get-example/config/example-cache.xml | 67 ++
.../project/vs/put-get-example.vcxproj | 110 +++
.../project/vs/put-get-example.vcxproj.filters | 38 +
.../put-get-example/src/put_get_example.cpp | 126 ++++
.../cpp/examples/putget-example/Makefile.am | 58 --
.../putget-example/config/example-cache.xml | 67 --
.../project/vs/putget-example.vcxproj | 110 ---
.../project/vs/putget-example.vcxproj.filters | 38 -
.../putget-example/src/putget_example.cpp | 126 ----
.../cpp/examples/query-example/Makefile.am | 12 +-
.../StartupTest.cs | 78 ++
.../Apache.Ignite.Core.Tests.NuGet/TestUtil.cs | 30 +
.../Deployment/PeerAssemblyLoadingTest.cs | 8 +-
.../Apache.Ignite.Core.nuspec | 7 +-
.../Impl/Common/IgniteHome.cs | 3 +-
.../platforms/dotnet/Apache.Ignite/App.config | 11 +
.../yardstick/IgniteBenchmarkArguments.java | 21 +
.../cache/IgniteCacheAbstractBenchmark.java | 142 ++++
.../yardstick/cache/IgniteGetAllBenchmark.java | 3 +
.../cache/IgniteGetAllPutAllTxBenchmark.java | 2 +
.../cache/IgniteGetAndPutBenchmark.java | 2 +
.../cache/IgniteGetAndPutTxBenchmark.java | 2 +
.../yardstick/cache/IgniteGetBenchmark.java | 18 +-
.../IgniteGetEntriesPutAllTxBenchmark.java | 2 +
.../yardstick/cache/IgniteInvokeBenchmark.java | 2 +
.../cache/IgniteInvokeTxBenchmark.java | 2 +
.../IgniteInvokeWithInjectionBenchmark.java | 2 +
.../yardstick/cache/IgnitePutAllBenchmark.java | 2 +
.../IgnitePutAllSerializableTxBenchmark.java | 2 +
.../yardstick/cache/IgnitePutBenchmark.java | 2 +
.../cache/IgnitePutGetBatchBenchmark.java | 2 +
.../yardstick/cache/IgnitePutGetBenchmark.java | 2 +
.../cache/IgnitePutGetEntryBenchmark.java | 2 +
.../cache/IgnitePutGetEntryTxBenchmark.java | 2 +
.../cache/IgnitePutGetTxBatchBenchmark.java | 2 +
.../cache/IgnitePutGetTxBenchmark.java | 2 +
...IgnitePutIfAbsentIndexedValue1Benchmark.java | 2 +
.../cache/IgnitePutIndexedValue1Benchmark.java | 2 +
.../cache/IgnitePutIndexedValue2Benchmark.java | 2 +
.../cache/IgnitePutIndexedValue8Benchmark.java | 2 +
.../cache/IgnitePutObjectKeyBenchmark.java | 125 ++++
.../IgnitePutRandomValueSizeBenchmark.java | 2 +
.../cache/IgnitePutRemoveBenchmark.java | 2 +
.../yardstick/cache/IgnitePutTxBenchmark.java | 2 +
.../cache/IgnitePutTxImplicitBenchmark.java | 2 +
.../cache/IgnitePutTxPrimaryOnlyBenchmark.java | 2 +
.../IgnitePutTxSkipLocalBackupBenchmark.java | 2 +
.../cache/IgnitePutValue8Benchmark.java | 2 +
.../IgniteReplaceIndexedValue1Benchmark.java | 2 +
.../cache/IgniteSqlQueryBenchmark.java | 16 +-
.../IgniteSqlQueryDistributedJoinBenchmark.java | 24 +-
.../cache/IgniteSqlQueryJoinBenchmark.java | 14 +-
.../cache/IgniteSqlQueryPutBenchmark.java | 8 +-
.../IgniteSqlQueryPutSeparatedBenchmark.java | 4 +
.../IgniteCacheRandomOperationBenchmark.java | 42 +-
116 files changed, 2789 insertions(+), 968 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a36d186d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index eb04711,245e688..f9b5655
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -1232,8 -1236,13 +1236,14 @@@ public class GridCacheProcessor extend
cacheCtx.onStarted();
- if (log.isInfoEnabled()){
- log.info("Started cache [name=" + cfg.getName() +(cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") + ", memoryPolicyName=" + cfg.getMemoryPolicyName() + ", mode=" + cfg.getCacheMode() +", atomicity=" + cfg.getAtomicityMode() + ']');}
++
+ if (log.isInfoEnabled()) {
+ log.info("Started cache [name=" + cfg.getName() +
+ (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
+ ", memoryPolicyName=" + cfg.getMemoryPolicyName() +
+ ", mode=" + cfg.getCacheMode() +
+ ", atomicity=" + cfg.getAtomicityMode() + ']');
- }
++}
}
/**