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/03/04 14:26:52 UTC
[17/22] incubator-ignite git commit: #ignite-51: merge
#ignite-51: merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ebb880cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ebb880cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ebb880cb
Branch: refs/heads/ignite-51
Commit: ebb880cbde7e4901df467b75337df937227dd01c
Parents: 3dbf815 bf2b5ac
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Mar 4 13:00:05 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Mar 4 13:00:05 2015 +0300
----------------------------------------------------------------------
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
modules/clients/readme.md | 4 +-
modules/clients/readme.pdf | Bin 52230 -> 47887 bytes
.../ClientAbstractMultiThreadedSelfTest.java | 37 +-
.../impl/ClientPartitionAffinitySelfTest.java | 406 -
.../ClientAbstractMultiNodeSelfTest.java | 54 +-
.../integration/ClientAbstractSelfTest.java | 11 -
.../ClientTcpUnreachableMultiNodeSelfTest.java | 4 -
.../client/suite/IgniteClientTestSuite.java | 1 -
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../java/org/apache/ignite/IgniteEvents.java | 2 +-
.../ignite/cache/CacheTypeFieldMetadata.java | 2 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 18 +-
.../java/org/apache/ignite/cache/GridCache.java | 2 +-
.../CacheConsistentHashAffinityFunction.java | 702 -
.../cache/affinity/consistenthash/package.html | 24 -
.../CacheRendezvousAffinityFunction.java | 2 +-
.../apache/ignite/cache/store/CacheStore.java | 49 -
.../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../configuration/IgniteConfiguration.java | 6 +-
.../apache/ignite/internal/GridDiagnostic.java | 15 +-
.../ignite/internal/GridUpdateNotifier.java | 8 +-
.../apache/ignite/internal/IgniteKernal.java | 23 +-
.../ignite/internal/client/GridClientNode.java | 8 -
.../client/GridClientPartitionAffinity.java | 2 +-
.../client/impl/GridClientNodeImpl.java | 22 -
.../connection/GridClientNioTcpConnection.java | 3 +-
.../communication/GridIoMessageFactory.java | 19 +-
.../processors/cache/CacheEntryPredicate.java | 40 +
.../cache/CacheEntryPredicateAdapter.java | 97 +
.../cache/CacheEntryPredicateContainsValue.java | 133 +
.../cache/CacheEntryPredicateHasValue.java | 28 +
.../cache/CacheEntryPredicateNoValue.java | 28 +
.../cache/CacheEntrySerializablePredicate.java | 140 +
.../processors/cache/CacheEvictionEntry.java | 179 +
.../processors/cache/CacheProjection.java | 80 +-
.../processors/cache/EvictableEntryImpl.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 298 +-
.../processors/cache/GridCacheAttributes.java | 32 +-
.../cache/GridCacheClearAllRunnable.java | 2 +-
.../cache/GridCacheConcurrentMap.java | 64 +-
.../processors/cache/GridCacheContext.java | 117 +-
.../cache/GridCacheDeploymentManager.java | 107 +-
.../processors/cache/GridCacheEntryEx.java | 22 +-
.../cache/GridCacheEvictionManager.java | 74 +-
.../cache/GridCacheEvictionRequest.java | 36 +-
.../processors/cache/GridCacheKeySet.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 62 +-
.../processors/cache/GridCacheMessage.java | 159 +-
.../processors/cache/GridCacheProcessor.java | 31 +-
.../processors/cache/GridCacheProjectionEx.java | 24 +-
.../cache/GridCacheProjectionImpl.java | 493 +-
.../processors/cache/GridCacheProxyImpl.java | 93 +-
.../processors/cache/GridCacheSwapManager.java | 12 +-
.../processors/cache/GridCacheUtils.java | 116 +-
.../cache/GridCacheValueCollection.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../processors/cache/KeyCacheObjectImpl.java | 5 +-
.../cache/KeyCacheObjectTransferImpl.java | 119 +
.../GridDistributedCacheAdapter.java | 6 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 10 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 8 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 69 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 42 +-
.../dht/colocated/GridDhtColocatedCache.java | 12 +-
.../colocated/GridDhtColocatedLockFuture.java | 6 +-
.../preloader/GridDhtPartitionSupplyPool.java | 1 +
.../distributed/near/GridNearAtomicCache.java | 36 +-
.../distributed/near/GridNearCacheAdapter.java | 49 +-
.../distributed/near/GridNearLockFuture.java | 12 +-
.../distributed/near/GridNearLockRequest.java | 36 +-
.../near/GridNearTransactionalCache.java | 6 +-
.../cache/distributed/near/GridNearTxLocal.java | 2 +-
.../distributed/near/GridNearTxRemote.java | 4 +-
.../processors/cache/local/GridLocalCache.java | 8 +-
.../cache/local/GridLocalLockFuture.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 102 +-
.../query/GridCacheDistributedQueryManager.java | 4 +-
.../cache/query/GridCacheLocalQueryFuture.java | 3 +-
.../cache/query/GridCacheQueriesImpl.java | 4 +-
.../cache/query/GridCacheQueryAdapter.java | 8 +-
.../cache/query/GridCacheQueryInfo.java | 7 +-
.../cache/query/GridCacheQueryManager.java | 42 +-
.../cache/query/GridCacheQueryRequest.java | 20 +-
.../cache/transactions/IgniteInternalTx.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 26 +-
.../transactions/IgniteTxLocalAdapter.java | 56 +-
.../cache/transactions/IgniteTxLocalEx.java | 4 +-
.../dataload/IgniteDataLoaderImpl.java | 11 +-
.../portable/GridPortableProcessor.java | 2 +-
.../portable/os/GridOsPortableProcessor.java | 7 +-
.../rest/client/message/GridClientNodeBean.java | 23 -
.../top/GridTopologyCommandHandler.java | 8 -
.../org/apache/ignite/internal/util/F0.java | 90 +
.../ignite/internal/util/lang/GridFunc.java | 52 -
.../cache/VisorCacheAffinityConfiguration.java | 19 +-
.../apache/ignite/marshaller/Marshaller.java | 2 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 2 +-
.../optimized/OptimizedMarshaller.java | 2 +-
.../SpringApplicationContextResource.java | 2 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 2 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 2 +-
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../PriorityQueueCollisionSpi.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 16 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../memory/MemoryEventStorageSpi.java | 2 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 2 +-
.../jobstealing/JobStealingFailoverSpi.java | 2 +-
.../spi/failover/never/NeverFailoverSpi.java | 2 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 2 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 4 +-
.../startup/cmdline/ggcube_node_128x128.png | Bin 4679 -> 0 bytes
.../startup/cmdline/ggcube_node_48x48.png | Bin 2355 -> 0 bytes
.../startup/cmdline/logo_ignite_128x128.png | Bin 0 -> 18667 bytes
.../startup/cmdline/logo_ignite_48x48.png | Bin 0 -> 16572 bytes
.../config/load/dsi-49-server-production.xml | 2 +-
.../GridCacheAffinityBackupsSelfTest.java | 9 -
.../ignite/IgniteCacheAffinitySelfTest.java | 30 +-
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
...AffinityProcessorConsistentHashSelfTest.java | 31 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 29 +-
...idCacheConfigurationConsistencySelfTest.java | 46 +-
...ridCacheConfigurationValidationSelfTest.java | 8 +-
.../cache/GridCacheOffHeapSelfTest.java | 12 +-
.../GridCachePartitionedAffinitySpreadTest.java | 16 +-
.../processors/cache/GridCacheTestEntryEx.java | 22 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 1 +
.../IgniteClientAffinityAssignmentSelfTest.java | 16 +-
...actQueueFailoverDataConsistencySelfTest.java | 2 +-
.../GridCacheClientModesAbstractSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 12 +-
...dCachePartitionedAffinityFilterSelfTest.java | 6 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../dht/GridCacheColocatedDebugTest.java | 4 +-
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 13 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 13 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 4 +-
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 6 +-
...dCachePartitionedTopologyChangeSelfTest.java | 7 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 5 +-
...ffinityFunctionExcludeNeighborsSelfTest.java | 32 -
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 226 -
.../GridCachePartitionedFullApiSelfTest.java | 11 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 21 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 4 +-
.../capacity/spring-capacity-cache.xml | 2 +-
.../loadtests/colocation/spring-colocation.xml | 2 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 4 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 4 +-
.../ignite/testframework/GridTestUtils.java | 11 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 -
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
.../core/src/test/resources/log/ignite.log.tst | 13706 -----------------
.../hibernate/CacheHibernateBlobStore.java | 2 +-
.../hibernate/HibernateL2CacheSelfTest.java | 8 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 34 -
.../cache/GridCacheAbstractQuerySelfTest.java | 20 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 17 -
.../processors/cache/GridCacheSwapSelfTest.java | 12 +-
.../rest/protocols/http/jetty/rest.html | 19 +-
.../ignite/schema/generator/PojoGenerator.java | 3 +-
.../schema/generator/SnippetGenerator.java | 138 +
.../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +
.../cache/spring/SpringDynamicCacheManager.java | 36 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 16 +-
.../commands/cache/VisorCacheCommand.scala | 18 +-
.../commands/cache/VisorCacheScanCommand.scala | 7 +-
.../config/VisorConfigurationCommand.scala | 5 +-
.../ignite/visor/commands/ggcube_128x128.png | Bin 11444 -> 0 bytes
.../ignite/visor/commands/ggcube_48x48.png | Bin 3365 -> 0 bytes
.../visor/commands/logo_ignite_128x128.png | Bin 0 -> 18667 bytes
.../ignite/visor/commands/logo_ignite_48x48.png | Bin 0 -> 16572 bytes
.../visor/commands/node/VisorNodeCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 27 +-
pom.xml | 50 +-
211 files changed, 2328 insertions(+), 17434 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebb880cb/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 44f8c7b,a9263b9..7c4f949
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -545,10 -545,10 +545,25 @@@ public class GridIoMessageFactory imple
break;
case 99:
+ msg = new CacheEntrySerializablePredicate();
+
+ break;
+
++ case 100:
++ msg = new IgniteTxEntry();
++
++ break;
++
++ case 101:
++ msg = new TxEntryValueHolder();
++
++ break;
++
++ case 102:
+ msg = new NearTxPrepareResponseOwnedValue();
+
+ break;
+
default:
if (ext != null) {
for (MessageFactory factory : ext) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebb880cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index f85fc37,5e6f2bb..678a653
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@@ -105,11 -103,9 +105,11 @@@ public class IgniteTxEntry implements G
/** Put filters. */
@GridToStringInclude
+ @GridDirectTransient
- private IgnitePredicate<Cache.Entry<Object, Object>>[] filters;
+ private CacheEntryPredicate[] filters;
/** Flag indicating whether filters passed. Used for fast-commit transactions. */
+ @GridDirectTransient
private boolean filtersPassed;
/** Flag indicating that filter is set and can not be replaced. */
@@@ -692,14 -684,23 +692,21 @@@
* @throws IgniteCheckedException If failed.
*/
public void marshal(GridCacheSharedContext<?, ?> ctx, boolean transferExpiry) throws IgniteCheckedException {
+ if (filters != null) {
+ for (CacheEntryPredicate p : filters) {
+ if (p != null)
+ p.prepareMarshal(ctx.cacheContext(cacheId));
+ }
+ }
+
// Do not serialize filters if they are null.
- if (depEnabled) {
- if (transformClosBytes == null && entryProcessorsCol != null)
- transformClosBytes = CU.marshal(ctx, entryProcessorsCol);
-
- if (F.isEmptyOrNulls(filters))
- filterBytes = null;
- else if (filterBytes == null)
- filterBytes = CU.marshal(ctx, filters);
- }
+ if (transformClosBytes == null && entryProcessorsCol != null)
+ transformClosBytes = CU.marshal(ctx, entryProcessorsCol);
+
+ if (F.isEmptyOrNulls(filters))
+ filterBytes = null;
+ else if (filterBytes == null)
+ filterBytes = CU.marshal(ctx, filters);
if (transferExpiry)
transferExpiryPlc = expiryPlc != null && expiryPlc != this.ctx.expiry();
@@@ -731,15 -730,23 +738,22 @@@
this.ctx = cacheCtx;
}
- if (depEnabled) {
- // Unmarshal transform closure anyway if it exists.
- if (transformClosBytes != null && entryProcessorsCol == null)
- entryProcessorsCol = ctx.marshaller().unmarshal(transformClosBytes, clsLdr);
+ // Unmarshal transform closure anyway if it exists.
+ if (transformClosBytes != null && entryProcessorsCol == null)
+ entryProcessorsCol = ctx.marshaller().unmarshal(transformClosBytes, clsLdr);
- if (filters == null && filterBytes != null) {
- filters = ctx.marshaller().unmarshal(filterBytes, clsLdr);
+ if (filters == null && filterBytes != null) {
+ filters = ctx.marshaller().unmarshal(filterBytes, clsLdr);
- if (filters == null)
- filters = CU.empty();
+ if (filters == null)
+ filters = CU.empty0();
+ else {
+ for (CacheEntryPredicate p : filters) {
+ if (p != null)
+ p.finishUnmarshal(ctx.cacheContext(cacheId), clsLdr);
+ }
+ }
+ }
}
key.finishUnmarshal(context(), clsLdr);