Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-565
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/414a963c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/414a963c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/414a963c
Branch: refs/heads/ignite-565
Commit: 414a963c4926a8421341477c537a7a41e90624ec
Parents: 465e2ff c3768f7
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Wed Mar 25 15:05:30 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Wed Mar 25 15:05:30 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/schema/CacheConfig.java | 4 +-
.../java/org/apache/ignite/schema/Demo.java | 56 +-
.../java/org/apache/ignite/schema/DemoNode.java | 37 +
.../java/org/apache/ignite/schema/Person.java | 6 +-
.../org/apache/ignite/schema/PersonKey.java | 4 +-
.../examples/datagrid/CacheQueryExample.java | 181 +++--
.../streaming/marketdata/StreamMarketData.java | 3 +-
.../examples/ScalarCacheAffinityExample.scala | 8 +-
.../scalar/examples/ScalarCacheExample.scala | 4 +-
.../ScalarCachePopularNumbersExample.scala | 6 +-
.../examples/ScalarCacheQueryExample.scala | 14 +-
.../scalar/examples/ScalarClosureExample.scala | 5 +-
.../examples/ScalarContinuationExample.scala | 7 +-
.../examples/ScalarCreditRiskExample.scala | 5 +-
.../scalar/examples/ScalarJvmCloudExample.scala | 2 +-
.../scalar/examples/ScalarPingPongExample.scala | 5 +-
.../scalar/examples/ScalarPrimeExample.scala | 4 +-
.../scalar/examples/ScalarScheduleExample.scala | 5 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 4 +-
.../scalar/examples/ScalarTaskExample.scala | 5 +-
.../examples/ScalarWorldShortestMapReduce.scala | 5 +-
.../ClientAbstractMultiThreadedSelfTest.java | 2 +-
.../ClientAbstractMultiNodeSelfTest.java | 2 +-
.../JettyRestProcessorAbstractSelfTest.java | 5 +
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 13 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 13 +-
.../src/test/resources/spring-server-node.xml | 6 +-
.../test/resources/spring-server-ssl-node.xml | 6 +-
.../src/main/java/org/apache/ignite/Ignite.java | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 2 +-
.../java/org/apache/ignite/IgniteCluster.java | 4 +-
.../org/apache/ignite/IgniteDataStreamer.java | 24 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 3 +-
.../ignite/cache/CacheDistributionMode.java | 69 --
.../apache/ignite/cache/CacheMemoryMode.java | 6 +-
.../java/org/apache/ignite/cache/CacheMode.java | 8 +-
.../apache/ignite/cache/CacheRebalanceMode.java | 3 +-
.../apache/ignite/cache/affinity/Affinity.java | 246 ++++++
.../affinity/AffinityCentralizedFunction.java | 31 +
.../ignite/cache/affinity/AffinityFunction.java | 110 +++
.../cache/affinity/AffinityFunctionContext.java | 72 ++
.../ignite/cache/affinity/AffinityKey.java | 189 +++++
.../cache/affinity/AffinityKeyMapped.java | 110 +++
.../cache/affinity/AffinityKeyMapper.java | 62 ++
.../AffinityNodeAddressHashResolver.java | 39 +
.../affinity/AffinityNodeHashResolver.java | 43 +
.../affinity/AffinityNodeIdHashResolver.java | 40 +
.../ignite/cache/affinity/CacheAffinity.java | 256 ------
.../cache/affinity/CacheAffinityFunction.java | 110 ---
.../affinity/CacheAffinityFunctionContext.java | 72 --
.../ignite/cache/affinity/CacheAffinityKey.java | 189 -----
.../cache/affinity/CacheAffinityKeyMapped.java | 110 ---
.../cache/affinity/CacheAffinityKeyMapper.java | 62 --
.../CacheAffinityNodeAddressHashResolver.java | 39 -
.../affinity/CacheAffinityNodeHashResolver.java | 43 -
.../CacheAffinityNodeIdHashResolver.java | 40 -
.../CacheCentralizedAffinityFunction.java | 31 -
.../fair/CachePartitionFairAffinity.java | 777 -------------------
.../affinity/fair/FairAffinityFunction.java | 777 +++++++++++++++++++
.../CacheRendezvousAffinityFunction.java | 501 ------------
.../rendezvous/RendezvousAffinityFunction.java | 500 ++++++++++++
.../cache/eviction/CacheEvictionFilter.java | 45 --
.../cache/eviction/CacheEvictionPolicy.java | 50 --
.../ignite/cache/eviction/EvictableEntry.java | 2 +-
.../ignite/cache/eviction/EvictionFilter.java | 43 +
.../ignite/cache/eviction/EvictionPolicy.java | 54 ++
.../eviction/fifo/CacheFifoEvictionPolicy.java | 192 -----
.../fifo/CacheFifoEvictionPolicyMBean.java | 50 --
.../cache/eviction/fifo/FifoEvictionPolicy.java | 191 +++++
.../eviction/fifo/FifoEvictionPolicyMBean.java | 50 ++
.../eviction/igfs/CacheIgfsEvictionFilter.java | 38 -
.../CacheIgfsPerBlockLruEvictionPolicy.java | 378 ---------
...acheIgfsPerBlockLruEvictionPolicyMXBean.java | 93 ---
.../cache/eviction/igfs/IgfsEvictionFilter.java | 38 +
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 376 +++++++++
.../IgfsPerBlockLruEvictionPolicyMXBean.java | 93 +++
.../eviction/lru/CacheLruEvictionPolicy.java | 199 -----
.../lru/CacheLruEvictionPolicyMBean.java | 50 --
.../cache/eviction/lru/LruEvictionPolicy.java | 198 +++++
.../eviction/lru/LruEvictionPolicyMBean.java | 50 ++
.../random/CacheRandomEvictionPolicy.java | 115 ---
.../random/CacheRandomEvictionPolicyMBean.java | 42 -
.../eviction/random/RandomEvictionPolicy.java | 114 +++
.../random/RandomEvictionPolicyMBean.java | 42 +
.../cache/query/annotations/package-info.java | 22 +
.../org/apache/ignite/cluster/package-info.java | 22 +
.../configuration/CacheConfiguration.java | 36 +-
.../configuration/NearCacheConfiguration.java | 6 +-
.../ignite/configuration/package-info.java | 22 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../affinity/GridAffinityAssignmentCache.java | 14 +-
.../GridAffinityFunctionContextImpl.java | 83 ++
.../affinity/GridAffinityProcessor.java | 22 +-
.../processors/affinity/GridAffinityUtils.java | 7 +-
.../GridCacheAffinityFunctionContextImpl.java | 83 --
.../processors/cache/CacheDistributionMode.java | 67 ++
.../cache/CacheEvictableEntryImpl.java | 197 +++++
.../processors/cache/CacheObjectContext.java | 6 +-
.../processors/cache/CacheProjection.java | 5 +-
.../processors/cache/EvictableEntryImpl.java | 197 -----
.../internal/processors/cache/GridCache.java | 7 +-
.../processors/cache/GridCacheAdapter.java | 16 +-
.../processors/cache/GridCacheAttributes.java | 12 +-
.../processors/cache/GridCacheContext.java | 12 +-
.../GridCacheDefaultAffinityKeyMapper.java | 14 +-
.../cache/GridCacheEvictionManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../cache/GridCachePreloaderAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 36 +-
.../processors/cache/GridCacheProxyImpl.java | 4 +-
.../processors/cache/GridCacheStoreManager.java | 74 +-
.../processors/cache/GridCacheUtils.java | 8 +-
.../cache/GridCacheWriteBehindStore.java | 36 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../cache/affinity/GridCacheAffinityProxy.java | 6 +-
.../GridDistributedCacheAdapter.java | 16 +-
.../dht/GridClientPartitionTopology.java | 4 +-
.../dht/GridDhtAssignmentFetchFuture.java | 7 +-
.../distributed/dht/GridDhtLockFuture.java | 9 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 6 +-
.../dht/GridPartitionedGetFuture.java | 6 +-
.../dht/colocated/GridDhtColocatedCache.java | 5 +
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../GridDhtPartitionsExchangeFuture.java | 4 +-
.../distributed/near/GridNearCacheEntry.java | 88 ++-
.../distributed/near/GridNearLockFuture.java | 1 +
.../distributed/near/GridNearLockRequest.java | 40 +-
.../processors/cache/query/CacheQuery.java | 3 +-
.../GridCacheInternalKeyImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../datastructures/GridCacheSetImpl.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 2 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 3 +
.../processors/igfs/IgfsFileWorker.java | 2 -
.../processors/igfs/IgfsHelperImpl.java | 16 +-
.../internal/processors/igfs/IgfsImpl.java | 8 +-
.../internal/processors/igfs/IgfsProcessor.java | 4 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 90 ++-
.../cache/VisorCacheAffinityConfiguration.java | 6 +-
.../cache/VisorCacheEvictionConfiguration.java | 2 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 2 +-
.../visor/node/VisorIgfsConfiguration.java | 11 +
.../internal/visor/util/VisorTaskUtils.java | 14 +-
.../apache/ignite/lifecycle/package-info.java | 22 +
.../org/apache/ignite/plugin/package-info.java | 22 +
.../apache/ignite/transactions/Transaction.java | 1 -
.../ignite/transactions/package-info.java | 22 +
.../resources/META-INF/classnames.properties | 34 +-
.../spring-cache-client-benchmark-1.xml | 4 +-
.../spring-cache-client-benchmark-2.xml | 4 +-
.../spring-cache-client-benchmark-3.xml | 4 +-
.../core/src/test/config/discovery-stress.xml | 3 +-
.../src/test/config/load/cache-benchmark.xml | 2 -
.../test/config/load/cache-client-benchmark.xml | 13 -
.../config/load/dsi-49-server-production.xml | 6 +-
.../src/test/config/load/dsi-load-server.xml | 7 +-
.../core/src/test/config/spring-cache-swap.xml | 2 +-
.../src/test/config/spring-cache-teststore.xml | 2 +-
.../core/src/test/config/spring-multicache.xml | 16 +-
.../GridCacheAffinityBackupsSelfTest.java | 8 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 20 +-
...CachePartitionFairAffinityNodesSelfTest.java | 242 ------
.../GridCachePartitionFairAffinitySelfTest.java | 264 -------
.../GridFairAffinityFunctionNodesSelfTest.java | 242 ++++++
.../fair/GridFairAffinityFunctionSelfTest.java | 264 +++++++
.../ignite/internal/GridAffinityMappedTest.java | 4 +-
.../internal/GridAffinityP2PSelfTest.java | 4 +-
.../GridJobMasterLeaveAwareSelfTest.java | 6 +-
.../internal/GridMultipleJobsSelfTest.java | 2 +-
.../GridAffinityProcessorAbstractSelfTest.java | 2 +-
...GridAffinityProcessorRendezvousSelfTest.java | 4 +-
...cheNearUpdateTopologyChangeAbstractTest.java | 140 ++++
.../cache/GridCacheAbstractFullApiSelfTest.java | 19 +-
.../GridCacheAbstractRemoveFailureTest.java | 8 +-
...acheAbstractUsersAffinityMapperSelfTest.java | 4 +-
.../cache/GridCacheAffinityApiSelfTest.java | 48 +-
.../cache/GridCacheAffinityMapperSelfTest.java | 14 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 2 +-
.../cache/GridCacheAlwaysEvictionPolicy.java | 2 +-
.../GridCacheAtomicMessageCountSelfTest.java | 2 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 2 -
.../GridCacheConcurrentTxMultiNodeTest.java | 28 +-
...idCacheConfigurationConsistencySelfTest.java | 56 +-
...ridCacheConfigurationValidationSelfTest.java | 6 +-
.../GridCacheInterceptorAbstractSelfTest.java | 8 +-
.../processors/cache/GridCacheLeakTest.java | 2 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 10 +-
.../cache/GridCacheMemoryModeSelfTest.java | 3 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 1 -
.../cache/GridCacheObjectToStringSelfTest.java | 18 +-
.../processors/cache/GridCacheOffHeapTest.java | 2 +-
.../GridCachePartitionedAffinitySpreadTest.java | 4 +-
...hePartitionedProjectionAffinitySelfTest.java | 1 -
.../cache/GridCacheReloadSelfTest.java | 2 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 14 +-
.../processors/cache/GridCacheTestEntryEx.java | 1 -
...idCacheValueConsistencyAbstractSelfTest.java | 27 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 10 +-
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 4 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 8 +-
.../processors/cache/IgniteTxAbstractTest.java | 4 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 2 +-
.../IgniteCollectionAbstractTest.java | 3 +-
...GridCachePartitionedNodeRestartSelfTest.java | 2 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 8 +-
...CacheAtomicNearUpdateTopologyChangeTest.java | 39 +
.../CacheTxNearUpdateTopologyChangeTest.java | 33 +
.../GridCacheAtomicTimeoutSelfTest.java | 2 +-
.../GridCacheClientModesAbstractSelfTest.java | 2 +-
.../GridCacheModuloAffinityFunction.java | 4 +-
...dCachePartitionedAffinityFilterSelfTest.java | 6 +-
...chePartitionedReloadAllAbstractSelfTest.java | 2 +-
...GridCachePreloadRestartAbstractSelfTest.java | 2 +-
.../GridCacheTransformEventSelfTest.java | 4 +-
...heAbstractTransformWriteThroughSelfTest.java | 2 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 61 +-
.../dht/GridCacheColocatedDebugTest.java | 2 +-
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 12 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 12 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 13 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 2 +-
.../GridCacheDhtPreloadMessageCountTest.java | 2 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 8 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 9 +-
...idCachePartitionedPreloadEventsSelfTest.java | 6 +-
...dCachePartitionedTopologyChangeSelfTest.java | 6 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 2 +-
...tNearPartitionedByteArrayValuesSelfTest.java | 3 -
...unctionExcludeNeighborsAbstractSelfTest.java | 6 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 1 -
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
...dCacheNearExpiredEntriesPreloadSelfTest.java | 2 -
.../near/GridCacheNearMultiGetSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 12 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 2 +-
.../near/GridCacheNearTxPreloadSelfTest.java | 1 -
...AffinityExcludeNeighborsPerformanceTest.java | 10 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 6 +-
.../GridCachePartitionedAffinitySelfTest.java | 6 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 3 +-
.../GridCachePartitionedEvictionSelfTest.java | 6 +-
...titionedExplicitLockNodeFailureSelfTest.java | 1 -
.../GridCachePartitionedFullApiSelfTest.java | 2 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 4 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 6 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 4 +-
.../GridCachePartitionedNodeRestartTest.java | 2 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 2 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +-
...ffinityFunctionExcludeNeighborsSelfTest.java | 4 +-
...dezvousAffinityMultiNodeFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedPreloadSelfTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 2 +-
...heConcurrentEvictionConsistencySelfTest.java | 24 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 6 +-
.../GridCacheDistributedEvictionsSelfTest.java | 2 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 8 +-
.../eviction/GridCacheEvictionAbstractTest.java | 8 +-
.../GridCacheEvictionFilterSelfTest.java | 10 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 2 +-
.../GridCacheEvictionTouchSelfTest.java | 24 +-
.../cache/eviction/GridCacheMockEntry.java | 3 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
.../GridCacheFifoEvictionPolicySelfTest.java | 18 +-
.../lru/GridCacheLruEvictionPolicySelfTest.java | 20 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 2 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 12 +-
.../IgniteCacheLoadAllAbstractTest.java | 2 +-
.../IgniteCacheNoWriteThroughAbstractTest.java | 3 +-
.../IgniteCacheStoreSessionAbstractTest.java | 6 +-
.../IgniteCacheTxLocalLoadAllTest.java | 1 -
...ridCacheContinuousQueryAbstractSelfTest.java | 3 +-
.../DataStreamProcessorSelfTest.java | 2 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 4 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 24 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 2 +-
...apPartitionedMapPerformanceAbstractTest.java | 2 +-
...GridUnsafePartitionedMapPerformanceTest.java | 2 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 2 +-
.../capacity/spring-capacity-cache.xml | 4 +-
.../loadtests/colocation/GridTestKey.java | 2 +-
.../loadtests/colocation/spring-colocation.xml | 4 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 4 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 2 +-
.../ignite/loadtests/dsi/GridDsiRequest.java | 2 +-
.../ignite/loadtests/dsi/GridDsiResponse.java | 4 +-
.../ignite/loadtests/dsi/GridDsiSession.java | 2 +-
...apPartitionedMapPerformanceAbstractTest.java | 2 +-
...GridUnsafePartitionedMapPerformanceTest.java | 2 +-
.../swap/GridSwapEvictAllBenchmark.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 8 +
.../ignite/testframework/junits/IgniteMock.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 81 +-
.../IgniteCacheFailoverTestSuite.java | 4 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 6 +-
.../tests/p2p/GridExternalAffinityFunction.java | 4 +-
.../p2p/GridExternalAffinityKeyMapper.java | 2 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 26 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 4 +-
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 4 +-
.../internal/processors/hadoop/HadoopSetup.java | 8 +-
.../hadoop/SecondaryFileSystemProvider.java | 31 +-
...oopSecondaryFileSystemConfigurationTest.java | 4 +-
.../hibernate/HibernateL2CacheSelfTest.java | 6 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 34 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 26 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +-
...GridCachePartitionedFieldsQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 3 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 3 +-
...niteCachePartitionedFieldsQuerySelfTest.java | 1 -
...dCacheAbstractReduceFieldsQuerySelfTest.java | 22 +-
.../query/h2/sql/GridQueryParsingTest.java | 2 -
.../ignite/schema/generator/CodeGenerator.java | 118 ++-
.../ignite/schema/generator/XmlGenerator.java | 12 +-
.../apache/ignite/schema/model/IndexItem.java | 16 +-
.../ignite/schema/model/PojoDescriptor.java | 16 +-
.../ignite/schema/ui/ConfirmCallable.java | 2 +-
.../org/apache/ignite/schema/ui/MessageBox.java | 21 +-
.../ignite/schema/ui/SchemaImportApp.java | 6 +-
.../schema/test/model/ignite-type-metadata.xml | 28 -
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
.../yardstick/IgniteAbstractBenchmark.java | 2 +-
.../yardstick/IgniteBenchmarkArguments.java | 1 +
.../org/apache/ignite/yardstick/IgniteNode.java | 6 +-
341 files changed, 6229 insertions(+), 5460 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
index 6f096f4,c87a878..3ec69a0
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
@@@ -132,14 -132,14 +132,14 @@@ public class IgniteClientAffinityAssign
* @throws Exception If failed.
*/
private void checkAffinity() throws Exception {
- CacheAffinity<Object> aff = grid(0).affinity(null);
- Affinity<Object> aff =
((IgniteKernal)grid(0)).getCache(null).affinity();
++ Affinity<Object> aff = grid(0).affinity(null);
for (Ignite grid : Ignition.allGrids()) {
try {
if
(grid.cluster().localNode().id().equals(grid(0).localNode().id()))
continue;
- CacheAffinity<Object> checkAff = grid.affinity(null);
- Affinity<Object> checkAff =
((IgniteKernal)grid).getCache(null).affinity();
++ Affinity<Object> checkAff = grid.affinity(null);
for (int p = 0; p < PARTS; p++)
assertEquals(aff.mapPartitionToPrimaryAndBackups(p),
checkAff.mapPartitionToPrimaryAndBackups(p));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/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/414a963c/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/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414a963c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
