# ignite-63
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4065d18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4065d18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4065d18 Branch: refs/heads/ignite-63 Commit: a4065d1863eae5a5c55ea2af0c22a4bf01245e93 Parents: f53c0eb Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 23 15:07:25 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 23 15:08:51 2015 +0300 ---------------------------------------------------------------------- .../HibernateL2CacheExampleNodeStartup.java | 7 +- .../starschema/CacheStarSchemaExample.java | 4 +- .../datagrid/starschema/DimProduct.java | 2 +- .../examples/datagrid/starschema/DimStore.java | 2 +- .../datagrid/starschema/FactPurchase.java | 2 +- .../store/CacheNodeWithStoreStartup.java | 2 +- .../MemcacheRestExampleNodeStartup.java | 2 +- .../examples/ScalarCacheQueryExample.scala | 4 +- .../examples/ScalarSnowflakeSchemaExample.scala | 10 +-- .../ClientAbstractMultiThreadedSelfTest.java | 4 +- .../client/ClientTopologyCacheSelfTest.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../integration/ClientAbstractSelfTest.java | 2 +- .../rest/RestBinaryProtocolSelfTest.java | 2 +- .../rest/RestMemcacheProtocolSelfTest.java | 2 +- .../rest/TaskCommandHandlerSelfTest.java | 2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 4 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 2 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 2 +- .../org/apache/ignite/IgniteTransactions.java | 10 +-- .../CacheAtomicUpdateTimeoutException.java | 47 ++++++++++++ .../ignite/cache/CacheAtomicWriteOrderMode.java | 64 ++++++++++++++++ .../apache/ignite/cache/CacheAtomicityMode.java | 79 ++++++++++++++++++++ .../apache/ignite/cache/CacheConfiguration.java | 40 +++++----- .../java/org/apache/ignite/cache/CacheMode.java | 73 ++++++++++++++++++ .../org/apache/ignite/cache/CachePeekMode.java | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../GridCacheAtomicUpdateTimeoutException.java | 47 ------------ .../cache/GridCacheAtomicWriteOrderMode.java | 64 ---------------- .../ignite/cache/GridCacheAtomicityMode.java | 79 -------------------- .../org/apache/ignite/cache/GridCacheFlag.java | 3 +- .../org/apache/ignite/cache/GridCacheMode.java | 73 ------------------ .../apache/ignite/cache/GridCachePeekMode.java | 4 +- .../ignite/cache/GridCachePreloadMode.java | 4 +- .../ignite/cache/GridCacheProjection.java | 34 ++++----- .../GridCacheWriteSynchronizationMode.java | 2 +- .../affinity/GridCacheAffinityFunction.java | 4 +- .../datastructures/GridCacheDataStructures.java | 6 +- .../cache/query/GridCacheContinuousQuery.java | 12 +-- .../ignite/cache/query/GridCacheQuery.java | 2 +- .../cache/query/QueryContinuousPredicate.java | 4 +- .../org/apache/ignite/internal/GridGainEx.java | 4 +- .../ignite/internal/IgniteTransactionsEx.java | 2 +- .../affinity/GridAffinityProcessor.java | 4 +- .../processors/cache/GridCacheAttributes.java | 14 ++-- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheEntryImpl.java | 2 +- .../cache/GridCacheEvictionEntry.java | 2 +- .../cache/GridCacheEvictionManager.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 8 +- .../processors/cache/GridCacheProcessor.java | 12 +-- .../cache/GridCacheProjectionImpl.java | 2 +- .../processors/cache/GridCacheUtils.java | 4 +- .../GridCacheDataStructuresManager.java | 6 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../query/GridCacheDistributedQueryManager.java | 2 +- .../cache/query/GridCacheLocalQueryManager.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 2 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../GridCacheContinuousQueryAdapter.java | 4 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../dataload/GridDataLoadCacheUpdaters.java | 2 +- .../dataload/IgniteDataLoaderImpl.java | 2 +- .../processors/fs/GridGgfsDataManager.java | 2 +- .../processors/fs/GridGgfsMetaManager.java | 2 +- .../processors/fs/IgniteFsProcessor.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 2 +- .../cache/GridCacheQueryCommandHandler.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 4 +- .../ignite/internal/visor/cache/VisorCache.java | 12 +-- .../visor/cache/VisorCacheConfiguration.java | 18 ++--- .../apache/ignite/transactions/IgniteTx.java | 6 +- .../GridCacheAffinityBackupsSelfTest.java | 2 +- ...CachePartitionFairAffinityNodesSelfTest.java | 3 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 4 +- .../fs/GridGgfsEventsAbstractSelfTest.java | 4 +- .../GridGgfsFragmentizerAbstractSelfTest.java | 4 +- .../ignite/internal/GridAffinityMappedTest.java | 2 +- .../internal/GridAffinityP2PSelfTest.java | 2 +- .../ignite/internal/GridAffinitySelfTest.java | 2 +- .../ignite/internal/GridDiscoverySelfTest.java | 3 +- .../GridJobMasterLeaveAwareSelfTest.java | 3 +- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../GridProjectionForCachesSelfTest.java | 2 +- ...ectionLocalJobMultipleArgumentsSelfTest.java | 2 +- .../ignite/internal/GridStartStopSelfTest.java | 2 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 2 +- .../GridDeploymentMessageCountSelfTest.java | 2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../discovery/GridDiscoveryManagerSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 2 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../cache/GridCacheAbstractFlagsTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 4 +- .../GridCacheAbstractProjectionSelfTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 9 +-- .../cache/GridCacheAffinityApiSelfTest.java | 2 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 2 +- .../GridCacheAtomicMessageCountSelfTest.java | 8 +- .../cache/GridCacheBasicStoreAbstractTest.java | 6 +- ...acheBasicStoreMultithreadedAbstractTest.java | 2 +- .../cache/GridCacheClearAllSelfTest.java | 4 +- ...dCacheColocatedTxStoreExceptionSelfTest.java | 4 +- .../cache/GridCacheConcurrentMapSelfTest.java | 2 +- .../cache/GridCacheConcurrentMapTest.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 5 +- ...idCacheConfigurationConsistencySelfTest.java | 7 +- ...ridCacheConfigurationValidationSelfTest.java | 3 +- .../GridCacheDaemonNodeAbstractSelfTest.java | 6 +- .../GridCacheDeploymentOffHeapSelfTest.java | 2 +- .../cache/GridCacheDeploymentSelfTest.java | 4 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 7 +- .../cache/GridCacheEntryVersionSelfTest.java | 9 +-- .../GridCacheEvictionEventAbstractTest.java | 4 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 2 +- .../GridCacheFinishPartitionsSelfTest.java | 4 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- ...idCacheGetAndTransformStoreAbstractTest.java | 6 +- .../cache/GridCacheGlobalClearAllSelfTest.java | 6 +- .../GridCacheGroupLockAbstractSelfTest.java | 5 +- .../GridCacheGroupLockFailoverSelfTest.java | 4 +- .../cache/GridCacheIncrementTransformTest.java | 6 +- .../GridCacheInterceptorAbstractSelfTest.java | 10 +-- ...erceptorAtomicPrimaryWriteOrderSelfTest.java | 8 +- ...omicReplicatedPrimaryWriteOrderSelfTest.java | 12 +-- ...acheInterceptorAtomicReplicatedSelfTest.java | 12 +-- .../GridCacheInterceptorAtomicSelfTest.java | 8 +- ...GridCacheInterceptorLocalAtomicSelfTest.java | 12 +-- .../GridCacheInterceptorLocalSelfTest.java | 8 +- .../GridCacheInterceptorReplicatedSelfTest.java | 8 +- .../cache/GridCacheInterceptorSelfTest.java | 4 +- .../cache/GridCacheIteratorPerformanceTest.java | 2 +- .../cache/GridCacheKeyCheckSelfTest.java | 12 +-- .../processors/cache/GridCacheLeakTest.java | 9 +-- .../cache/GridCacheLifecycleAwareSelfTest.java | 4 +- .../GridCacheLocalTxStoreExceptionSelfTest.java | 4 +- .../cache/GridCacheLuceneQueryIndexTest.java | 2 +- .../cache/GridCacheMemoryModeSelfTest.java | 28 +++---- .../GridCacheMissingCommitVersionSelfTest.java | 4 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 5 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 3 +- ...ridCacheMultinodeUpdateAbstractSelfTest.java | 6 +- ...ultinodeUpdateAtomicNearEnabledSelfTest.java | 4 +- .../GridCacheMultinodeUpdateAtomicSelfTest.java | 4 +- ...CacheMultinodeUpdateNearEnabledSelfTest.java | 4 +- .../cache/GridCacheMultinodeUpdateSelfTest.java | 4 +- .../cache/GridCacheMvccFlagsTest.java | 3 +- .../cache/GridCacheMvccManagerSelfTest.java | 7 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 5 +- .../processors/cache/GridCacheMvccSelfTest.java | 3 +- .../GridCacheNearTxStoreExceptionSelfTest.java | 4 +- .../cache/GridCacheObjectToStringSelfTest.java | 7 +- ...ffHeapAtomicMultiThreadedUpdateSelfTest.java | 4 +- ...HeapMultiThreadedUpdateAbstractSelfTest.java | 4 +- .../cache/GridCacheOffHeapSelfTest.java | 2 +- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +- .../GridCacheOffHeapTieredAtomicSelfTest.java | 4 +- ...heOffHeapTieredEvictionAbstractSelfTest.java | 4 +- ...acheOffHeapTieredEvictionAtomicSelfTest.java | 4 +- .../GridCacheOffHeapTieredEvictionSelfTest.java | 4 +- .../cache/GridCacheOffHeapTieredSelfTest.java | 4 +- .../cache/GridCacheOffheapUpdateSelfTest.java | 4 +- .../GridCacheOrderedPreloadingSelfTest.java | 10 +-- .../cache/GridCacheP2PUndeploySelfTest.java | 4 +- .../cache/GridCachePartitionedGetSelfTest.java | 2 +- ...hePartitionedProjectionAffinitySelfTest.java | 4 +- .../cache/GridCachePartitionedWritesTest.java | 7 +- .../GridCachePreloadingEvictionsSelfTest.java | 5 +- .../cache/GridCachePutAllFailoverSelfTest.java | 2 +- .../cache/GridCacheQueryIndexSelfTest.java | 4 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 2 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../GridCacheReferenceCleanupSelfTest.java | 34 ++++----- .../cache/GridCacheReloadSelfTest.java | 8 +- ...ridCacheReplicatedSynchronousCommitTest.java | 2 +- ...CacheReplicatedTxStoreExceptionSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 13 ++-- .../cache/GridCacheSlowTxWarnTest.java | 3 +- .../processors/cache/GridCacheStopSelfTest.java | 4 +- .../cache/GridCacheStorePutxSelfTest.java | 4 +- .../cache/GridCacheStoreValueBytesSelfTest.java | 3 +- .../cache/GridCacheSwapPreloadSelfTest.java | 6 +- .../cache/GridCacheSwapReloadSelfTest.java | 2 +- .../cache/GridCacheTtlManagerLoadTest.java | 2 +- .../cache/GridCacheTtlManagerSelfTest.java | 6 +- .../GridCacheValueBytesPreloadingSelfTest.java | 4 +- ...idCacheValueConsistencyAbstractSelfTest.java | 6 +- ...heValueConsistencyTransactionalSelfTest.java | 4 +- .../GridCacheVariableTopologySelfTest.java | 4 +- .../GridCacheWriteBehindStoreAbstractTest.java | 4 +- .../GridCacheWriteBehindStoreLocalTest.java | 4 +- ...BehindStorePartitionedMultiNodeSelfTest.java | 4 +- ...ridCacheWriteBehindStorePartitionedTest.java | 4 +- ...GridCacheWriteBehindStoreReplicatedTest.java | 4 +- .../cache/IgniteCacheAbstractTest.java | 10 +-- .../cache/IgniteCacheAtomicInvokeTest.java | 12 +-- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 8 +- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 12 +-- .../IgniteCacheEntryListenerAbstractTest.java | 2 +- ...IgniteCacheEntryListenerAtomicLocalTest.java | 8 +- ...eCacheEntryListenerAtomicReplicatedTest.java | 4 +- .../IgniteCacheEntryListenerAtomicTest.java | 12 +-- .../IgniteCacheEntryListenerTxLocalTest.java | 8 +- ...gniteCacheEntryListenerTxReplicatedTest.java | 4 +- .../cache/IgniteCacheEntryListenerTxTest.java | 8 +- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../cache/IgniteCacheInvokeReadThroughTest.java | 8 +- .../cache/IgniteCacheTxInvokeTest.java | 8 +- .../cache/IgniteCacheTxLocalInvokeTest.java | 8 +- .../cache/IgniteCachingProviderSelfTest.java | 9 +-- .../IgniteTxExceptionAbstractSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 3 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 4 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- ...actQueueFailoverDataConsistencySelfTest.java | 8 +- .../GridCacheAtomicLongApiSelfTest.java | 4 +- ...CacheAtomicReferenceApiSelfAbstractTest.java | 2 +- .../GridCacheCountDownLatchSelfTest.java | 4 +- .../GridCacheQueueCleanupSelfTest.java | 4 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 2 +- .../GridCacheSetAbstractSelfTest.java | 2 +- .../GridCacheSetFailoverAbstractSelfTest.java | 4 +- .../GridCacheLocalAtomicQueueApiSelfTest.java | 2 +- .../local/GridCacheLocalAtomicSetSelfTest.java | 8 +- .../local/GridCacheLocalQueueApiSelfTest.java | 2 +- .../GridCacheLocalSequenceApiSelfTest.java | 2 +- .../local/GridCacheLocalSetSelfTest.java | 4 +- ...dCachePartitionedAtomicQueueApiSelfTest.java | 4 +- ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 4 +- ...micQueueFailoverDataConsistencySelfTest.java | 4 +- ...PartitionedAtomicQueueMultiNodeSelfTest.java | 4 +- ...itionedAtomicQueueRotativeMultiNodeTest.java | 4 +- ...hePartitionedAtomicReferenceApiSelfTest.java | 2 +- ...PartitionedAtomicReferenceMultiNodeTest.java | 2 +- ...titionedAtomicSequenceMultiThreadedTest.java | 4 +- ...chePartitionedAtomicSetFailoverSelfTest.java | 8 +- .../GridCachePartitionedAtomicSetSelfTest.java | 10 +-- ...achePartitionedAtomicStampedApiSelfTest.java | 4 +- ...rtitionedDataStructuresFailoverSelfTest.java | 4 +- ...GridCachePartitionedNodeRestartSelfTest.java | 2 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 4 +- .../GridCachePartitionedQueueApiSelfTest.java | 4 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- ...CachePartitionedQueueJoinedNodeSelfTest.java | 4 +- ...dCachePartitionedQueueMultiNodeSelfTest.java | 4 +- ...hePartitionedQueueRotativeMultiNodeTest.java | 2 +- ...GridCachePartitionedSequenceApiSelfTest.java | 4 +- ...chePartitionedSequenceMultiNodeSelfTest.java | 4 +- ...GridCachePartitionedSetFailoverSelfTest.java | 4 +- .../GridCachePartitionedSetSelfTest.java | 4 +- ...cheReplicatedAtomicReferenceApiSelfTest.java | 2 +- ...eReplicatedAtomicReferenceMultiNodeTest.java | 2 +- ...CacheReplicatedAtomicStampedApiSelfTest.java | 2 +- ...eplicatedDataStructuresFailoverSelfTest.java | 4 +- .../GridCacheReplicatedQueueApiSelfTest.java | 2 +- ...idCacheReplicatedQueueMultiNodeSelfTest.java | 2 +- ...cheReplicatedQueueRotativeMultiNodeTest.java | 2 +- .../GridCacheReplicatedSequenceApiSelfTest.java | 2 +- ...acheReplicatedSequenceMultiNodeSelfTest.java | 2 +- .../GridCacheReplicatedSetSelfTest.java | 4 +- ...tractPartitionedByteArrayValuesSelfTest.java | 4 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 4 +- .../GridCacheAtomicTimeoutSelfTest.java | 18 ++--- .../GridCacheClientModesAbstractSelfTest.java | 4 +- .../GridCacheEntrySetAbstractSelfTest.java | 4 +- ...acheEntrySetIterationPreloadingSelfTest.java | 8 +- .../distributed/GridCacheEventAbstractTest.java | 4 +- .../distributed/GridCacheLockAbstractTest.java | 4 +- .../distributed/GridCacheMixedModeSelfTest.java | 2 +- ...dCacheMultithreadedFailoverAbstractTest.java | 10 +-- .../GridCacheNodeFailureAbstractTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 4 +- ...chePartitionedReloadAllAbstractSelfTest.java | 12 +-- .../GridCachePreloadEventsAbstractSelfTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 4 +- .../GridCacheTransformEventSelfTest.java | 16 ++-- ...iteTxConsistencyRestartAbstractSelfTest.java | 6 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 +- ...heAbstractTransformWriteThroughSelfTest.java | 4 +- ...acheAtomicExpiredEntriesPreloadSelfTest.java | 8 +- .../dht/GridCacheAtomicFullApiSelfTest.java | 8 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 14 ++-- ...eAtomicPrimaryWriteOrderFullApiSelfTest.java | 4 +- ...tomicPrimaryWriteOrderReloadAllSelfTest.java | 4 +- .../dht/GridCacheAtomicReloadAllSelfTest.java | 4 +- .../dht/GridCacheColocatedDebugTest.java | 2 +- .../dht/GridCacheColocatedFailoverSelfTest.java | 4 +- ...eColocatedOptimisticTransactionSelfTest.java | 4 +- .../GridCacheColocatedTxExceptionSelfTest.java | 4 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 4 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 4 +- .../GridCacheDaemonNodePartitionedSelfTest.java | 4 +- ...cheDhtAtomicEvictionNearReadersSelfTest.java | 4 +- .../GridCacheDhtAtomicRemoveFailureTest.java | 8 +- .../dht/GridCacheDhtEntrySelfTest.java | 4 +- .../dht/GridCacheDhtEntrySetSelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 6 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 4 +- ...idCacheDhtExpiredEntriesPreloadSelfTest.java | 4 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtMappingSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +- .../GridCacheDhtPreloadDisabledSelfTest.java | 4 +- .../GridCacheDhtPreloadMessageCountTest.java | 2 +- ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java | 2 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +- .../dht/GridCacheDhtRemoveFailureTest.java | 4 +- .../dht/GridCacheDhtTxPreloadSelfTest.java | 4 +- .../GridCacheExColocatedFullApiSelfTest.java | 4 +- .../dht/GridCacheGlobalLoadTest.java | 8 +- .../GridCacheGroupLockColocatedSelfTest.java | 4 +- ...cheGroupLockPartitionedAbstractSelfTest.java | 4 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 2 +- ...idCachePartitionedPreloadEventsSelfTest.java | 4 +- ...dCachePartitionedTopologyChangeSelfTest.java | 2 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 4 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 2 +- ...teTxConsistencyColocatedRestartSelfTest.java | 4 +- .../dht/IgniteTxReentryColocatedSelfTest.java | 4 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 8 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +- ...lueConsistencyAtomicNearEnabledSelfTest.java | 4 +- ...micPrimaryWriteOrderNearEnabledSelfTest.java | 4 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 4 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 2 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 8 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 8 +- ...ridCacheAtomicNearEvictionEventSelfTest.java | 8 +- .../GridCacheAtomicNearEvictionSelfTest.java | 4 +- .../GridCacheAtomicNearMultiNodeSelfTest.java | 4 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +- .../near/GridCacheAtomicNearOnlySelfTest.java | 4 +- .../GridCacheAtomicNearReadersSelfTest.java | 4 +- .../GridCacheAtomicNearRemoveFailureTest.java | 10 +-- .../GridCacheAtomicOffHeapFullApiSelfTest.java | 8 +- ...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...idCacheAtomicPartitionedMetricsSelfTest.java | 6 +- ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 4 +- ...rderMultiNodeP2PDisabledFullApiSelfTest.java | 4 +- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 10 +-- ...PrimaryWriteOrderOffHeapFullApiSelfTest.java | 4 +- ...ityOrderOffHeapMultiNodeFullApiSelfTest.java | 4 +- .../near/GridCacheExNearFullApiSelfTest.java | 4 +- .../near/GridCacheGetStoreErrorSelfTest.java | 8 +- .../near/GridCacheGroupLockNearSelfTest.java | 4 +- .../GridCacheNearEvictionEventSelfTest.java | 8 +- .../near/GridCacheNearEvictionSelfTest.java | 8 +- ...dCacheNearExpiredEntriesPreloadSelfTest.java | 4 +- .../near/GridCacheNearJobExecutionSelfTest.java | 4 +- .../near/GridCacheNearMetricsSelfTest.java | 2 +- .../near/GridCacheNearMultiGetSelfTest.java | 4 +- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- .../near/GridCacheNearOneNodeSelfTest.java | 4 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 4 +- .../GridCacheNearPartitionedClearSelfTest.java | 4 +- .../GridCacheNearReaderPreloadSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 6 +- .../near/GridCacheNearRemoveFailureTest.java | 4 +- .../near/GridCacheNearTxExceptionSelfTest.java | 4 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 4 +- .../near/GridCacheNearTxPreloadSelfTest.java | 4 +- ...AffinityExcludeNeighborsPerformanceTest.java | 2 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 2 +- .../GridCachePartitionedAffinitySelfTest.java | 4 +- ...ionedAtomicGetAndTransformStoreSelfTest.java | 4 +- .../near/GridCachePartitionedBasicApiTest.java | 4 +- .../GridCachePartitionedBasicOpSelfTest.java | 4 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 4 +- .../GridCachePartitionedBasicStoreSelfTest.java | 4 +- .../GridCachePartitionedEntryLockSelfTest.java | 4 +- .../near/GridCachePartitionedEventSelfTest.java | 4 +- .../GridCachePartitionedEvictionSelfTest.java | 2 +- ...titionedExplicitLockNodeFailureSelfTest.java | 4 +- .../GridCachePartitionedFailoverSelfTest.java | 4 +- ...GridCachePartitionedFilteredPutSelfTest.java | 4 +- .../near/GridCachePartitionedFlagsTest.java | 6 +- ...PartitionedFullApiMultithreadedSelfTest.java | 4 +- .../GridCachePartitionedFullApiSelfTest.java | 4 +- ...PartitionedGetAndTransformStoreSelfTest.java | 4 +- .../GridCachePartitionedIteratorsSelfTest.java | 4 +- .../GridCachePartitionedLoadCacheSelfTest.java | 2 +- .../near/GridCachePartitionedLockSelfTest.java | 4 +- .../GridCachePartitionedMetricsSelfTest.java | 2 +- ...achePartitionedMultiNodeCounterSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 4 +- .../GridCachePartitionedMultiNodeSelfTest.java | 4 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +- .../near/GridCachePartitionedNestedTxTest.java | 2 +- ...GridCachePartitionedNodeFailureSelfTest.java | 4 +- .../GridCachePartitionedNodeRestartTest.java | 2 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- .../GridCachePartitionedProjectionSelfTest.java | 4 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 4 +- .../GridCachePartitionedStorePutSelfTest.java | 2 +- ...GridCachePartitionedTxConcurrentGetTest.java | 2 +- ...GridCachePartitionedTxMultiNodeSelfTest.java | 2 +- ...CachePartitionedTxMultiThreadedSelfTest.java | 2 +- .../near/GridCachePartitionedTxReadTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- ...achePartitionedTxSingleThreadedSelfTest.java | 4 +- .../GridCachePartitionedTxTimeoutSelfTest.java | 4 +- .../near/GridCachePutArrayValueSelfTest.java | 2 +- ...idCacheRendezvousAffinityClientSelfTest.java | 2 +- .../near/GridPartitionedBackupLoadSelfTest.java | 2 +- .../near/IgniteTxReentryNearSelfTest.java | 4 +- ...stractReplicatedByteArrayValuesSelfTest.java | 4 +- ...ridCacheAtomicReplicatedMetricsSelfTest.java | 6 +- .../GridCacheDaemonNodeReplicatedSelfTest.java | 4 +- .../GridCacheExReplicatedFullApiSelfTest.java | 4 +- ...cheGroupLockMultiNodeReplicatedSelfTest.java | 4 +- .../GridCacheGroupLockReplicatedSelfTest.java | 4 +- ...ridCacheReplicatedAtomicFullApiSelfTest.java | 4 +- ...catedAtomicGetAndTransformStoreSelfTest.java | 4 +- ...eplicatedAtomicMultiNodeFullApiSelfTest.java | 8 +- ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 4 +- .../GridCacheReplicatedBasicApiTest.java | 2 +- .../GridCacheReplicatedBasicOpSelfTest.java | 2 +- .../GridCacheReplicatedBasicStoreSelfTest.java | 4 +- .../GridCacheReplicatedClientOnlySelfTest.java | 4 +- .../GridCacheReplicatedEntrySetSelfTest.java | 4 +- .../GridCacheReplicatedEventSelfTest.java | 4 +- ...ridCacheReplicatedEvictionEventSelfTest.java | 8 +- .../GridCacheReplicatedEvictionSelfTest.java | 4 +- .../GridCacheReplicatedFailoverSelfTest.java | 4 +- .../GridCacheReplicatedFlagsTest.java | 6 +- ...eReplicatedFullApiMultithreadedSelfTest.java | 4 +- .../GridCacheReplicatedFullApiSelfTest.java | 4 +- ...eReplicatedGetAndTransformStoreSelfTest.java | 4 +- .../GridCacheReplicatedInvalidateSelfTest.java | 2 +- .../GridCacheReplicatedIteratorsSelfTest.java | 4 +- .../GridCacheReplicatedJobExecutionTest.java | 2 +- .../GridCacheReplicatedLockSelfTest.java | 4 +- .../GridCacheReplicatedMarshallerTxTest.java | 2 +- .../GridCacheReplicatedMetricsSelfTest.java | 2 +- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 2 +- .../GridCacheReplicatedMultiNodeSelfTest.java | 2 +- ...licatedNearOnlyMultiNodeFullApiSelfTest.java | 4 +- .../GridCacheReplicatedNearOnlySelfTest.java | 4 +- .../GridCacheReplicatedNodeFailureSelfTest.java | 2 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 +- ...ridCacheReplicatedPreloadEventsSelfTest.java | 6 +- .../GridCacheReplicatedProjectionSelfTest.java | 4 +- .../GridCacheReplicatedTxConcurrentGetTest.java | 2 +- .../GridCacheReplicatedTxExceptionSelfTest.java | 4 +- ...GridCacheReplicatedTxMultiNodeBasicTest.java | 2 +- ...dCacheReplicatedTxMultiThreadedSelfTest.java | 2 +- ...licatedTxOriginatingNodeFailureSelfTest.java | 4 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 4 +- .../GridCacheReplicatedTxReadTest.java | 6 +- ...CacheReplicatedTxSingleThreadedSelfTest.java | 2 +- .../GridCacheReplicatedTxTimeoutSelfTest.java | 2 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 2 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 2 +- .../replicated/GridReplicatedTxPreloadTest.java | 4 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheReplicatedPreloadSelfTest.java | 2 +- ...eplicatedPreloadStartStopEventsSelfTest.java | 2 +- .../GridCacheBatchEvictUnswapSelfTest.java | 2 +- ...heConcurrentEvictionConsistencySelfTest.java | 2 +- .../GridCacheConcurrentEvictionsSelfTest.java | 4 +- .../GridCacheDistributedEvictionsSelfTest.java | 6 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +- .../GridCacheEmptyEntriesLocalSelfTest.java | 4 +- ...ridCacheEmptyEntriesPartitionedSelfTest.java | 4 +- .../eviction/GridCacheEvictionAbstractTest.java | 6 +- .../GridCacheEvictionFilterSelfTest.java | 6 +- .../GridCacheEvictionLockUnlockSelfTest.java | 6 +- .../GridCacheEvictionTouchSelfTest.java | 2 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 4 +- .../GridCacheFifoEvictionPolicySelfTest.java | 2 +- .../lru/GridCacheLruEvictionPolicySelfTest.java | 2 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 6 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 8 +- .../IgniteCacheAtomicExpiryPolicyTest.java | 12 +-- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 8 +- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 4 +- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 4 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 6 +- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 8 +- .../IgniteCacheTxLocalExpiryPolicyTest.java | 8 +- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 4 +- .../IgniteCacheAtomicLoadAllTest.java | 12 +-- .../IgniteCacheAtomicLoaderWriterTest.java | 12 +-- .../IgniteCacheAtomicLocalLoadAllTest.java | 8 +- ...CacheAtomicLocalNoLoadPreviousValueTest.java | 8 +- ...IgniteCacheAtomicLocalNoReadThroughTest.java | 8 +- ...gniteCacheAtomicLocalNoWriteThroughTest.java | 8 +- ...gniteCacheAtomicNoLoadPreviousValueTest.java | 12 +-- .../IgniteCacheAtomicNoReadThroughTest.java | 12 +-- .../IgniteCacheAtomicNoWriteThroughTest.java | 12 +-- .../IgniteCacheAtomicStoreSessionTest.java | 12 +-- ...iteCacheNoLoadPreviousValueAbstractTest.java | 5 +- .../IgniteCacheNoReadThroughAbstractTest.java | 4 +- .../IgniteCacheNoWriteThroughAbstractTest.java | 4 +- .../IgniteCacheStoreSessionAbstractTest.java | 2 +- .../integration/IgniteCacheTxLoadAllTest.java | 8 +- .../IgniteCacheTxLoaderWriterTest.java | 8 +- .../IgniteCacheTxLocalLoadAllTest.java | 8 +- ...niteCacheTxLocalNoLoadPreviousValueTest.java | 8 +- .../IgniteCacheTxLocalNoReadThroughTest.java | 8 +- .../IgniteCacheTxLocalNoWriteThroughTest.java | 8 +- .../IgniteCacheTxNoLoadPreviousValueTest.java | 8 +- .../IgniteCacheTxNoReadThroughTest.java | 8 +- .../IgniteCacheTxNoWriteThroughTest.java | 8 +- .../IgniteCacheTxStoreSessionTest.java | 8 +- .../GridCacheAtomicLocalMetricsSelfTest.java | 6 +- .../local/GridCacheDaemonNodeLocalSelfTest.java | 4 +- .../local/GridCacheExLocalFullApiSelfTest.java | 4 +- .../GridCacheLocalAtomicBasicStoreSelfTest.java | 4 +- .../GridCacheLocalAtomicFullApiSelfTest.java | 4 +- ...LocalAtomicGetAndTransformStoreSelfTest.java | 4 +- ...dCacheLocalAtomicOffHeapFullApiSelfTest.java | 4 +- .../GridCacheLocalAtomicProjectionSelfTest.java | 4 +- .../local/GridCacheLocalBasicApiSelfTest.java | 2 +- ...cheLocalBasicStoreMultithreadedSelfTest.java | 4 +- .../local/GridCacheLocalBasicStoreSelfTest.java | 4 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 4 +- .../local/GridCacheLocalEventSelfTest.java | 4 +- .../GridCacheLocalEvictionEventSelfTest.java | 8 +- ...dCacheLocalFullApiMultithreadedSelfTest.java | 4 +- .../local/GridCacheLocalFullApiSelfTest.java | 4 +- ...dCacheLocalGetAndTransformStoreSelfTest.java | 4 +- .../local/GridCacheLocalIteratorsSelfTest.java | 4 +- .../local/GridCacheLocalLoadAllSelfTest.java | 2 +- .../cache/local/GridCacheLocalLockSelfTest.java | 2 +- .../local/GridCacheLocalMetricsSelfTest.java | 2 +- .../GridCacheLocalMultithreadedSelfTest.java | 2 +- .../local/GridCacheLocalProjectionSelfTest.java | 4 +- .../GridCacheLocalTxExceptionSelfTest.java | 4 +- .../GridCacheLocalTxMultiThreadedSelfTest.java | 2 +- .../cache/local/GridCacheLocalTxReadTest.java | 4 +- .../GridCacheLocalTxSingleThreadedSelfTest.java | 2 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 2 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 8 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- .../GridCacheContinuousQueryAtomicSelfTest.java | 4 +- ...CacheContinuousQueryLocalAtomicSelfTest.java | 4 +- .../GridCacheContinuousQueryLocalSelfTest.java | 4 +- ...eContinuousQueryPartitionedOnlySelfTest.java | 4 +- ...CacheContinuousQueryPartitionedSelfTest.java | 4 +- ...ContinuousQueryReplicatedAtomicSelfTest.java | 4 +- ...dCacheContinuousQueryReplicatedSelfTest.java | 4 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 8 +- ...ridCacheReduceFieldsQueryAtomicSelfTest.java | 4 +- ...GridCacheReduceFieldsQueryLocalSelfTest.java | 4 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 4 +- ...acheReduceFieldsQueryReplicatedSelfTest.java | 4 +- .../dataload/GridDataLoaderImplSelfTest.java | 2 +- .../dataload/GridDataLoaderPerformanceTest.java | 2 +- .../GridDataLoaderProcessorSelfTest.java | 6 +- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 4 +- .../processors/fs/GridGgfsAbstractSelfTest.java | 4 +- .../processors/fs/GridGgfsCacheSelfTest.java | 4 +- .../fs/GridGgfsDataManagerSelfTest.java | 4 +- .../fs/GridGgfsMetaManagerSelfTest.java | 5 +- .../processors/fs/GridGgfsMetricsSelfTest.java | 4 +- .../processors/fs/GridGgfsModesSelfTest.java | 4 +- .../fs/GridGgfsProcessorSelfTest.java | 4 +- .../fs/GridGgfsProcessorValidationSelfTest.java | 4 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 6 +- .../processors/fs/GridGgfsSizeSelfTest.java | 6 +- .../processors/fs/GridGgfsStreamsSelfTest.java | 4 +- .../processors/fs/GridGgfsTaskSelfTest.java | 4 +- .../GridGgfsAbstractRecordResolverSelfTest.java | 4 +- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../GridServiceProcessorAbstractSelfTest.java | 2 +- .../shmem/GridIpcSharedMemoryNodeStartup.java | 2 +- .../loadtests/GridCacheMultiNodeLoadTest.java | 2 +- ...ridCacheAffinityTransactionsOffHeapTest.java | 4 +- .../cache/GridCachePutRemoveLoadTest.java | 12 +-- .../cache/GridCacheSingleNodeLoadTest.java | 2 +- .../GridCacheWriteBehindStoreLoadTest.java | 4 +- .../GridCachePartitionedAtomicLongLoadTest.java | 2 +- .../swap/GridSwapEvictAllBenchmark.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 2 +- ...idCacheCheckpointSpiSecondCacheSelfTest.java | 2 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 2 +- .../GridCacheStoreValueBytesNode.java | 2 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 2 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 4 +- .../fs/GridGgfsHadoopDualAbstractSelfTest.java | 4 +- ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 4 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 4 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 4 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 4 +- ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 4 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 4 +- .../fs/GridGgfsNearOnlyMultiNodeSelfTest.java | 5 +- .../hadoop/GridHadoopAbstractSelfTest.java | 4 +- .../GridHibernateTransactionalDataRegion.java | 2 +- ...idHibernateL2CacheConfigurationSelfTest.java | 4 +- .../hibernate/GridHibernateL2CacheSelfTest.java | 4 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 8 +- .../cache/GridCacheAbstractQuerySelfTest.java | 10 +-- .../cache/GridCacheCrossCacheQuerySelfTest.java | 14 ++-- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 5 +- .../cache/GridCacheQueryLoadSelfTest.java | 2 +- .../cache/GridCacheQueryMetricsSelfTest.java | 4 +- .../GridCacheQueryMultiThreadedSelfTest.java | 4 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 2 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 4 +- .../processors/cache/GridCacheSwapSelfTest.java | 2 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 4 +- ...GridCacheAtomicNearEnabledQuerySelfTest.java | 4 +- .../near/GridCacheAtomicQuerySelfTest.java | 4 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 4 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../near/GridCachePartitionedQuerySelfTest.java | 4 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedQuerySelfTest.java | 4 +- .../GridCacheLocalAtomicQuerySelfTest.java | 4 +- .../GridCacheLocalFieldsQuerySelfTest.java | 4 +- .../local/GridCacheLocalQuerySelfTest.java | 4 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- ...CacheJtaConfigurationValidationSelfTest.java | 2 +- .../processors/cache/GridCacheJtaSelfTest.java | 4 +- .../cache/GridCacheReplicatedJtaSelfTest.java | 4 +- .../GridTmLookupLifecycleAwareSelfTest.java | 4 +- .../pimps/ScalarCacheProjectionPimp.scala | 8 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 2 +- .../cache/VisorCacheClearCommandSpec.scala | 6 +- .../cache/VisorCacheCompactCommandSpec.scala | 4 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- .../cache/websession/GridWebSessionFilter.java | 12 +-- 651 files changed, 1730 insertions(+), 1761 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java index cdb38ec..fc4ea30 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java @@ -19,15 +19,14 @@ package org.apache.ignite.examples.datagrid.hibernate; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** @@ -85,7 +84,7 @@ public class HibernateL2CacheExampleNodeStartup { * @param atomicityMode Atomicity mode. * @return Cache configuration. */ - private static CacheConfiguration cacheConfiguration(String name, GridCacheAtomicityMode atomicityMode) { + private static CacheConfiguration cacheConfiguration(String name, CacheAtomicityMode atomicityMode) { CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setName(name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java index 3111ac9..a51a02d 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java @@ -33,8 +33,8 @@ import java.util.concurrent.*; * as your master or reference data, while <i>facts</i> are usually large data sets of events or * other objects that continuously come into the system and may change frequently. In GridGain * such architecture is supported via cross-cache queries. By storing <i>dimensions</i> in - * {@link GridCacheMode#REPLICATED REPLICATED} caches and <i>facts</i> in much larger - * {@link GridCacheMode#PARTITIONED PARTITIONED} caches you can freely execute distributed joins across + * {@link org.apache.ignite.cache.CacheMode#REPLICATED REPLICATED} caches and <i>facts</i> in much larger + * {@link org.apache.ignite.cache.CacheMode#PARTITIONED PARTITIONED} caches you can freely execute distributed joins across * your whole in-memory data grid, thus querying your in memory data without any limitations. * <p> * In this example we have two <i>dimensions</i>, {@link DimProduct} and {@link DimStore} and http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java index 826c0bf..145ad2a 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.query.*; /** * Represents a product available for purchase. In our {@code snowflake} schema a {@code product} - * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.GridCacheMode#REPLICATED} + * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.CacheMode#REPLICATED} * cache. */ public class DimProduct { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java index d241505..6088e76 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.query.*; /** * Represents a physical store location. In our {@code snowflake} schema a {@code store} - * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.GridCacheMode#REPLICATED} + * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.CacheMode#REPLICATED} * cache. */ public class DimStore { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java index 42a2a8c..9167a74 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.query.*; /** * Represents a purchase record. In our {@code snowflake} schema purchase - * is a {@code 'fact'} and will be cached in larger {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED} + * is a {@code 'fact'} and will be cached in larger {@link org.apache.ignite.cache.CacheMode#PARTITIONED} * cache. */ public class FactPurchase { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java index ffd329c..28cfb4e 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java @@ -29,7 +29,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import javax.cache.configuration.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Starts up an empty node with example cache configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index 78ccefd..e040401 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -28,7 +28,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import java.util.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala index 760fb1d..550d3b7 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala @@ -17,12 +17,12 @@ package org.gridgain.scalar.examples -import org.apache.ignite.cache.{GridCacheMode, GridCacheFlag, GridCacheProjection} +import org.apache.ignite.cache.{CacheMode, GridCacheFlag, GridCacheProjection} import org.apache.ignite.cache.affinity.GridCacheAffinityKey import org.gridgain.scalar._ import scalar._ import org.apache.ignite._ -import GridCacheMode._ +import CacheMode._ import java.util._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala index c6953e1..e4b39d2 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala @@ -34,8 +34,8 @@ import org.jdk8.backport.ThreadLocalRandom8 * as your master or reference data, while <i>facts</i> are usually large data sets of events or * other objects that continuously come into the system and may change frequently. In GridGain * such architecture is supported via cross-cache queries. By storing <i>dimensions</i> in - * `GridCacheMode#REPLICATED REPLICATED` caches and <i>facts</i> in much larger - * `GridCacheMode#PARTITIONED PARTITIONED` caches you can freely execute distributed joins across + * `CacheMode#REPLICATED REPLICATED` caches and <i>facts</i> in much larger + * `CacheMode#PARTITIONED PARTITIONED` caches you can freely execute distributed joins across * your whole in-memory data grid, thus querying your in memory data without any limitations. * <p> * In this example we have two <i>dimensions</i>, `DimProduct` and `DimStore` and @@ -192,7 +192,7 @@ object ScalarSnowflakeSchemaExample { /** * Represents a physical store location. In our `snowflake` schema a `store` - * is a `dimension` and will be cached in `GridCacheMode#REPLICATED` cache. + * is a `dimension` and will be cached in `CacheMode#REPLICATED` cache. * * @param id Primary key. * @param name Store name. @@ -225,7 +225,7 @@ class DimStore( /** * Represents a product available for purchase. In our `snowflake` schema a `product` - * is a `dimension` and will be cached in `GridCacheMode#REPLICATED` cache. + * is a `dimension` and will be cached in `CacheMode#REPLICATED` cache. * * @param id Product ID. * @param name Product name. @@ -258,7 +258,7 @@ class DimProduct( /** * Represents a purchase record. In our `snowflake` schema purchase - * is a `fact` and will be cached in larger `GridCacheMode#PARTITIONED` cache. + * is a `fact` and will be cached in larger `CacheMode#PARTITIONED` cache. * * @param id Purchase ID. * @param productId Purchased product ID. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java index 372c177..28ad4ec 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java @@ -43,9 +43,9 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.testframework.GridTestUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java index 56eb509..40a8486 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java index 5db2cd0..19068b9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -48,9 +48,9 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index 4c62cdb..7a3c13f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.testframework.GridTestUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 4f7f143..40cfc63 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -37,7 +37,7 @@ import java.lang.reflect.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index 14bcca6..fe51927 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index 9a9918f..ced60d0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -37,7 +37,7 @@ import org.jetbrains.annotations.*; import java.util.*; import static org.apache.ignite.client.GridClientProtocol.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java index e9859c0..e2f00a1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java @@ -30,9 +30,9 @@ import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.sql.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java index 3963579..e8efabd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.sql.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java index 404dc6c..04a46d3 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.sql.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.jdbc.IgniteJdbcDriver.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index 1330495..a0b2733 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -32,7 +32,7 @@ import java.sql.*; import java.util.*; import static java.sql.Types.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java index f086b7d..eaa62df 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java @@ -32,7 +32,7 @@ import java.sql.*; import java.util.Date; import static java.sql.Types.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java index 6e5e792..9f9b58c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java @@ -35,7 +35,7 @@ import java.sql.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java index 5d3f0e8..ff41d23 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.sql.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 b16f9df..705a569 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -129,7 +129,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS /** * Stores given key-value pair in cache only if cache had no previous mapping for it. If cache * previously contained value for the given key, then this value is returned. - * In case of {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED} or {@link org.apache.ignite.cache.GridCacheMode#REPLICATED} caches, + * In case of {@link org.apache.ignite.cache.CacheMode#PARTITIONED} or {@link org.apache.ignite.cache.CacheMode#REPLICATED} caches, * the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 05277a1..b769362 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java @@ -32,7 +32,7 @@ public interface IgniteTransactions { * * @return New transaction * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart() throws IllegalStateException; @@ -43,7 +43,7 @@ public interface IgniteTransactions { * @param isolation Isolation. * @return New transaction. * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation); @@ -57,7 +57,7 @@ public interface IgniteTransactions { * @param txSize Number of entries participating in transaction (may be approximate). * @return New transaction. * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize); @@ -93,7 +93,7 @@ public interface IgniteTransactions { * @return Started transaction. * @throws IllegalStateException If transaction is already started by this thread. * @throws IgniteCheckedException If local node is not primary for any of provided keys. - * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStartAffinity(String cacheName, Object affinityKey, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException; @@ -129,7 +129,7 @@ public interface IgniteTransactions { * @return Started transaction. * @throws IllegalStateException If transaction is already started by this thread. * @throws IgniteCheckedException If local node is not primary for any of provided keys. - * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStartPartition(String cacheName, int partId, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java new file mode 100644 index 0000000..c1cac73 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.cache; + +import org.apache.ignite.*; + +/** + * Exception thrown when atomic operation timeout occurs. + */ +public class CacheAtomicUpdateTimeoutException extends IgniteCheckedException { + /** */ + private static final long serialVersionUID = 0L; + + /** + * Creates new timeout exception with given error message. + * + * @param msg Error message. + */ + public CacheAtomicUpdateTimeoutException(String msg) { + super(msg); + } + + /** + * Creates new timeout exception with given error message and optional nested exception. + * + * @param msg Error message. + * @param cause Optional nested exception (can be <tt>null</tt>). + */ + public CacheAtomicUpdateTimeoutException(String msg, Throwable cause) { + super(msg, cause); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java new file mode 100644 index 0000000..746060c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.cache; + +import org.jetbrains.annotations.*; + +/** + * Cache write ordering mode. This enumeration is taken into account only in {@link CacheAtomicityMode#ATOMIC} + * atomicity mode. Write ordering mode determines which node assigns the write version, sender or the primary node. + * <p> + * For example, {@link #CLOCK} mode assigns write versions on a sender node which generally leads to better + * performance in {@link GridCacheWriteSynchronizationMode#FULL_SYNC} synchronization mode, since in this case + * sender can send write requests to primary and backups at the same time. Otherwise, if ordering mode is + * {@link #PRIMARY}, it would only send request to primary node, which in turn will assign write version + * and forward it to backups. + * <p> + * {@link #CLOCK} mode will be automatically configured only with {@link GridCacheWriteSynchronizationMode#FULL_SYNC} + * write synchronization mode, as for other synchronization modes it does not render better performance. + */ +public enum CacheAtomicWriteOrderMode { + /** + * In this mode, write versions are assigned on a sender node which generally leads to better + * performance in {@link GridCacheWriteSynchronizationMode#FULL_SYNC} synchronization mode, since in this case + * sender can send write requests to primary and backups at the same time. + * <p> + * This mode will be automatically configured only with {@link GridCacheWriteSynchronizationMode#FULL_SYNC} + * write synchronization mode, as for other synchronization modes it does not render better performance. + */ + CLOCK, + + /** + * Cache version is assigned only on primary node. This means that sender will only send write request + * to primary node, which in turn will assign write version and forward it to backups. + */ + PRIMARY; + + /** Enumerated values. */ + private static final CacheAtomicWriteOrderMode[] VALS = values(); + + /** + * Efficiently gets enumerated value from its ordinal. + * + * @param ord Ordinal value. + * @return Enumerated value or {@code null} if ordinal out of range. + */ + @Nullable public static CacheAtomicWriteOrderMode fromOrdinal(byte ord) { + return ord >= 0 && ord < VALS.length ? VALS[ord] : null; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java new file mode 100644 index 0000000..a2de8bf --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.cache; + +import org.apache.ignite.transactions.*; +import org.jetbrains.annotations.*; + +/** + * Cache atomicity mode controls whether cache should maintain fully transactional semantics + * or more light-weight atomic behavior. It is recommended that {@link #ATOMIC} mode is + * used whenever transactions and explicit locking are not needed. Note that in {@link #ATOMIC} + * mode cache will still maintain full data consistency across all cache nodes. + * <p> + * Cache atomicity may be set via {@link CacheConfiguration#getAtomicityMode()} + * configuration property. + */ +public enum CacheAtomicityMode { + /** + * Specified fully {@code ACID}-compliant transactional cache behavior. See + * {@link IgniteTx} for more information about transactions. + * <p> + * This mode is currently the default cache atomicity mode. However, cache + * atomicity mode will be changed to {@link #ATOMIC} starting from version {@code 5.2}, + * so it is recommended that desired atomicity mode is explicitly configured + * instead of relying on default value. + */ + TRANSACTIONAL, + + /** + * Specifies atomic-only cache behaviour. In this mode distributed transactions and distributed + * locking are not supported. Disabling transactions and locking allows to achieve much higher + * performance and throughput ratios. + * <p> + * In addition to transactions and locking, one of the main differences in {@code ATOMIC} mode + * is that bulk writes, such as {@code putAll(...)}, {@code removeAll(...)}, and {@code transformAll(...)} + * methods, become simple batch operations which can partially fail. In case of partial + * failure {@link GridCachePartialUpdateException} will be thrown which will contain a list of keys + * for which the update failed. It is recommended that bulk writes are used whenever multiple keys + * need to be inserted or updated in cache, as they reduce number of network trips and provide + * better performance. + * <p> + * Note that even without locking and transactions, {@code ATOMIC} mode still provides + * full consistency guarantees across all cache nodes. + * <p> + * Also note that all data modifications in {@code ATOMIC} mode are guaranteed to be atomic + * and consistent with writes to the underlying persistent store, if one is configured. + * <p> + * This mode is currently implemented for {@link CacheMode#PARTITIONED} caches only. + */ + ATOMIC; + + /** Enumerated values. */ + private static final CacheAtomicityMode[] VALS = values(); + + /** + * Efficiently gets enumerated value from its ordinal. + * + * @param ord Ordinal value. + * @return Enumerated value or {@code null} if ordinal out of range. + */ + @Nullable public static CacheAtomicityMode fromOrdinal(int ord) { + return ord >= 0 && ord < VALS.length ? VALS[ord] : null; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java index b88e702..83b972e 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java @@ -68,10 +68,10 @@ public class CacheConfiguration extends MutableConfiguration { public static final int DFLT_BACKUPS = 0; /** Default caching mode. */ - public static final GridCacheMode DFLT_CACHE_MODE = GridCacheMode.REPLICATED; + public static final CacheMode DFLT_CACHE_MODE = CacheMode.REPLICATED; /** Default atomicity mode. */ - public static final GridCacheAtomicityMode DFLT_CACHE_ATOMICITY_MODE = GridCacheAtomicityMode.ATOMIC; + public static final CacheAtomicityMode DFLT_CACHE_ATOMICITY_MODE = CacheAtomicityMode.ATOMIC; /** Default value for cache distribution mode. */ public static final GridCacheDistributionMode DFLT_DISTRIBUTION_MODE = GridCacheDistributionMode.PARTITIONED_ONLY; @@ -249,13 +249,13 @@ public class CacheConfiguration extends MutableConfiguration { private GridCacheAffinityFunction aff; /** Cache mode. */ - private GridCacheMode cacheMode = DFLT_CACHE_MODE; + private CacheMode cacheMode = DFLT_CACHE_MODE; /** Cache atomicity mode. */ - private GridCacheAtomicityMode atomicityMode; + private CacheAtomicityMode atomicityMode; /** Write ordering mode. */ - private GridCacheAtomicWriteOrderMode atomicWriteOrderMode; + private CacheAtomicWriteOrderMode atomicWriteOrderMode; /** Number of backups for cache. */ private int backups = DFLT_BACKUPS; @@ -492,7 +492,7 @@ public class CacheConfiguration extends MutableConfiguration { /** * Gets cache distribution mode. This parameter is taken into account only if - * {@link #getCacheMode()} is set to {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} mode. + * {@link #getCacheMode()} is set to {@link CacheMode#PARTITIONED} or {@link CacheMode#REPLICATED} mode. * <p> * If not set, default value is {@link #DFLT_DISTRIBUTION_MODE}. * @@ -543,7 +543,7 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Sets eviction policy for near cache. This property is only used for {@link GridCacheMode#PARTITIONED} caching + * Sets eviction policy for near cache. This property is only used for {@link CacheMode#PARTITIONED} caching * mode. * * @param nearEvictPlc Eviction policy for near cache. @@ -795,7 +795,7 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Start size for near cache. This property is only used for {@link GridCacheMode#PARTITIONED} caching mode. + * Start size for near cache. This property is only used for {@link CacheMode#PARTITIONED} caching mode. * * @param nearStartSize Start size for near cache. */ @@ -884,12 +884,12 @@ public class CacheConfiguration extends MutableConfiguration { /** * Gets caching mode to use. You can configure cache either to be local-only, - * fully replicated, partitioned, or near. If not provided, {@link GridCacheMode#REPLICATED} + * fully replicated, partitioned, or near. If not provided, {@link CacheMode#REPLICATED} * mode will be used by default (defined by {@link #DFLT_CACHE_MODE} constant). * * @return {@code True} if cache is local. */ - public GridCacheMode getCacheMode() { + public CacheMode getCacheMode() { return cacheMode; } @@ -898,7 +898,7 @@ public class CacheConfiguration extends MutableConfiguration { * * @param cacheMode Caching mode. */ - public void setCacheMode(GridCacheMode cacheMode) { + public void setCacheMode(CacheMode cacheMode) { this.cacheMode = cacheMode; } @@ -909,7 +909,7 @@ public class CacheConfiguration extends MutableConfiguration { * * @return Cache atomicity mode. */ - public GridCacheAtomicityMode getAtomicityMode() { + public CacheAtomicityMode getAtomicityMode() { return atomicityMode; } @@ -918,32 +918,32 @@ public class CacheConfiguration extends MutableConfiguration { * * @param atomicityMode Cache atomicity mode. */ - public void setAtomicityMode(GridCacheAtomicityMode atomicityMode) { + public void setAtomicityMode(CacheAtomicityMode atomicityMode) { this.atomicityMode = atomicityMode; } /** - * Gets cache write ordering mode. This property can be enabled only for {@link GridCacheAtomicityMode#ATOMIC} + * Gets cache write ordering mode. This property can be enabled only for {@link CacheAtomicityMode#ATOMIC} * cache (for other atomicity modes it will be ignored). * * @return Cache write ordering mode. */ - public GridCacheAtomicWriteOrderMode getAtomicWriteOrderMode() { + public CacheAtomicWriteOrderMode getAtomicWriteOrderMode() { return atomicWriteOrderMode; } /** - * Sets cache write ordering mode. This property can be enabled only for {@link GridCacheAtomicityMode#ATOMIC} + * Sets cache write ordering mode. This property can be enabled only for {@link CacheAtomicityMode#ATOMIC} * cache (for other atomicity modes it will be ignored). * * @param atomicWriteOrderMode Cache write ordering mode. */ - public void setAtomicWriteOrderMode(GridCacheAtomicWriteOrderMode atomicWriteOrderMode) { + public void setAtomicWriteOrderMode(CacheAtomicWriteOrderMode atomicWriteOrderMode) { this.atomicWriteOrderMode = atomicWriteOrderMode; } /** - * Gets number of nodes used to back up single partition for {@link GridCacheMode#PARTITIONED} cache. + * Gets number of nodes used to back up single partition for {@link CacheMode#PARTITIONED} cache. * <p> * If not set, default value is {@link #DFLT_BACKUPS}. * @@ -954,7 +954,7 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Sets number of nodes used to back up single partition for {@link GridCacheMode#PARTITIONED} cache. + * Sets number of nodes used to back up single partition for {@link CacheMode#PARTITIONED} cache. * <p> * If not set, default value is {@link #DFLT_BACKUPS}. * @@ -1421,7 +1421,7 @@ public class CacheConfiguration extends MutableConfiguration { * after they leave topology, or if you plan to start multiple nodes at once or one after another * and don't want to repartition and preload until all nodes are started. * <p> - * Delayed preloading is applied to {@link GridCacheMode#PARTITIONED} caches only. + * Delayed preloading is applied to {@link CacheMode#PARTITIONED} caches only. * For better efficiency user should usually make sure that new nodes get placed on * the same place of consistent hash ring as the left nodes, and that nodes are * restarted before this delay expires. To place nodes on the same place in consistent hash ring,
