Merge branch 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-329
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae71c789 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae71c789 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae71c789 Branch: refs/heads/sprint-2 Commit: ae71c789993d57a76722a5e31f32b4c161e93225 Parents: 7457968 5d2a7c6 Author: anovikov <anovi...@gridgain.com> Authored: Wed Mar 4 19:39:04 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Wed Mar 4 19:39:04 2015 +0700 ---------------------------------------------------------------------- .../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 +- .../visor/cache/VisorCacheClearTask.java | 3 +- .../visor/cache/VisorCacheLoadTask.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 .../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 +- .../scala/org/apache/ignite/visor/Packet.scala | 38 - .../ignite/visor/commands/VisorConsole.scala | 18 +- .../ignite/visor/commands/ack/Packet.scala | 55 - .../visor/commands/ack/VisorAckCommand.scala | 2 +- .../ignite/visor/commands/alert/Packet.scala | 108 - .../ignite/visor/commands/cache/Packet.scala | 127 - .../commands/cache/VisorCacheCommand.scala | 28 +- .../commands/cache/VisorCacheScanCommand.scala | 7 +- .../ignite/visor/commands/config/Packet.scala | 55 - .../config/VisorConfigurationCommand.scala | 5 +- .../ignite/visor/commands/deploy/Packet.scala | 76 - .../ignite/visor/commands/disco/Packet.scala | 72 - .../ignite/visor/commands/events/Packet.scala | 97 - .../ignite/visor/commands/gc/Packet.scala | 61 - .../ignite/visor/commands/ggcube_128x128.png | Bin 11444 -> 0 bytes .../ignite/visor/commands/ggcube_48x48.png | Bin 3365 -> 0 bytes .../ignite/visor/commands/kill/Packet.scala | 78 - .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../visor/commands/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../ignite/visor/commands/logo_ignite_48x48.png | Bin 0 -> 16572 bytes .../ignite/visor/commands/node/Packet.scala | 60 - .../visor/commands/node/VisorNodeCommand.scala | 6 +- .../ignite/visor/commands/ping/Packet.scala | 50 - .../visor/commands/ping/VisorPingCommand.scala | 2 +- .../ignite/visor/commands/start/Packet.scala | 90 - .../ignite/visor/commands/tasks/Packet.scala | 116 - .../commands/tasks/VisorTasksCommand.scala | 26 +- .../ignite/visor/commands/top/Packet.scala | 87 - .../ignite/visor/commands/vvm/Packet.scala | 61 - .../scala/org/apache/ignite/visor/visor.scala | 27 +- pom.xml | 50 +- 151 files changed, 432 insertions(+), 17068 deletions(-) ----------------------------------------------------------------------
