You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/04/08 13:10:16 UTC
[09/22] incubator-ignite git commit: # Ignite-639 Merge with sprint-3.
# Ignite-639 Merge with sprint-3.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e486f9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e486f9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e486f9c
Branch: refs/heads/ignite-sprint-3
Commit: 8e486f9c36a21d796dd42f0712365b913ca8baca
Parents: bdea1a2 ea777d4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 3 22:30:46 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 3 22:30:46 2015 +0700
----------------------------------------------------------------------
.gitignore | 2 +-
DEVNOTES.txt | 19 +-
examples/pom-standalone.xml | 1 -
ipc/shmem/README.txt | 2 +-
modules/core/pom.xml | 38 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../configuration/CacheConfiguration.java | 31 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../processors/cache/CacheMetricsImpl.java | 1 +
.../processors/cache/CacheProjection.java | 36 -
.../cache/CacheStorePartialUpdateException.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 274 +---
.../processors/cache/GridCacheAttributes.java | 8 -
.../cache/GridCacheConcurrentMap.java | 34 +-
.../processors/cache/GridCacheContext.java | 9 +-
.../cache/GridCacheDeploymentManager.java | 7 +-
.../processors/cache/GridCacheEntryEx.java | 55 +-
.../processors/cache/GridCacheMapEntry.java | 290 +----
.../cache/GridCacheMapEntryFactory.java | 2 -
.../processors/cache/GridCachePeekMode.java | 81 --
.../processors/cache/GridCacheProcessor.java | 62 +-
.../cache/GridCacheProjectionImpl.java | 11 -
.../processors/cache/GridCacheProxyImpl.java | 24 -
.../processors/cache/GridCacheStoreManager.java | 1202 ------------------
.../processors/cache/GridCacheUtils.java | 11 -
.../cache/GridCacheWriteBehindStore.java | 1015 ---------------
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java | 31 +-
.../distributed/dht/GridDhtCacheEntry.java | 8 +-
.../distributed/dht/GridDhtLocalPartition.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridNoStorageCacheMap.java | 11 +-
.../dht/atomic/GridDhtAtomicCache.java | 40 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 35 +-
.../colocated/GridDhtColocatedCacheEntry.java | 4 +-
.../colocated/GridDhtDetachedCacheEntry.java | 5 +-
.../distributed/near/GridNearCacheAdapter.java | 75 +-
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/cache/local/GridLocalCache.java | 3 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 7 +-
.../cache/store/CacheOsStoreManager.java | 59 +
.../cache/store/CacheStoreManager.java | 182 +++
.../store/GridCacheStoreManagerAdapter.java | 1111 ++++++++++++++++
.../cache/store/GridCacheWriteBehindStore.java | 1015 +++++++++++++++
.../cache/transactions/IgniteTxAdapter.java | 5 +-
.../transactions/IgniteTxLocalAdapter.java | 43 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 14 +-
.../IgniteCacheObjectProcessorImpl.java | 10 +-
.../datastreamer/DataStreamerImpl.java | 21 +-
.../processors/plugin/CachePluginManager.java | 51 +-
.../processors/query/GridQueryProcessor.java | 143 ++-
.../messages/GridQueryNextPageResponse.java | 34 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../visor/cache/VisorCacheConfiguration.java | 83 +-
.../cache/VisorCacheDefaultConfiguration.java | 21 -
.../cache/VisorCacheNearConfiguration.java | 11 +-
.../visor/node/VisorGridConfiguration.java | 28 +-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../ignite/plugin/CachePluginContext.java | 11 +
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
.../resources/META-INF/classnames.properties | 94 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 2 +
...idCacheConfigurationConsistencySelfTest.java | 3 -
.../GridCacheOnCopyFlagAbstractSelfTest.java | 16 +-
.../cache/GridCachePartitionedWritesTest.java | 3 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 40 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 189 ---
.../GridCacheWriteBehindStoreAbstractTest.java | 349 -----
.../GridCacheWriteBehindStoreLocalTest.java | 30 -
...heWriteBehindStoreMultithreadedSelfTest.java | 163 ---
...BehindStorePartitionedMultiNodeSelfTest.java | 215 ----
...ridCacheWriteBehindStorePartitionedTest.java | 30 -
...GridCacheWriteBehindStoreReplicatedTest.java | 30 -
.../GridCacheWriteBehindStoreSelfTest.java | 267 ----
...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 24 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 8 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearMultiNodeSelfTest.java | 103 +-
.../near/GridCacheNearOneNodeSelfTest.java | 33 +-
.../near/GridCacheNearReadersSelfTest.java | 154 +--
.../GridCacheReplicatedPreloadSelfTest.java | 11 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 191 +++
.../GridCacheWriteBehindStoreAbstractTest.java | 350 +++++
.../GridCacheWriteBehindStoreLocalTest.java | 30 +
...heWriteBehindStoreMultithreadedSelfTest.java | 163 +++
...BehindStorePartitionedMultiNodeSelfTest.java | 216 ++++
...ridCacheWriteBehindStorePartitionedTest.java | 30 +
...GridCacheWriteBehindStoreReplicatedTest.java | 30 +
.../GridCacheWriteBehindStoreSelfTest.java | 268 ++++
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../processors/igfs/IgfsSizeSelfTest.java | 46 +-
.../processors/igfs/IgsfStartCacheTest.java | 115 ++
.../loadtests/hashmap/GridCacheTestContext.java | 8 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 42 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../IgniteCacheWriteBehindTestSuite.java | 3 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../query/h2/twostep/GridMapQueryExecutor.java | 86 +-
.../query/h2/twostep/GridResultPage.java | 9 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 368 ++++++
.../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 +
.../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 +
...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 +
...TtlOffheapTransactionalAbstractSelfTest.java | 29 +
...cheTtlOffheapTransactionalLocalSelfTest.java | 34 +
...OffheapTransactionalPartitionedSelfTest.java | 34 +
.../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 +
.../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 +
...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 +
...eTtlOnheapTransactionalAbstractSelfTest.java | 29 +
...acheTtlOnheapTransactionalLocalSelfTest.java | 34 +
...lOnheapTransactionalPartitionedSelfTest.java | 34 +
.../IgniteCacheWithIndexingTestSuite.java | 51 +
.../IgniteH2IndexingSpiTestSuite.java | 7 -
.../GridUriDeploymentFileResourceLoader.java | 2 +-
.../commands/cache/VisorCacheCommand.scala | 2 -
parent/pom.xml | 10 +-
scripts/git-apply-patch.sh | 88 ++
scripts/git-format-patch.sh | 84 ++
scripts/git-patch-functions.sh | 132 ++
scripts/git-patch-prop.sh | 28 +
137 files changed, 5877 insertions(+), 5108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e486f9c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 7afdb0d,923fedd..88edbaa
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@@ -124,57 -121,37 +124,38 @@@ public class VisorCacheConfiguration im
* @param ccfg Cache configuration.
* @return Data transfer object for cache configuration properties.
*/
- public static VisorCacheConfiguration from(IgniteEx ignite, CacheConfiguration ccfg) {
- VisorCacheConfiguration cfg = new VisorCacheConfiguration();
-
- cfg.name = ccfg.getName();
- cfg.mode = ccfg.getCacheMode();
- cfg.atomicityMode = ccfg.getAtomicityMode();
- cfg.atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode();
- cfg.eagerTtl = ccfg.isEagerTtl();
- cfg.writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
- cfg.swapEnabled = ccfg.isSwapEnabled();
- cfg.invalidate = ccfg.isInvalidate();
- cfg.startSize = ccfg.getStartSize();
- cfg.tmLookupClsName = ccfg.getTransactionManagerLookupClassName();
- cfg.offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
- cfg.maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
- cfg.memoryMode = ccfg.getMemoryMode();
- cfg.interceptor = compactClass(ccfg.getInterceptor());
- cfg.typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata());
- cfg.statisticsEnabled = ccfg.isStatisticsEnabled();
- cfg.mgmtEnabled = ccfg.isManagementEnabled();
- cfg.ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
- cfg.writerFactory = compactClass(ccfg.getCacheWriterFactory());
- cfg.expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
- cfg.system = ignite.systemCache(ccfg.getName());
-
- cfg.affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
- cfg.rebalanceCfg = VisorCacheRebalanceConfiguration.from(ccfg);
- cfg.evictCfg = VisorCacheEvictionConfiguration.from(ccfg);
- cfg.nearCfg = VisorCacheNearConfiguration.from(ccfg);
- cfg.dfltCfg = VisorCacheDefaultConfiguration.from(ccfg);
- cfg.storeCfg = VisorCacheStoreConfiguration.from(ignite, ccfg);
- cfg.qryCfg = VisorCacheQueryConfiguration.from(ccfg);
-
- return cfg;
- }
-
- /**
- * @param ignite Grid.
- * @param caches Cache configurations.
- * @return Data transfer object for cache configurations properties.
- */
- public static Iterable<VisorCacheConfiguration> list(IgniteEx ignite, CacheConfiguration[] caches) {
- if (caches == null)
- return Collections.emptyList();
-
- final Collection<VisorCacheConfiguration> cfgs = new ArrayList<>(caches.length);
-
- for (CacheConfiguration cache : caches)
- cfgs.add(from(ignite, cache));
-
- return cfgs;
+ public VisorCacheConfiguration from(Ignite ignite, CacheConfiguration ccfg) {
+ name = ccfg.getName();
+ mode = ccfg.getCacheMode();
+ atomicityMode = ccfg.getAtomicityMode();
+ atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode();
+ eagerTtl = ccfg.isEagerTtl();
+ writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
+ swapEnabled = ccfg.isSwapEnabled();
+ invalidate = ccfg.isInvalidate();
+ startSize = ccfg.getStartSize();
+ tmLookupClsName = ccfg.getTransactionManagerLookupClassName();
+ offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
+ maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
+ memoryMode = ccfg.getMemoryMode();
+ interceptor = compactClass(ccfg.getInterceptor());
+ typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata());
+ statisticsEnabled = ccfg.isStatisticsEnabled();
+ mgmtEnabled = ccfg.isManagementEnabled();
+ ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
+ writerFactory = compactClass(ccfg.getCacheWriterFactory());
+ expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
-
++ system = ignite.systemCache(ccfg.getName());
++
+ affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
+ rebalanceCfg = VisorCacheRebalanceConfiguration.from(ccfg);
+ evictCfg = VisorCacheEvictionConfiguration.from(ccfg);
+ nearCfg = VisorCacheNearConfiguration.from(ccfg);
+ dfltCfg = VisorCacheDefaultConfiguration.from(ccfg);
+ storeCfg = VisorCacheStoreConfiguration.from(ignite, ccfg);
+ qryCfg = VisorCacheQueryConfiguration.from(ccfg);
+
+ return this;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e486f9c/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------