You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/03/04 08:24:09 UTC

[1/4] incubator-ignite git commit: Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-187 25b1e5a23 -> 4dd275b19


Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/482094bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/482094bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/482094bf

Branch: refs/heads/ignite-187
Commit: 482094bfcda306bed2e9a392c9472c3c12814395
Parents: 4ba2862 2a68e64
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Mar 3 13:44:36 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Mar 3 13:44:36 2015 +0300

----------------------------------------------------------------------
 examples/pom-standalone.xml                     |   2 +-
 .../ClientAbstractMultiThreadedSelfTest.java    |  37 +-
 .../impl/ClientPartitionAffinitySelfTest.java   | 406 -----------
 .../ClientAbstractMultiNodeSelfTest.java        |  54 +-
 .../integration/ClientAbstractSelfTest.java     |   8 -
 .../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/IgniteCluster.java   |   8 +-
 .../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 +-
 .../configuration/CacheConfiguration.java       |   2 +-
 .../configuration/IgniteConfiguration.java      |  11 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 592 +++++++---------
 .../ignite/internal/client/GridClientNode.java  |   8 -
 .../client/GridClientPartitionAffinity.java     |   2 +-
 .../client/impl/GridClientNodeImpl.java         |  22 -
 .../connection/GridClientNioTcpConnection.java  |   3 +-
 .../affinity/GridAffinityAssignmentCache.java   |  13 +-
 .../processors/cache/CacheMetricsImpl.java      |   4 +
 .../processors/cache/GridCacheAttributes.java   |  32 +-
 .../processors/cache/GridCacheContext.java      |  19 +
 .../processors/cache/GridCacheMapEntry.java     |   9 +
 .../processors/cache/GridCacheProcessor.java    |  44 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   3 +
 .../distributed/dht/GridDhtLocalPartition.java  |   5 +
 .../dht/atomic/GridDhtAtomicCache.java          |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   2 +-
 .../cache/transactions/IgniteTxManager.java     |   7 +-
 .../rest/client/message/GridClientNodeBean.java |  23 -
 .../top/GridTopologyCommandHandler.java         |   8 -
 .../cache/VisorCacheAffinityConfiguration.java  |  19 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../config/load/dsi-49-server-production.xml    |   2 +-
 .../GridCacheAffinityBackupsSelfTest.java       |   9 -
 .../ignite/IgniteCacheAffinitySelfTest.java     |  30 +-
 ...AffinityProcessorConsistentHashSelfTest.java |  31 -
 .../GridCacheAbstractLocalStoreSelfTest.java    | 440 ++++++++++++
 .../cache/GridCacheAbstractMetricsSelfTest.java |  42 ++
 ...acheAbstractUsersAffinityMapperSelfTest.java | 207 ++++++
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |  45 ++
 ...idCacheConfigurationConsistencySelfTest.java |  46 +-
 ...ridCacheConfigurationValidationSelfTest.java |   8 +-
 .../cache/GridCacheOffHeapSelfTest.java         |  12 +-
 .../GridCachePartitionedAffinitySpreadTest.java |  16 +-
 .../GridCachePartitionedLocalStoreSelfTest.java |  51 ++
 ...chePartitionedOffHeapLocalStoreSelfTest.java |  56 ++
 .../GridCacheReplicatedLocalStoreSelfTest.java  |  51 ++
 ...heReplicatedUsersAffinityMapperSelfTest.java |  45 ++
 ...ridCacheTxPartitionedLocalStoreSelfTest.java |  51 ++
 .../GridCacheTxUsersAffinityMapperSelfTest.java |  45 ++
 .../IgniteClientAffinityAssignmentSelfTest.java |  16 +-
 .../GridCacheQueueCleanupSelfTest.java          |   1 -
 .../GridCacheClientModesAbstractSelfTest.java   |   4 +-
 ...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 +-
 .../GridCachePartitionedNodeRestartTest.java    |   4 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |   4 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |   4 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |   4 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   4 +-
 ...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 |   5 +-
 .../hibernate/HibernateL2CacheSelfTest.java     |   8 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  12 +-
 modules/scalar/pom.xml                          |   6 +
 .../ignite/schema/generator/PojoGenerator.java  |   3 +-
 .../schema/generator/SnippetGenerator.java      | 138 ++++
 .../apache/ignite/schema/ui/SchemaLoadApp.java  |   2 +
 .../commands/cache/VisorCacheCommand.scala      |  18 +-
 .../commands/cache/VisorCacheScanCommand.scala  |   7 +-
 .../config/VisorConfigurationCommand.scala      |   5 +-
 .../visor/commands/node/VisorNodeCommand.scala  |   6 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  27 +-
 pom.xml                                         |   4 +-
 110 files changed, 1741 insertions(+), 2249 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/482094bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------


[3/4] incubator-ignite git commit: ignite-187 review

Posted by yz...@apache.org.
ignite-187 review


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b184ee05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b184ee05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b184ee05

Branch: refs/heads/ignite-187
Commit: b184ee058317ff7adcc7348eb34f5c4773a6183d
Parents: 0c9ada0
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Mar 4 10:23:44 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Mar 4 10:23:44 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/GridKernalContextImpl.java     | 2 +-
 .../java/org/apache/ignite/internal/processors/GridProcessor.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b184ee05/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 64526e9..6ae0916 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -282,7 +282,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
 
     /** */
     @GridToStringExclude
-    private Map<String, Object> attrs = new HashMap<>(150);
+    private Map<String, Object> attrs = new HashMap<>();
 
     /** */
     private IgniteEx grid;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b184ee05/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
index 49de3a9..563c986 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
@@ -25,4 +25,5 @@ import org.apache.ignite.internal.util.tostring.*;
  */
 @GridToStringExclude
 public interface GridProcessor extends GridComponent {
+    // No-op.
 }


[2/4] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-187' into ignite-187

Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-187' into ignite-187


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c9ada09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c9ada09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c9ada09

Branch: refs/heads/ignite-187
Commit: 0c9ada090d272fd5ad9023bdc2bf854cfbdc9db0
Parents: 482094b 57fc321
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Mar 4 10:13:57 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Mar 4 10:13:57 2015 +0300

----------------------------------------------------------------------
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |     2 +-
 modules/clients/readme.md                       |     4 +-
 modules/clients/readme.pdf                      |   Bin 52230 -> 47887 bytes
 .../integration/ClientAbstractSelfTest.java     |     3 -
 .../java/org/apache/ignite/IgniteEvents.java    |     2 +-
 .../apache/ignite/cache/store/CacheStore.java   |    49 -
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |     2 +-
 .../apache/ignite/internal/GridDiagnostic.java  |    15 +-
 .../ignite/internal/GridUpdateNotifier.java     |     8 +-
 .../apache/ignite/internal/IgniteKernal.java    |    23 +-
 .../internal/managers/GridManagerAdapter.java   |    59 +-
 .../checkpoint/GridCheckpointManager.java       |     2 -
 .../collision/GridCollisionManager.java         |     2 -
 .../managers/communication/GridIoManager.java   |     2 -
 .../deployment/GridDeploymentManager.java       |     2 -
 .../discovery/GridDiscoveryManager.java         |     2 -
 .../eventstorage/GridEventStorageManager.java   |     2 -
 .../managers/failover/GridFailoverManager.java  |     2 -
 .../managers/indexing/GridIndexingManager.java  |     2 -
 .../loadbalancer/GridLoadBalancerManager.java   |     2 -
 .../swapspace/GridSwapSpaceManager.java         |     2 -
 .../internal/processors/GridProcessor.java      |     3 -
 .../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
 .../internal/GridUpdateNotifierSelfTest.java    |     2 +-
 .../core/src/test/resources/log/ignite.log.tst  | 13706 -----------------
 .../hibernate/CacheHibernateBlobStore.java      |     2 +-
 .../rest/protocols/http/jetty/rest.html         |    19 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |     2 +-
 .../ignite/visor/commands/VisorConsole.scala    |    16 +-
 .../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
 pom.xml                                         |     1 -
 58 files changed, 85 insertions(+), 13913 deletions(-)
----------------------------------------------------------------------



[4/4] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-187' into ignite-187

Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-187' into ignite-187


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4dd275b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4dd275b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4dd275b1

Branch: refs/heads/ignite-187
Commit: 4dd275b191dd87cd28976bbc2699862b6e988455
Parents: b184ee0 25b1e5a
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Mar 4 10:24:04 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Mar 4 10:24:04 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/managers/GridManagerAdapter.java | 5 +++++
 .../internal/managers/discovery/GridDiscoveryManager.java       | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------