ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0d8a67a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0d8a67a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0d8a67a Branch: refs/heads/ignite-42 Commit: b0d8a67aae4bfd43d36405952253f6d8d64859aa Parents: 4b8ec5f Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 16 11:41:49 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 16 15:10:54 2015 +0300 ---------------------------------------------------------------------- config/fabric/default-config.xml | 6 +- config/hadoop/default-config.xml | 8 +- examples/config/example-cache.xml | 2 +- examples/config/filesystem/example-ggfs.xml | 4 +- .../HibernateL2CacheExampleNodeStartup.java | 6 +- .../store/CacheNodeWithStoreStartup.java | 5 +- .../store/dummy/CacheDummyPersonStore.java | 9 +- .../hibernate/CacheHibernatePersonStore.java | 11 +- .../store/jdbc/CacheJdbcPersonStore.java | 11 +- .../MemcacheRestExampleNodeStartup.java | 5 +- ...GridClientAbstractMultiThreadedSelfTest.java | 7 +- .../client/GridClientTopologyCacheSelfTest.java | 4 +- .../org/gridgain/client/GridHashMapStore.java | 10 +- .../GridClientAbstractMultiNodeSelfTest.java | 5 +- .../integration/GridClientAbstractSelfTest.java | 13 +- .../rest/GridAbstractRestProcessorSelfTest.java | 3 +- .../rest/GridRestBinaryProtocolSelfTest.java | 6 +- .../rest/GridRestMemcacheProtocolSelfTest.java | 7 +- .../rest/GridTaskCommandHandlerSelfTest.java | 7 +- .../jdbc/GridJdbcComplexQuerySelfTest.java | 3 +- .../jdbc/GridJdbcConnectionSelfTest.java | 6 +- .../jdbc/GridJdbcEmptyCacheSelfTest.java | 4 +- .../jdbc/GridJdbcLocalCachesSelfTest.java | 3 +- .../gridgain/jdbc/GridJdbcMetadataSelfTest.java | 3 +- .../jdbc/GridJdbcPreparedStatementSelfTest.java | 3 +- .../jdbc/GridJdbcResultSetSelfTest.java | 3 +- .../jdbc/GridJdbcStatementSelfTest.java | 3 +- .../clients/src/test/resources/spring-cache.xml | 6 +- .../src/test/resources/spring-server-node.xml | 10 +- .../test/resources/spring-server-ssl-node.xml | 8 +- .../java/org/apache/ignite/IgniteCache.java | 6 +- .../org/apache/ignite/IgniteCacheManager.java | 12 +- .../java/org/apache/ignite/IgnitePortables.java | 2 +- .../org/apache/ignite/IgniteTransactions.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 1702 ++++++++++++++++- .../java/org/apache/ignite/cache/CacheFlag.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 6 +- .../cache/store/CacheStoreBalancingWrapper.java | 10 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 8 +- .../configuration/IgniteConfiguration.java | 10 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../resources/IgniteCacheNameResource.java | 7 +- .../apache/ignite/transactions/IgniteTx.java | 5 +- .../gridgain/grid/GridBasicWarmupClosure.java | 15 +- .../java/org/gridgain/grid/cache/GridCache.java | 9 +- .../grid/cache/GridCacheAtomicityMode.java | 2 +- .../grid/cache/GridCacheConfiguration.java | 1721 ------------------ .../grid/cache/GridCacheDistributionMode.java | 6 +- .../org/gridgain/grid/cache/GridCacheFlag.java | 4 +- .../grid/cache/GridCacheInterceptor.java | 2 +- .../org/gridgain/grid/cache/GridCacheMBean.java | 2 +- .../org/gridgain/grid/cache/GridCacheMode.java | 4 +- .../grid/cache/GridCachePreloadMode.java | 4 +- .../grid/cache/GridCacheProjection.java | 14 +- .../GridCacheWriteSynchronizationMode.java | 2 +- .../grid/cache/affinity/GridCacheAffinity.java | 37 +- .../affinity/GridCacheAffinityFunction.java | 2 +- .../affinity/GridCacheAffinityKeyMapper.java | 4 +- ...GridCacheConsistentHashAffinityFunction.java | 3 +- .../fair/GridCachePartitionFairAffinity.java | 3 +- .../GridCacheRendezvousAffinityFunction.java | 4 +- .../grid/cache/cloner/GridCacheCloner.java | 6 +- .../cache/eviction/GridCacheEvictionFilter.java | 2 +- .../fifo/GridCacheFifoEvictionPolicy.java | 4 +- .../lru/GridCacheLruEvictionPolicy.java | 3 +- .../random/GridCacheRandomEvictionPolicy.java | 4 +- .../org/gridgain/grid/kernal/GridGainEx.java | 28 +- .../org/gridgain/grid/kernal/GridKernal.java | 5 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../processors/cache/GridCacheAttributes.java | 5 +- .../processors/cache/GridCacheContext.java | 7 +- .../GridCacheDefaultAffinityKeyMapper.java | 4 +- .../cache/GridCacheEvictionManager.java | 3 +- .../processors/cache/GridCacheProcessor.java | 41 +- .../processors/cache/GridCacheProxyImpl.java | 3 +- .../processors/cache/GridCacheStoreManager.java | 33 +- .../processors/cache/GridCacheTtlManager.java | 3 +- .../kernal/processors/cache/GridCacheUtils.java | 17 +- .../cache/GridCacheWriteBehindStore.java | 152 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../cache/jta/GridCacheJtaManagerAdapter.java | 4 +- .../cache/jta/GridCacheNoopJtaManager.java | 4 +- .../cache/transactions/IgniteTxEx.java | 8 +- .../cache/transactions/IgniteTxProxyImpl.java | 72 - .../dataload/GridDataLoadCacheUpdaters.java | 3 +- .../dr/GridDrDataLoadCacheUpdater.java | 5 +- .../kernal/processors/ggfs/GridGgfsHelper.java | 6 +- .../processors/ggfs/GridGgfsHelperImpl.java | 6 +- .../kernal/processors/ggfs/GridGgfsImpl.java | 5 +- .../processors/ggfs/GridGgfsProcessor.java | 10 +- .../processors/ggfs/GridNoopGgfsHelper.java | 6 +- .../processors/query/GridQueryProcessor.java | 8 +- .../grid/kernal/visor/cache/VisorCache.java | 4 +- .../cache/VisorCacheAffinityConfiguration.java | 4 +- .../visor/cache/VisorCacheConfiguration.java | 7 +- .../cache/VisorCacheDefaultConfiguration.java | 4 +- .../visor/cache/VisorCacheDgcConfiguration.java | 4 +- .../cache/VisorCacheEvictionConfiguration.java | 4 +- .../cache/VisorCacheNearConfiguration.java | 4 +- .../cache/VisorCachePreloadConfiguration.java | 3 +- .../cache/VisorCacheStoreConfiguration.java | 4 +- .../VisorCacheWriteBehindConfiguration.java | 4 +- .../spring-cache-client-benchmark-1.xml | 2 +- .../spring-cache-client-benchmark-2.xml | 2 +- .../spring-cache-client-benchmark-3.xml | 2 +- .../core/src/test/config/discovery-stress.xml | 2 +- modules/core/src/test/config/example-cache.xml | 2 +- modules/core/src/test/config/ggfs-loopback.xml | 4 +- .../core/src/test/config/ggfs-no-endpoint.xml | 4 +- modules/core/src/test/config/ggfs-shmem.xml | 4 +- .../src/test/config/load/cache-benchmark.xml | 4 +- .../test/config/load/cache-client-benchmark.xml | 4 +- .../config/load/dsi-49-server-production.xml | 4 +- .../src/test/config/load/dsi-load-client.xml | 4 +- .../src/test/config/load/dsi-load-server.xml | 4 +- .../test/config/load/mongo-multinode-foster.xml | 4 +- .../core/src/test/config/spring-cache-load.xml | 2 +- .../config/spring-cache-put-remove-load.xml | 2 +- .../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 +- .../test/config/websession/spring-cache-1.xml | 6 +- .../test/config/websession/spring-cache-2.xml | 6 +- .../test/config/websession/spring-cache-3.xml | 6 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 3 +- .../cache/IgniteCacheAbstractTest.java | 14 +- .../cache/IgniteCachingProviderSelfTest.java | 9 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 5 +- ...idCacheCheckpointSpiSecondCacheSelfTest.java | 5 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 5 +- .../GridCacheStoreValueBytesNode.java | 4 +- .../grid/GridCacheAffinityBackupsSelfTest.java | 3 +- ...CachePartitionFairAffinityNodesSelfTest.java | 7 +- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 7 +- .../ggfs/GridGgfsEventsAbstractSelfTest.java | 11 +- .../GridGgfsFragmentizerAbstractSelfTest.java | 9 +- .../grid/kernal/GridAffinityMappedTest.java | 5 +- .../grid/kernal/GridAffinityP2PSelfTest.java | 4 +- .../grid/kernal/GridAffinitySelfTest.java | 11 +- .../grid/kernal/GridDiscoverySelfTest.java | 3 +- .../kernal/GridJobMasterLeaveAwareSelfTest.java | 4 +- .../grid/kernal/GridMultipleJobsSelfTest.java | 5 +- .../kernal/GridProjectionForCachesSelfTest.java | 6 +- ...ectionLocalJobMultipleArgumentsSelfTest.java | 4 +- .../grid/kernal/GridStartStopSelfTest.java | 6 +- .../GridCheckpointManagerAbstractSelfTest.java | 4 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 7 +- .../GridDeploymentMessageCountSelfTest.java | 3 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +- .../discovery/GridDiscoveryManagerSelfTest.java | 5 +- .../GridAffinityProcessorAbstractSelfTest.java | 3 +- .../GridCacheAbstractFailoverSelfTest.java | 5 +- .../cache/GridCacheAbstractFlagsTest.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 5 +- .../GridCacheAbstractProjectionSelfTest.java | 5 +- .../cache/GridCacheAbstractSelfTest.java | 14 +- .../cache/GridCacheAbstractTxReadTest.java | 5 +- .../cache/GridCacheAffinityApiSelfTest.java | 5 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 6 +- .../GridCacheAsyncOperationsLimitSelfTest.java | 6 +- .../GridCacheAtomicMessageCountSelfTest.java | 3 +- .../cache/GridCacheBasicStoreAbstractTest.java | 7 +- ...acheBasicStoreMultithreadedAbstractTest.java | 10 +- .../cache/GridCacheClearAllSelfTest.java | 9 +- .../cache/GridCacheConcurrentMapSelfTest.java | 3 +- .../cache/GridCacheConcurrentMapTest.java | 3 +- .../GridCacheConcurrentTxMultiNodeTest.java | 3 +- ...idCacheConfigurationConsistencySelfTest.java | 168 +- ...ridCacheConfigurationValidationSelfTest.java | 6 +- .../GridCacheDaemonNodeAbstractSelfTest.java | 3 +- .../GridCacheDeploymentOffHeapSelfTest.java | 6 +- .../cache/GridCacheDeploymentSelfTest.java | 5 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 3 +- .../cache/GridCacheEntryVersionSelfTest.java | 3 +- .../GridCacheEvictionEventAbstractTest.java | 3 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 4 +- .../GridCacheFinishPartitionsSelfTest.java | 3 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 5 +- ...idCacheGetAndTransformStoreAbstractTest.java | 3 +- .../cache/GridCacheGlobalClearAllSelfTest.java | 3 +- .../GridCacheGroupLockAbstractSelfTest.java | 15 +- .../GridCacheGroupLockFailoverSelfTest.java | 3 +- .../cache/GridCacheIncrementTransformTest.java | 3 +- .../GridCacheInterceptorAbstractSelfTest.java | 5 +- .../cache/GridCacheIteratorPerformanceTest.java | 5 +- .../cache/GridCacheKeyCheckSelfTest.java | 5 +- .../processors/cache/GridCacheLeakTest.java | 5 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 8 +- .../cache/GridCacheLuceneQueryIndexTest.java | 5 +- .../cache/GridCacheMemoryModeSelfTest.java | 6 +- .../GridCacheMissingCommitVersionSelfTest.java | 3 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 5 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 5 +- ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 6 +- .../cache/GridCacheMvccFlagsTest.java | 4 +- .../cache/GridCacheMvccManagerSelfTest.java | 5 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 4 +- .../processors/cache/GridCacheMvccSelfTest.java | 4 +- .../cache/GridCacheObjectToStringSelfTest.java | 3 +- ...HeapMultiThreadedUpdateAbstractSelfTest.java | 5 +- .../cache/GridCacheOffHeapSelfTest.java | 3 +- .../processors/cache/GridCacheOffHeapTest.java | 3 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 6 +- ...heOffHeapTieredEvictionAbstractSelfTest.java | 5 +- .../cache/GridCacheOffheapUpdateSelfTest.java | 3 +- .../GridCacheOrderedPreloadingSelfTest.java | 5 +- .../cache/GridCacheP2PUndeploySelfTest.java | 6 +- .../cache/GridCachePartitionedGetSelfTest.java | 5 +- ...hePartitionedProjectionAffinitySelfTest.java | 3 +- .../cache/GridCachePartitionedWritesTest.java | 11 +- .../GridCachePreloadingEvictionsSelfTest.java | 3 +- .../cache/GridCachePutAllFailoverSelfTest.java | 3 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 5 +- .../GridCacheQueryInternalKeysSelfTest.java | 5 +- .../GridCacheReferenceCleanupSelfTest.java | 3 +- .../cache/GridCacheReloadSelfTest.java | 10 +- ...ridCacheReplicatedSynchronousCommitTest.java | 3 +- .../GridCacheReturnValueTransferSelfTest.java | 3 +- .../cache/GridCacheSlowTxWarnTest.java | 7 +- .../processors/cache/GridCacheStopSelfTest.java | 3 +- .../cache/GridCacheStorePutxSelfTest.java | 5 +- .../cache/GridCacheStoreValueBytesSelfTest.java | 5 +- .../cache/GridCacheSwapPreloadSelfTest.java | 3 +- .../cache/GridCacheSwapReloadSelfTest.java | 14 +- .../cache/GridCacheTtlManagerSelfTest.java | 4 +- .../GridCacheValueBytesPreloadingSelfTest.java | 5 +- ...idCacheValueConsistencyAbstractSelfTest.java | 5 +- .../GridCacheVariableTopologySelfTest.java | 3 +- ...idCacheWriteBehindStoreAbstractSelfTest.java | 8 +- .../GridCacheWriteBehindStoreAbstractTest.java | 3 +- ...BehindStorePartitionedMultiNodeSelfTest.java | 3 +- .../GridCacheWriteBehindStoreSelfTest.java | 22 +- .../IgniteTxExceptionAbstractSelfTest.java | 6 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 3 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 5 +- ...eAbstractDataStructuresFailoverSelfTest.java | 6 +- ...actQueueFailoverDataConsistencySelfTest.java | 5 +- .../GridCacheAtomicLongApiSelfTest.java | 7 +- ...CacheAtomicReferenceApiSelfAbstractTest.java | 5 +- .../GridCacheCountDownLatchSelfTest.java | 8 +- .../GridCacheQueueCleanupSelfTest.java | 5 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 3 +- .../GridCacheSetAbstractSelfTest.java | 9 +- .../GridCacheSetFailoverAbstractSelfTest.java | 6 +- .../GridCacheLocalAtomicQueueApiSelfTest.java | 4 +- .../local/GridCacheLocalQueueApiSelfTest.java | 4 +- .../GridCacheLocalSequenceApiSelfTest.java | 4 +- ...dCachePartitionedAtomicQueueApiSelfTest.java | 4 +- ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 +- ...PartitionedAtomicQueueMultiNodeSelfTest.java | 4 +- ...itionedAtomicQueueRotativeMultiNodeTest.java | 4 +- ...hePartitionedAtomicReferenceApiSelfTest.java | 4 +- ...PartitionedAtomicReferenceMultiNodeTest.java | 4 +- ...titionedAtomicSequenceMultiThreadedTest.java | 3 +- .../GridCachePartitionedAtomicSetSelfTest.java | 5 +- ...achePartitionedAtomicStampedApiSelfTest.java | 4 +- ...GridCachePartitionedNodeRestartSelfTest.java | 4 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 4 +- .../GridCachePartitionedQueueApiSelfTest.java | 4 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 5 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 5 +- ...CachePartitionedQueueJoinedNodeSelfTest.java | 4 +- ...dCachePartitionedQueueMultiNodeSelfTest.java | 4 +- ...hePartitionedQueueRotativeMultiNodeTest.java | 4 +- ...GridCachePartitionedSequenceApiSelfTest.java | 4 +- ...chePartitionedSequenceMultiNodeSelfTest.java | 4 +- ...cheReplicatedAtomicReferenceApiSelfTest.java | 4 +- ...eReplicatedAtomicReferenceMultiNodeTest.java | 4 +- ...CacheReplicatedAtomicStampedApiSelfTest.java | 4 +- .../GridCacheReplicatedQueueApiSelfTest.java | 4 +- ...idCacheReplicatedQueueMultiNodeSelfTest.java | 4 +- ...cheReplicatedQueueRotativeMultiNodeTest.java | 4 +- .../GridCacheReplicatedSequenceApiSelfTest.java | 4 +- ...acheReplicatedSequenceMultiNodeSelfTest.java | 4 +- ...tractDistributedByteArrayValuesSelfTest.java | 19 +- .../GridCacheAbstractNodeRestartSelfTest.java | 2 +- ...tractPartitionedByteArrayValuesSelfTest.java | 13 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 3 +- .../GridCacheAtomicTimeoutSelfTest.java | 4 +- .../GridCacheClientModesAbstractSelfTest.java | 5 +- ...acheEntrySetIterationPreloadingSelfTest.java | 5 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 5 +- .../distributed/GridCacheLockAbstractTest.java | 5 +- .../distributed/GridCacheMixedModeSelfTest.java | 5 +- ...dCacheMultithreadedFailoverAbstractTest.java | 3 +- ...dCachePartitionedAffinityFilterSelfTest.java | 3 +- ...chePartitionedReloadAllAbstractSelfTest.java | 10 +- .../GridCachePreloadEventsAbstractSelfTest.java | 5 +- ...GridCachePreloadRestartAbstractSelfTest.java | 5 +- .../GridCacheTransformEventSelfTest.java | 3 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 5 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 5 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 5 +- .../IgniteTxPreloadAbstractTest.java | 5 +- ...tPartitionedOnlyByteArrayValuesSelfTest.java | 7 +- ...heAbstractTransformWriteThroughSelfTest.java | 4 +- .../dht/GridCacheAtomicFullApiSelfTest.java | 5 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 3 +- .../dht/GridCacheColocatedDebugTest.java | 3 +- ...eColocatedOptimisticTransactionSelfTest.java | 3 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 3 +- .../GridCacheDhtAtomicRemoveFailureTest.java | 6 +- .../dht/GridCacheDhtEntrySelfTest.java | 3 +- .../dht/GridCacheDhtEntrySetSelfTest.java | 6 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 3 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtMappingSelfTest.java | 3 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 3 +- .../GridCacheDhtPreloadDisabledSelfTest.java | 4 +- .../GridCacheDhtPreloadMessageCountTest.java | 3 +- ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 3 +- .../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 3 +- .../dht/GridCacheDhtPreloadSelfTest.java | 8 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 8 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 6 +- .../dht/GridCacheDhtRemoveFailureTest.java | 5 +- .../dht/GridCacheDhtTxPreloadSelfTest.java | 5 +- .../dht/GridCacheGlobalLoadTest.java | 5 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 5 +- ...idCachePartitionedPreloadEventsSelfTest.java | 5 +- ...dCachePartitionedTopologyChangeSelfTest.java | 3 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 5 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 5 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 3 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 4 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 5 +- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 5 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 5 +- .../GridCacheAtomicNearRemoveFailureTest.java | 5 +- .../GridCacheAtomicOffHeapFullApiSelfTest.java | 5 +- ...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 5 +- ...idCacheAtomicPartitionedMetricsSelfTest.java | 6 +- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 5 +- .../near/GridCacheGetStoreErrorSelfTest.java | 9 +- .../near/GridCacheNearEvictionSelfTest.java | 3 +- .../near/GridCacheNearJobExecutionSelfTest.java | 3 +- .../near/GridCacheNearMetricsSelfTest.java | 5 +- .../near/GridCacheNearMultiGetSelfTest.java | 3 +- .../near/GridCacheNearMultiNodeSelfTest.java | 10 +- .../near/GridCacheNearOneNodeSelfTest.java | 12 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 3 +- .../GridCacheNearPartitionedClearSelfTest.java | 3 +- .../GridCacheNearReaderPreloadSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 3 +- .../near/GridCacheNearRemoveFailureTest.java | 6 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 3 +- .../near/GridCacheNearTxPreloadSelfTest.java | 5 +- ...AffinityExcludeNeighborsPerformanceTest.java | 4 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 4 +- .../GridCachePartitionedAffinitySelfTest.java | 4 +- .../near/GridCachePartitionedBasicApiTest.java | 4 +- .../GridCachePartitionedBasicOpSelfTest.java | 3 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 3 +- .../near/GridCachePartitionedEventSelfTest.java | 6 +- .../GridCachePartitionedEvictionSelfTest.java | 4 +- ...titionedExplicitLockNodeFailureSelfTest.java | 3 +- ...GridCachePartitionedFilteredPutSelfTest.java | 5 +- .../GridCachePartitionedFullApiSelfTest.java | 5 +- .../GridCachePartitionedLoadCacheSelfTest.java | 10 +- .../near/GridCachePartitionedLockSelfTest.java | 4 +- .../GridCachePartitionedMetricsSelfTest.java | 6 +- ...achePartitionedMultiNodeCounterSelfTest.java | 3 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 5 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 4 +- .../GridCachePartitionedMultiNodeSelfTest.java | 3 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 3 +- .../near/GridCachePartitionedNestedTxTest.java | 4 +- ...GridCachePartitionedNodeFailureSelfTest.java | 3 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 5 +- .../GridCachePartitionedProjectionSelfTest.java | 5 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 3 +- .../GridCachePartitionedStorePutSelfTest.java | 13 +- ...GridCachePartitionedTxConcurrentGetTest.java | 4 +- ...GridCachePartitionedTxMultiNodeSelfTest.java | 4 +- ...CachePartitionedTxMultiThreadedSelfTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 3 +- ...achePartitionedTxSingleThreadedSelfTest.java | 3 +- .../GridCachePartitionedTxTimeoutSelfTest.java | 4 +- .../near/GridCachePutArrayValueSelfTest.java | 5 +- ...idCacheRendezvousAffinityClientSelfTest.java | 3 +- .../near/GridPartitionedBackupLoadSelfTest.java | 13 +- ...stractReplicatedByteArrayValuesSelfTest.java | 14 +- ...ridCacheAtomicReplicatedMetricsSelfTest.java | 6 +- ...eplicatedAtomicMultiNodeFullApiSelfTest.java | 5 +- .../GridCacheReplicatedBasicApiTest.java | 4 +- .../GridCacheReplicatedBasicOpSelfTest.java | 4 +- .../GridCacheReplicatedClientOnlySelfTest.java | 5 +- .../GridCacheReplicatedEvictionSelfTest.java | 5 +- .../GridCacheReplicatedFullApiSelfTest.java | 5 +- .../GridCacheReplicatedInvalidateSelfTest.java | 3 +- .../GridCacheReplicatedJobExecutionTest.java | 3 +- .../GridCacheReplicatedMarshallerTxTest.java | 4 +- .../GridCacheReplicatedMetricsSelfTest.java | 6 +- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 4 +- .../GridCacheReplicatedMultiNodeSelfTest.java | 4 +- .../GridCacheReplicatedNearOnlySelfTest.java | 5 +- .../GridCacheReplicatedNodeFailureSelfTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 4 +- ...dezvousAffinityMultiNodeFullApiSelfTest.java | 6 +- .../GridCacheReplicatedTxConcurrentGetTest.java | 4 +- ...GridCacheReplicatedTxMultiNodeBasicTest.java | 4 +- ...dCacheReplicatedTxMultiThreadedSelfTest.java | 4 +- ...CacheReplicatedTxSingleThreadedSelfTest.java | 4 +- .../GridCacheReplicatedTxTimeoutSelfTest.java | 4 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 5 +- ...idCacheReplicatedPreloadOffHeapSelfTest.java | 7 +- .../GridCacheReplicatedPreloadSelfTest.java | 5 +- ...eplicatedPreloadStartStopEventsSelfTest.java | 4 +- .../GridCacheBatchEvictUnswapSelfTest.java | 11 +- ...heConcurrentEvictionConsistencySelfTest.java | 3 +- .../GridCacheConcurrentEvictionsSelfTest.java | 3 +- .../GridCacheDistributedEvictionsSelfTest.java | 3 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 10 +- .../eviction/GridCacheEvictionAbstractTest.java | 3 +- .../GridCacheEvictionFilterSelfTest.java | 3 +- .../GridCacheEvictionLockUnlockSelfTest.java | 3 +- .../GridCacheEvictionTouchSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 5 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 3 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 3 +- .../GridCacheAtomicLocalMetricsSelfTest.java | 6 +- .../local/GridCacheLocalBasicApiSelfTest.java | 4 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 5 +- .../local/GridCacheLocalFullApiSelfTest.java | 5 +- .../local/GridCacheLocalLoadAllSelfTest.java | 19 +- .../cache/local/GridCacheLocalLockSelfTest.java | 4 +- .../local/GridCacheLocalMetricsSelfTest.java | 6 +- .../GridCacheLocalMultithreadedSelfTest.java | 3 +- .../GridCacheLocalTxMultiThreadedSelfTest.java | 4 +- .../GridCacheLocalTxSingleThreadedSelfTest.java | 4 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 3 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 5 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 10 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 5 +- .../dataload/GridDataLoaderImplSelfTest.java | 5 +- .../dataload/GridDataLoaderPerformanceTest.java | 4 +- .../GridDataLoaderProcessorSelfTest.java | 3 +- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 9 +- .../ggfs/GridGgfsAbstractSelfTest.java | 5 +- .../processors/ggfs/GridGgfsCacheSelfTest.java | 5 +- .../ggfs/GridGgfsDataManagerSelfTest.java | 5 +- .../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +- .../ggfs/GridGgfsMetricsSelfTest.java | 9 +- .../processors/ggfs/GridGgfsModesSelfTest.java | 9 +- .../ggfs/GridGgfsProcessorSelfTest.java | 6 +- .../GridGgfsProcessorValidationSelfTest.java | 78 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 5 +- .../processors/ggfs/GridGgfsSizeSelfTest.java | 5 +- .../ggfs/GridGgfsStreamsSelfTest.java | 6 +- .../processors/ggfs/GridGgfsTaskSelfTest.java | 6 +- .../GridGgfsAbstractRecordResolverSelfTest.java | 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 3 +- .../GridServiceProcessorAbstractSelfTest.java | 4 +- .../gridgain/grid/lang/GridFuncSelfTest.java | 4 +- .../marshaller/GridMarshallerAbstractTest.java | 6 +- .../GridP2PContinuousDeploymentSelfTest.java | 6 +- .../session/GridSessionCheckpointSelfTest.java | 4 +- .../util/future/GridEmbeddedFutureSelfTest.java | 2 +- .../shmem/GridIpcSharedMemoryNodeStartup.java | 4 +- .../loadtests/GridCacheMultiNodeLoadTest.java | 4 +- ...ridCacheAffinityTransactionsOffHeapTest.java | 3 +- .../cache/GridCachePutRemoveLoadTest.java | 3 +- .../cache/GridCacheSingleNodeLoadTest.java | 3 +- .../GridCacheWriteBehindStoreLoadTest.java | 10 +- .../capacity/spring-capacity-cache.xml | 2 +- .../colocation/GridTestCacheStore.java | 5 +- .../loadtests/colocation/spring-colocation.xml | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 3 +- .../swap/GridSwapEvictAllBenchmark.java | 9 +- .../testframework/junits/GridAbstractTest.java | 7 +- .../cache/GridAbstractCacheStoreSelfTest.java | 123 +- .../junits/cache/TestCacheSession.java | 5 +- .../cache/TestThreadLocalCacheSession.java | 5 +- .../junits/common/GridCommonAbstractTest.java | 9 +- .../core/src/test/webapp/META-INF/gg-config.xml | 8 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 14 +- .../GridGgfsHadoopDualAbstractSelfTest.java | 5 +- ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 13 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 11 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 6 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 9 +- ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 5 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 9 +- .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java | 5 +- .../hadoop/GridHadoopAbstractSelfTest.java | 10 +- .../hibernate/GridCacheHibernateBlobStore.java | 14 +- ...idHibernateL2CacheConfigurationSelfTest.java | 5 +- .../hibernate/GridHibernateL2CacheSelfTest.java | 9 +- ...idHibernateL2CacheTransactionalSelfTest.java | 5 +- .../processors/query/h2/GridH2Indexing.java | 6 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 5 +- .../cache/GridCacheAbstractQuerySelfTest.java | 13 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 5 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 3 +- .../cache/GridCacheQueryLoadSelfTest.java | 16 +- .../cache/GridCacheQueryMetricsSelfTest.java | 3 +- .../GridCacheQueryMultiThreadedSelfTest.java | 3 +- .../GridCacheQueryUserResourceSelfTest.java | 6 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 5 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 3 +- .../processors/cache/GridCacheSwapSelfTest.java | 3 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 3 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 5 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 5 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 3 +- .../grid/cache/jta/GridCacheTmLookup.java | 5 +- .../cache/jta/GridCacheJtaManager.java | 4 +- ...CacheJtaConfigurationValidationSelfTest.java | 4 +- .../processors/cache/GridCacheJtaSelfTest.java | 9 +- .../GridTmLookupLifecycleAwareSelfTest.java | 4 +- .../scalar/src/test/resources/spring-cache.xml | 2 +- .../spring/GridSpringCacheManagerSelfTest.java | 3 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +- .../cache/VisorCacheClearCommandSpec.scala | 5 +- .../cache/VisorCacheCompactCommandSpec.scala | 5 +- .../cswap/VisorCacheSwapCommandSpec.scala | 7 +- .../cache/websession/GridWebSessionFilter.java | 3 +- 530 files changed, 3509 insertions(+), 3332 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/config/fabric/default-config.xml ---------------------------------------------------------------------- diff --git a/config/fabric/default-config.xml b/config/fabric/default-config.xml index c74adde..eb8ca17 100644 --- a/config/fabric/default-config.xml +++ b/config/fabric/default-config.xml @@ -40,7 +40,7 @@ <!-- Local cache configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.GridCacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> </bean> @@ -48,7 +48,7 @@ <!-- Replicated cache configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.GridCacheConfiguration"> <property name="name" value="replicated"/> <property name="cacheMode" value="REPLICATED"/> </bean> @@ -56,7 +56,7 @@ <!-- Partitioned cache configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.GridCacheConfiguration"> <property name="name" value="local"/> <property name="cacheMode" value="LOCAL"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index 732e0ca..cb51ff1 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -64,7 +64,7 @@ <!-- Abstract cache configuration for GGFS file data to be used as a template. --> - <bean id="dataCacheCfgBase" class="org.gridgain.grid.cache.GridCacheConfiguration" abstract="true"> + <bean id="dataCacheCfgBase" class="org.apache.ignite.cache.GridCacheConfiguration" abstract="true"> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> @@ -80,7 +80,7 @@ <!-- Abstract cache configuration for GGFS metadata to be used as a template. --> - <bean id="metaCacheCfgBase" class="org.gridgain.grid.cache.GridCacheConfiguration" abstract="true"> + <bean id="metaCacheCfgBase" class="org.apache.ignite.cache.GridCacheConfiguration" abstract="true"> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> @@ -135,12 +135,12 @@ <property name="cacheConfiguration"> <list> <!-- File system metadata cache. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration" parent="metaCacheCfgBase"> + <bean class="org.apache.ignite.cache.GridCacheConfiguration" parent="metaCacheCfgBase"> <property name="name" value="ggfs-meta"/> </bean> <!-- File system files data cache. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration" parent="dataCacheCfgBase"> + <bean class="org.apache.ignite.cache.GridCacheConfiguration" parent="dataCacheCfgBase"> <property name="name" value="ggfs-data"/> </bean> </list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index 397c2cf..e4e513c 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -129,7 +129,7 @@ </bean> <!-- Template for all example cache configurations. --> - <bean id="cache-template" abstract="true" class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean id="cache-template" abstract="true" class="org.apache.ignite.cache.CacheConfiguration"> <!-- Initial cache size. --> <property name="startSize" value="3000000"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/config/filesystem/example-ggfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml index 4e0a23d..fb7e11a 100644 --- a/examples/config/filesystem/example-ggfs.xml +++ b/examples/config/filesystem/example-ggfs.xml @@ -116,7 +116,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -132,7 +132,7 @@ </property> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java index e85a20a..1a23d72 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java @@ -18,8 +18,8 @@ package org.gridgain.examples.datagrid.hibernate; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -85,8 +85,8 @@ public class HibernateL2CacheExampleNodeStartup { * @param atomicityMode Atomicity mode. * @return Cache configuration. */ - private static GridCacheConfiguration cacheConfiguration(String name, GridCacheAtomicityMode atomicityMode) { - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + private static CacheConfiguration cacheConfiguration(String name, GridCacheAtomicityMode atomicityMode) { + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setName(name); ccfg.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java index fdf911b..6b77a14 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java @@ -18,10 +18,9 @@ package org.gridgain.examples.datagrid.store; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.examples.datagrid.store.dummy.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -64,7 +63,7 @@ public class CacheNodeWithStoreStartup { discoSpi.setIpFinder(ipFinder); - GridCacheConfiguration cacheCfg = new GridCacheConfiguration(); + CacheConfiguration cacheCfg = new CacheConfiguration(); // Set atomicity as transaction, since we are showing transactions in example. cacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java index f4b6553..59ccb23 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java @@ -24,8 +24,8 @@ import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; import org.gridgain.examples.datagrid.store.*; import org.gridgain.grid.cache.*; -import org.jetbrains.annotations.*; +import javax.cache.*; import java.util.*; import java.util.concurrent.*; @@ -54,16 +54,19 @@ public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> { } /** {@inheritDoc} */ - @Override public void put(Long key, Person val) { + @Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) { IgniteTx tx = transaction(); + Long key = entry.getKey(); + Person val = entry.getValue(); + System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']'); dummyDB.put(key, val); } /** {@inheritDoc} */ - @Override public void remove(Long key) { + @Override public void delete(Object key) { IgniteTx tx = transaction(); System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java index c671108..a6ad96c 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java @@ -25,6 +25,7 @@ import org.hibernate.*; import org.hibernate.cfg.*; import org.jetbrains.annotations.*; +import javax.cache.*; import javax.cache.integration.*; import java.util.*; @@ -71,13 +72,17 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> { } /** {@inheritDoc} */ - @Override public void put(Long key, @Nullable Person val) { + @Override public void write(javax.cache.Cache.Entry<? extends Long, ? extends Person> entry) { IgniteTx tx = transaction(); + Long key = entry.getKey(); + + Person val = entry.getValue(); + System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']'); if (val == null) { - remove(key); + delete(key); return; } @@ -99,7 +104,7 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> { /** {@inheritDoc} */ @SuppressWarnings({"JpaQueryApiInspection"}) - @Override public void remove(Long key) { + @Override public void delete(Object key) { IgniteTx tx = transaction(); System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java index 2711dba..93b2c3d 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java @@ -24,6 +24,7 @@ import org.apache.ignite.transactions.*; import org.gridgain.examples.datagrid.store.*; import org.jetbrains.annotations.*; +import javax.cache.*; import javax.cache.integration.*; import java.sql.*; import java.util.*; @@ -116,9 +117,13 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> { } /** {@inheritDoc} */ - @Override public void put(Long key, Person val) { + @Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) { IgniteTx tx = transaction(); + Long key = entry.getKey(); + + Person val = entry.getValue(); + System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']'); Connection conn = null; @@ -158,7 +163,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> { } /** {@inheritDoc} */ - @Override public void remove(Long key) { + @Override public void delete(Object key) { IgniteTx tx = transaction(); System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']'); @@ -169,7 +174,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> { conn = connection(tx); try (PreparedStatement st = conn.prepareStatement("delete from PERSONS where id=?")) { - st.setLong(1, key); + st.setLong(1, (Long)key); st.executeUpdate(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index 2e5635f..06f435a 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -18,10 +18,9 @@ package org.gridgain.examples.misc.client.memcache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.cache.query.*; @@ -69,7 +68,7 @@ public class MemcacheRestExampleNodeStartup { cfg.setMarshaller(marsh); - GridCacheConfiguration cacheCfg = new GridCacheConfiguration(); + CacheConfiguration cacheCfg = new CacheConfiguration(); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java index dfa8a5b..f6d5091 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.client; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -26,8 +27,6 @@ import org.apache.ignite.resources.*; import org.gridgain.client.balancer.*; import org.gridgain.client.impl.*; import org.gridgain.client.ssl.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.affinity.*; @@ -193,8 +192,8 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon * @return Cache configuration. * @throws Exception In case of error. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setDistributionMode(NEAR_PARTITIONED); cfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java index 708924c..68e4bbe 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.client; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -258,7 +258,7 @@ public class GridClientTopologyCacheSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(LOCAL); cacheCfg.setName(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java b/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java index 5b0fbe7..a585e60 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java @@ -17,12 +17,10 @@ package org.gridgain.client; -import org.apache.ignite.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.lang.*; -import org.apache.ignite.transactions.*; -import org.jetbrains.annotations.*; +import javax.cache.*; import java.util.*; /** @@ -44,12 +42,12 @@ public class GridHashMapStore extends CacheStoreAdapter { } /** {@inheritDoc} */ - @Override public void put(Object key, @Nullable Object val) { - map.put(key, val); + @Override public void write(Cache.Entry e) { + map.put(e.getKey(), e.getValue()); } /** {@inheritDoc} */ - @Override public void remove(Object key) { + @Override public void delete(Object key) { map.remove(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java index 90fbb5c..34d5581 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.client.integration; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -196,8 +197,8 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst * @return Cache configuration. * @throws Exception In case of error. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setAtomicityMode(TRANSACTIONAL); cfg.setDistributionMode(NEAR_PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java index 6e8d1a3..2fc2b88 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java @@ -20,6 +20,7 @@ package org.gridgain.client.integration; import junit.framework.*; import net.sf.json.*; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -28,7 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; -import org.apache.ignite.transactions.*; import org.gridgain.client.*; import org.gridgain.client.ssl.*; import org.gridgain.grid.cache.*; @@ -38,6 +38,7 @@ import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; +import javax.cache.*; import java.io.*; import java.util.*; import java.util.concurrent.*; @@ -247,8 +248,8 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest * @return Cache configuration. * @throws Exception In case of error. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(cacheName == null || CACHE_NAME.equals(cacheName) ? LOCAL : "replicated".equals(cacheName) ? REPLICATED : PARTITIONED); @@ -1581,12 +1582,12 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest } /** {@inheritDoc} */ - @Override public void put(Object key, @Nullable Object val) { - map.put(key, val); + @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) { + map.put(e.getKey(), e.getValue()); } /** {@inheritDoc} */ - @Override public void remove(Object key) { + @Override public void delete(Object key) { map.remove(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java index 3f9c238..872e5cb 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.rest; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -79,7 +80,7 @@ abstract class GridAbstractRestProcessorSelfTest extends GridCommonAbstractTest cfg.setDiscoverySpi(disco); - GridCacheConfiguration ccfg = defaultCacheConfiguration(); + CacheConfiguration ccfg = defaultCacheConfiguration(); cfg.setCacheConfiguration(ccfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java index 88392d1..393fc1f 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java @@ -18,12 +18,12 @@ package org.gridgain.grid.kernal.processors.rest; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; import org.gridgain.grid.util.typedef.*; @@ -113,8 +113,8 @@ public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @return Cache configuration. * @throws Exception In case of error. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(LOCAL); cfg.setName(cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java index 3f590e5..99b43ab 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java @@ -19,9 +19,8 @@ package org.gridgain.grid.kernal.processors.rest; import junit.framework.*; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -106,8 +105,8 @@ public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest { * @return Cache configuration. * @throws Exception In case of error. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(LOCAL); cfg.setName(cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java index f5c7308..42610d4 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java @@ -18,11 +18,10 @@ package org.gridgain.grid.kernal.processors.rest; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.gridgain.client.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.rest.handlers.*; import org.gridgain.grid.kernal.processors.rest.handlers.task.*; @@ -118,8 +117,8 @@ public class GridTaskCommandHandlerSelfTest extends GridCommonAbstractTest { * @return Cache configuration. * @throws Exception In case of error. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(cacheName == null || CACHE_NAME.equals(cacheName) ? LOCAL : "replicated".equals(cacheName) ? REPLICATED : PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java index f6db0d2..79864ff 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; @@ -52,7 +53,7 @@ public class GridJdbcComplexQuerySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java index bdc9a97..4dd9ad5 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -77,8 +77,8 @@ public class GridJdbcConnectionSelfTest extends GridCommonAbstractTest { * @return Cache configuration. * @throws Exception In case of error. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String name) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String name) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setName(name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java index 3128d48..8eed17a 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -49,7 +49,7 @@ public class GridJdbcEmptyCacheSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setName(CACHE_NAME); cache.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java index 1a889a2..7bedf8c 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -49,7 +50,7 @@ public class GridJdbcLocalCachesSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setName(CACHE_NAME); cache.setCacheMode(LOCAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java index 8667ae6..bc5a09d 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; @@ -49,7 +50,7 @@ public class GridJdbcMetadataSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java index af3bb5d..c23ea65 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; @@ -55,7 +56,7 @@ public class GridJdbcPreparedStatementSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java index 45051e4..e0df667 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; @@ -62,7 +63,7 @@ public class GridJdbcResultSetSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java index 51e5b4f..a69134a 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; @@ -55,7 +56,7 @@ public class GridJdbcStatementSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index 116ebfe..d0f5d7b 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -62,7 +62,7 @@ <!-- Partitioned cache example configuration (Transactional mode). --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> @@ -111,7 +111,7 @@ <!-- Replicated cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="replicated"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -136,7 +136,7 @@ <!-- Local cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is 'local'. --> <property name="name" value="local"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 8cb61b7..8ce35cb 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -113,7 +113,7 @@ <!-- Local cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is null. --> <!--<property name="name"><null/></property>--> @@ -126,7 +126,7 @@ <!-- Partitioned cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is 'partitioned'. --> <property name="name" value="partitioned"/> @@ -209,7 +209,7 @@ <!-- Local cache with store. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="local.store"/> <property name="cacheMode" value="LOCAL"/> @@ -226,7 +226,7 @@ <!-- Replicated cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is 'replicated'. --> <property name="name" value="replicated"/> @@ -241,7 +241,7 @@ <!-- Replicated cache with in-memory store enabled. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is 'replicated.store'. --> <property name="name" value="replicated.store"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index 5f5ca5d..e8dfc2d 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -97,7 +97,7 @@ <!-- Local cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is null. --> <!--<property name="name"><null/></property>--> @@ -110,7 +110,7 @@ <!-- Partitioned cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is 'partitioned'. --> <property name="name" value="partitioned"/> @@ -193,7 +193,7 @@ <!-- Replicated cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is 'replicated'. --> <property name="name" value="replicated"/> @@ -208,7 +208,7 @@ <!-- Replicated cache with in-memory store enabled. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <!-- Cache name is 'replicated.store'. --> <property name="name" value="replicated.store"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index 30850e6..30384d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -226,7 +226,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * that entry will be evicted only if it's not used (not * participating in any locks or transactions). * <p> - * If {@link org.gridgain.grid.cache.GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and + * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and * {@link org.gridgain.grid.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entry will * be swapped to offheap, and then to disk. * <h2 class="header">Cache Flags</h2> @@ -273,7 +273,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * Clears an entry from this cache and swap storage only if the entry * is not currently locked, and is not participating in a transaction. * <p> - * If {@link org.gridgain.grid.cache.GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and + * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and * {@link org.gridgain.grid.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entries will * also be cleared from swap. * <p> @@ -477,7 +477,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * </pre> * <p> * Note that this method makes sense only if cache is working in portable mode - * ({@link org.gridgain.grid.cache.GridCacheConfiguration#isPortableEnabled()} returns {@code true}. If not, + * ({@link org.apache.ignite.cache.CacheConfiguration#isPortableEnabled()} returns {@code true}. If not, * this method is no-op and will return current projection. * * @return Projection for portable objects. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java index fa4530b..a18e87e 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java @@ -17,9 +17,9 @@ package org.apache.ignite; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import javax.cache.*; @@ -99,17 +99,17 @@ public class IgniteCacheManager implements CacheManager { if (!(cacheCfg instanceof CompleteConfiguration)) throw new UnsupportedOperationException("Configuration is not supported: " + cacheCfg); - if (cacheCfg instanceof GridCacheConfiguration) { - String cfgCacheName = ((GridCacheConfiguration)cacheCfg).getName(); + if (cacheCfg instanceof CacheConfiguration) { + String cfgCacheName = ((CacheConfiguration)cacheCfg).getName(); if (cfgCacheName != null) { if (!cacheName.equals(cfgCacheName)) throw new IllegalArgumentException(); } else { - cacheCfg = (C)new GridCacheConfiguration((CompleteConfiguration)cacheCfg); + cacheCfg = (C)new CacheConfiguration((CompleteConfiguration)cacheCfg); - ((GridCacheConfiguration)cacheCfg).setName(cacheName); + ((CacheConfiguration)cacheCfg).setName(cacheName); } } @@ -125,7 +125,7 @@ public class IgniteCacheManager implements CacheManager { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setGridName("grid-for-" + cacheName); - cfg.setCacheConfiguration(new GridCacheConfiguration((CompleteConfiguration)cacheCfg)); + cfg.setCacheConfiguration(new CacheConfiguration((CompleteConfiguration)cacheCfg)); cfg.getCacheConfiguration()[0].setName(cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java index 40ccaa2..bbd9f44 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java +++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java @@ -255,7 +255,7 @@ import java.util.Date; * or for a specific type via {@link org.apache.ignite.portables.PortableTypeConfiguration} instance. * <h1 class="header">Query Indexing</h1> * Portable objects can be indexed for querying by specifying index fields in - * {@link GridCacheQueryTypeMetadata} inside of specific {@link GridCacheConfiguration} instance, + * {@link GridCacheQueryTypeMetadata} inside of specific {@link org.apache.ignite.cache.CacheConfiguration} instance, * like so: * <pre name=code class=xml> * ... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java index 5167905..6158d99 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.*; public interface IgniteTransactions { /** * Starts transaction with default isolation, concurrency, timeout, and invalidation policy. - * All defaults are set in {@link GridCacheConfiguration} at startup. + * All defaults are set in {@link org.apache.ignite.cache.CacheConfiguration} at startup. * * @return New transaction * @throws IllegalStateException If transaction is already started by this thread.
