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 09:32:33 UTC

[50/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51

Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51


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

Branch: refs/heads/ignite-51
Commit: bf2b5ac2803e2950f6cdf1abfef575112edbce78
Parents: b7c65bd be3c24c
Author: sboikov <sb...@gridgain.com>
Authored: Wed Mar 4 11:27:43 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Mar 4 11:27:43 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 +-
 .../processors/cache/GridCacheAttributes.java   |    32 +-
 .../processors/cache/GridCacheProcessor.java    |    29 +-
 .../rest/client/message/GridClientNodeBean.java |    23 -
 .../top/GridTopologyCommandHandler.java         |     8 -
 .../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 -
 ...idCacheConfigurationConsistencySelfTest.java |    46 +-
 ...ridCacheConfigurationValidationSelfTest.java |     8 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    12 +-
 .../GridCachePartitionedAffinitySpreadTest.java |    16 +-
 .../IgniteClientAffinityAssignmentSelfTest.java |    16 +-
 .../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 |     1 -
 .../core/src/test/resources/log/ignite.log.tst  | 13706 -----------------
 .../hibernate/CacheHibernateBlobStore.java      |     2 +-
 .../hibernate/HibernateL2CacheSelfTest.java     |     8 +-
 .../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 +
 .../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 +-
 129 files changed, 411 insertions(+), 15808 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf2b5ac2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------