Merge branch 'ignite-45' into ignite-497-stick
Conflicts:
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/399a1c96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/399a1c96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/399a1c96
Branch: refs/heads/ignite-497
Commit: 399a1c96cbc0ed507c1c2c773af9a1a89e7fc66a
Parents: 5a633fb beccdcf
Author: nikolay tikhonov <[email protected]>
Authored: Tue Mar 24 13:07:54 2015 +0300
Committer: nikolay tikhonov <[email protected]>
Committed: Tue Mar 24 13:07:54 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-fabric.xml | 4 +-
assembly/dependencies-hadoop.xml | 6 +-
assembly/dependencies-optional-fabric.xml | 3 +-
assembly/dependencies-optional-hadoop.xml | 3 +-
assembly/libs/README.txt | 120 ++++++
assembly/libs/readme.txt | 120 ------
assembly/release-fabric.xml | 1 +
examples/README.txt | 25 ++
examples/config/filesystem/README.txt | 8 +
examples/config/filesystem/readme.txt | 8 -
examples/config/hibernate/README.txt | 8 +
examples/config/hibernate/readme.txt | 8 -
examples/config/servlet/README.txt | 8 +
examples/config/servlet/readme.txt | 8 -
examples/readme.txt | 25 --
examples/schema-import/README.txt | 16 +-
examples/schema-import/bin/db-init.sql | 14 +-
examples/schema-import/bin/h2-server.sh | 2 +-
.../schema-import/bin/schema-import.properties | 10 +-
.../org/apache/ignite/schema/CacheConfig.java | 38 ++
.../ignite/schema/ConfigurationSnippet.java | 38 --
.../java/org/apache/ignite/schema/Demo.java | 123 +++++-
.../java/org/apache/ignite/schema/Person.java | 16 +-
.../org/apache/ignite/schema/PersonKey.java | 7 +
.../examples/datagrid/CacheAffinityExample.java | 4 +-
.../datagrid/CacheContinuousQueryExample.java | 2 +-
.../examples/datagrid/CacheQueryExample.java | 14 +-
.../starschema/CacheStarSchemaExample.java | 4 +-
.../hibernate/CacheHibernatePersonStore.java | 6 +-
.../store/jdbc/CacheJdbcPersonStore.java | 2 +-
.../client/memcache/MemcacheRestExample.java | 2 +-
.../java8/datagrid/CacheAffinityExample.java | 4 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 4 +-
.../java8/IgniteExamplesJ8SelfTestSuite.java | 43 --
.../BasicExamplesMultiNodeSelfTest.java | 28 ++
.../java8/examples/BasicExamplesSelfTest.java | 83 ++++
.../CacheExamplesMultiNodeSelfTest.java | 38 ++
.../java8/examples/CacheExamplesSelfTest.java | 141 +++++++
.../examples/CheckpointExamplesSelfTest.java | 45 +++
.../examples/ClusterGroupExampleSelfTest.java | 39 ++
.../ContinuationExamplesMultiNodeSelfTest.java | 28 ++
.../examples/ContinuationExamplesSelfTest.java | 33 ++
...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 ++
.../ContinuousMapperExamplesSelfTest.java | 33 ++
.../DeploymentExamplesMultiNodeSelfTest.java | 30 ++
.../examples/DeploymentExamplesSelfTest.java | 33 ++
.../EventsExamplesMultiNodeSelfTest.java | 28 ++
.../java8/examples/EventsExamplesSelfTest.java | 33 ++
...ibernateL2CacheExampleMultiNodeSelfTest.java | 29 ++
.../HibernateL2CacheExampleSelfTest.java | 33 ++
.../java8/examples/IgfsExamplesSelfTest.java | 51 +++
.../examples/LifecycleExamplesSelfTest.java | 33 ++
.../MemcacheRestExamplesMultiNodeSelfTest.java | 31 ++
.../examples/MemcacheRestExamplesSelfTest.java | 41 ++
.../examples/MessagingExamplesSelfTest.java | 53 +++
.../MonteCarloExamplesMultiNodeSelfTest.java | 28 ++
.../examples/MonteCarloExamplesSelfTest.java | 74 ++++
.../examples/SpringBeanExamplesSelfTest.java | 33 ++
.../examples/TaskExamplesMultiNodeSelfTest.java | 28 ++
.../java8/examples/TaskExamplesSelfTest.java | 40 ++
.../IgniteExamplesJ8SelfTestSuite.java | 73 ++++
ipc/README.txt | 4 +
ipc/readme.txt | 4 -
ipc/shmem/README.txt | 37 ++
ipc/shmem/readme.txt | 37 --
modules/aop/README.txt | 33 ++
modules/aop/readme.txt | 33 --
modules/aws/README.txt | 32 ++
modules/aws/readme.txt | 32 --
.../integration/ClientAbstractSelfTest.java | 4 +-
.../rest/AbstractRestProcessorSelfTest.java | 2 +-
.../rest/RestBinaryProtocolSelfTest.java | 72 ++--
.../rest/RestMemcacheProtocolSelfTest.java | 80 ++--
.../processors/rest/RestProcessorTest.java | 3 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 5 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 4 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 2 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 2 +-
.../loadtests/client/ClientTcpSslLoadTest.java | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 10 +-
.../java/org/apache/ignite/IgniteCache.java | 2 +-
.../org/apache/ignite/IgniteDataStreamer.java | 24 +-
.../main/java/org/apache/ignite/Ignition.java | 38 +-
.../CacheEntryEventSerializableFilter.java | 28 ++
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../cache/IgniteCacheEntryEventFilter.java | 28 --
.../ignite/cache/affinity/CacheAffinity.java | 14 +-
.../ignite/cache/query/ContinuousQuery.java | 6 +-
.../cache/query/annotations/package-info.java | 22 ++
.../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +-
.../apache/ignite/cache/store/CacheStore.java | 2 +-
.../ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../ignite/cache/store/CacheStoreSession.java | 2 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 40 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +-
.../org/apache/ignite/cluster/package-info.java | 22 ++
.../configuration/CacheConfiguration.java | 4 +-
.../configuration/NearCacheConfiguration.java | 6 +
.../ignite/configuration/package-info.java | 22 ++
.../ignite/events/CacheQueryExecutedEvent.java | 7 +-
.../ignite/events/CacheQueryReadEvent.java | 6 +-
.../ignite/internal/GridKernalContextImpl.java | 4 +-
.../ignite/internal/IgniteComponentType.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 22 +-
.../org/apache/ignite/internal/IgnitionEx.java | 73 ++--
.../ignite/internal/MarshallerContextImpl.java | 9 +-
.../impl/GridRouterCommandLineStartup.java | 4 +-
.../internal/cluster/IgniteClusterImpl.java | 4 +-
.../cache/CacheStoreBalancingWrapper.java | 4 +-
.../processors/cache/EvictableEntryImpl.java | 2 +-
.../internal/processors/cache/GridCache.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 22 +-
.../cache/GridCacheConcurrentMap.java | 4 +-
.../processors/cache/GridCacheEntrySet.java | 2 +-
.../processors/cache/GridCacheIterator.java | 2 +-
.../processors/cache/GridCacheKeySet.java | 2 +-
.../cache/GridCacheLoaderWriterStore.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../processors/cache/GridCacheStoreManager.java | 95 ++---
.../cache/GridCacheTryPutFailedException.java | 28 ++
.../cache/GridCacheValueCollection.java | 2 +-
.../cache/GridCacheWriteBehindStore.java | 17 +-
.../CacheDataStructuresManager.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheEntry.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 55 ++-
.../dht/GridDhtTransactionalCacheAdapter.java | 3 +-
.../dht/atomic/GridDhtAtomicCache.java | 49 ++-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 34 +-
.../GridDhtPartitionsExchangeFuture.java | 6 +-
.../CacheContinuousQueryFilterEx.java | 2 +-
.../continuous/CacheContinuousQueryHandler.java | 6 +-
.../continuous/CacheContinuousQueryManager.java | 12 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 2 +-
.../transactions/TransactionProxyImpl.java | 17 -
.../version/GridCacheRawVersionedEntry.java | 7 +-
.../handlers/cache/GridCacheCommandHandler.java | 2 +-
.../cache/GridCacheQueryCommandHandler.java | 6 +-
.../spring/IgniteSpringProcessor.java | 73 ----
.../ignite/internal/util/IgniteUtils.java | 44 ++-
.../util/nodestart/IgniteSshHelper.java | 34 ++
.../util/nodestart/IgniteSshProcessor.java | 34 --
.../util/spring/IgniteSpringHelper.java | 95 +++++
.../visor/cache/VisorCacheClearTask.java | 2 +-
.../visor/cache/VisorCacheLoadTask.java | 2 +-
.../apache/ignite/lifecycle/package-info.java | 22 ++
.../org/apache/ignite/plugin/package-info.java | 22 ++
.../tcp/internal/TcpDiscoveryStatistics.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 3 +-
.../apache/ignite/transactions/Transaction.java | 29 --
.../ignite/transactions/package-info.java | 22 ++
.../core/src/test/config/store/jdbc/Ignite.xml | 268 -------------
.../config/store/jdbc/ignite-type-metadata.xml | 268 +++++++++++++
.../apache/ignite/GridTestStoreNodeStartup.java | 2 +-
.../store/GridCacheBalancingStoreSelfTest.java | 2 +-
.../cache/store/GridGeneratingTestStore.java | 2 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 4 +-
.../store/jdbc/CacheJdbcPojoStoreTest.java | 2 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 2 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 6 +-
.../GridProjectionForCachesSelfTest.java | 6 +-
.../ignite/internal/GridStartStopSelfTest.java | 4 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 4 +-
.../GridDeploymentMessageCountSelfTest.java | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 4 +-
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 152 ++++++++
.../GridAffinityProcessorAbstractSelfTest.java | 2 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 48 +--
.../GridCacheAbstractLocalStoreSelfTest.java | 12 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 80 ++--
.../GridCacheAbstractRemoveFailureTest.java | 4 +-
.../cache/GridCacheAbstractSelfTest.java | 4 +-
...acheAbstractUsersAffinityMapperSelfTest.java | 2 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 4 +-
.../GridCacheAtomicMessageCountSelfTest.java | 2 +-
.../cache/GridCacheBasicApiAbstractTest.java | 31 +-
.../cache/GridCacheClearAllSelfTest.java | 14 +-
.../cache/GridCacheClearLocallySelfTest.java | 12 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 10 +-
.../cache/GridCacheConcurrentMapTest.java | 6 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 5 +-
...idCacheConfigurationConsistencySelfTest.java | 4 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 4 +-
.../cache/GridCacheDeploymentSelfTest.java | 18 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheEvictionEventAbstractTest.java | 2 +-
.../GridCacheFinishPartitionsSelfTest.java | 10 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheGenericTestStore.java | 2 +-
.../cache/GridCacheIncrementTransformTest.java | 2 +-
.../GridCacheInterceptorAbstractSelfTest.java | 12 +-
.../cache/GridCacheIteratorPerformanceTest.java | 6 +-
.../cache/GridCacheKeyCheckSelfTest.java | 6 +-
.../processors/cache/GridCacheLeakTest.java | 2 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 12 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 17 +-
.../GridCacheMarshallerTxAbstractTest.java | 10 +-
.../GridCacheMarshallingNodeJoinSelfTest.java | 170 ++++++++
.../cache/GridCacheMemoryModeSelfTest.java | 2 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 2 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 6 +-
.../cache/GridCacheMvccManagerSelfTest.java | 2 +-
.../cache/GridCacheNestedTxAbstractTest.java | 12 +-
.../cache/GridCacheObjectToStringSelfTest.java | 2 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 17 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 14 +-
.../cache/GridCacheOffHeapSelfTest.java | 9 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 41 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 10 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 8 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 12 +-
.../GridCacheOrderedPreloadingSelfTest.java | 2 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 6 +-
.../cache/GridCachePartitionedGetSelfTest.java | 8 +-
.../GridCachePreloadingEvictionsSelfTest.java | 8 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 7 +-
.../processors/cache/GridCachePutAllTask.java | 2 +-
.../GridCacheQueryInternalKeysSelfTest.java | 2 +-
.../GridCacheReferenceCleanupSelfTest.java | 10 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
...ridCacheReplicatedSynchronousCommitTest.java | 6 +-
.../GridCacheReturnValueTransferSelfTest.java | 2 +-
.../cache/GridCacheSlowTxWarnTest.java | 2 +-
.../processors/cache/GridCacheStopSelfTest.java | 2 +-
.../cache/GridCacheStorePutxSelfTest.java | 2 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 3 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 10 +-
.../processors/cache/GridCacheTestStore.java | 2 +-
...cheTransactionalAbstractMetricsSelfTest.java | 8 +-
.../cache/GridCacheTtlManagerLoadTest.java | 2 +-
.../cache/GridCacheTtlManagerSelfTest.java | 6 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 10 +-
...idCacheValueConsistencyAbstractSelfTest.java | 5 +-
.../GridCacheVariableTopologySelfTest.java | 2 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 6 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 2 +-
.../cache/IgniteCacheAbstractTest.java | 2 +-
...niteCacheCopyOnReadDisabledAbstractTest.java | 2 +-
.../cache/IgniteCacheDynamicStopSelfTest.java | 2 +-
.../IgniteCacheEntryListenerAbstractTest.java | 18 +-
.../cache/IgniteCacheStartStopLoadTest.java | 4 +-
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 3 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 4 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 52 +--
.../cache/IgnitePutAllLargeBatchSelfTest.java | 8 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 4 +-
.../cache/IgniteStaticCacheStartSelfTest.java | 4 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 32 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 56 ++-
.../IgniteTxMultiThreadedAbstractTest.java | 2 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 3 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 34 +-
...IgniteCacheAbstractExecutionContextTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 2 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 2 +-
.../IgniteAtomicLongApiAbstractSelfTest.java | 2 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 24 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 2 +-
...tractDistributedByteArrayValuesSelfTest.java | 6 +-
.../GridCacheAbstractJobExecutionTest.java | 10 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 10 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 2 +-
.../GridCacheAtomicTimeoutSelfTest.java | 8 +-
.../GridCacheBasicOpAbstractTest.java | 26 +-
.../GridCacheClientModesAbstractSelfTest.java | 16 +-
.../GridCacheEntrySetAbstractSelfTest.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +-
...GridCacheLoadingConcurrentGridStartTest.java | 6 +-
.../distributed/GridCacheLockAbstractTest.java | 5 +-
.../distributed/GridCacheMixedModeSelfTest.java | 2 +-
.../GridCacheMultiNodeAbstractTest.java | 10 +-
.../GridCacheMultiNodeLockAbstractTest.java | 14 +-
...dCacheMultithreadedFailoverAbstractTest.java | 6 +-
.../GridCacheNodeFailureAbstractTest.java | 6 +-
...dCachePartitionedAffinityFilterSelfTest.java | 3 +-
...chePartitionedReloadAllAbstractSelfTest.java | 6 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 4 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../GridCacheTransformEventSelfTest.java | 2 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 2 +-
.../IgniteCrossCacheTxStoreSelfTest.java | 24 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 4 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 16 +-
.../IgniteTxTimeoutAbstractTest.java | 2 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 8 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 32 +-
.../dht/GridCacheColocatedDebugTest.java | 109 +++---
...eColocatedOptimisticTransactionSelfTest.java | 2 +-
.../dht/GridCacheDhtEntrySelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 2 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 16 +-
.../dht/GridCacheDhtMappingSelfTest.java | 3 +-
.../dht/GridCacheDhtMultiBackupTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 21 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 8 +-
.../GridCacheDhtPreloadMessageCountTest.java | 6 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 18 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 24 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 10 +-
...idCachePartitionedPreloadEventsSelfTest.java | 4 +-
...dCachePartitionedTopologyChangeSelfTest.java | 12 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 8 +-
.../dht/IgniteTxReentryColocatedSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 58 ++-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
...tomicPrimaryWriteOrderRemoveFailureTest.java | 56 +++
.../GridCacheAtomicRemoveFailureTest.java | 56 +++
...GridCacheValueConsistencyAtomicSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 8 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 6 +-
.../near/GridCacheNearMetricsSelfTest.java | 30 +-
.../near/GridCacheNearMultiGetSelfTest.java | 4 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 6 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 12 +-
.../GridCacheNearPartitionedClearSelfTest.java | 4 +-
.../GridCacheNearReaderPreloadSelfTest.java | 6 +-
.../near/GridCacheNearReadersSelfTest.java | 22 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 12 +-
.../GridCachePartitionedAffinitySelfTest.java | 4 +-
.../GridCachePartitionedEvictionSelfTest.java | 2 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 20 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 13 +-
.../GridCachePartitionedStorePutSelfTest.java | 7 +-
.../near/GridCachePutArrayValueSelfTest.java | 2 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 3 +-
.../near/IgniteCacheNearReadCommittedTest.java | 4 +-
.../near/IgniteTxReentryNearSelfTest.java | 2 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 4 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 15 +-
.../GridCacheReplicatedPreloadSelfTest.java | 32 +-
...GridCacheReplicatedPreloadUndeploysTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 3 +-
...heConcurrentEvictionConsistencySelfTest.java | 2 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 3 +-
.../GridCacheDistributedEvictionsSelfTest.java | 4 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +-
.../eviction/GridCacheEvictionAbstractTest.java | 4 +-
.../GridCacheEvictionFilterSelfTest.java | 5 +-
.../GridCacheEvictionTouchSelfTest.java | 9 +-
.../GridCacheFifoEvictionPolicySelfTest.java | 2 +-
.../lru/GridCacheLruEvictionPolicySelfTest.java | 2 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 3 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 4 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 16 +-
.../IgniteCacheStoreSessionAbstractTest.java | 26 +-
...acheStoreSessionWriteBehindAbstractTest.java | 5 +-
.../IgniteCacheTxStoreSessionTest.java | 20 +-
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 8 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 4 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 3 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 6 +-
.../GridCacheLocalMultithreadedSelfTest.java | 2 +-
.../local/GridCacheLocalTxTimeoutSelfTest.java | 2 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 12 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 42 +-
...dCacheContinuousQueryReplicatedSelfTest.java | 8 +-
.../DataStreamProcessorSelfTest.java | 12 +-
.../datastreamer/DataStreamerImplSelfTest.java | 2 +-
.../processors/igfs/IgfsCacheSelfTest.java | 6 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
.../GridServiceProcessorMultiNodeSelfTest.java | 2 +-
.../internal/util/GridTestClockTimer.java | 11 +
.../loadtests/GridCacheLoadPopulationTask.java | 2 +-
.../cache/GridCacheAbstractLoadTest.java | 2 +-
.../loadtests/cache/GridCacheBenchmark.java | 3 +-
.../cache/GridCacheDataStructuresLoadTest.java | 2 +-
.../loadtests/cache/GridCacheLoadTest.java | 5 +-
.../loadtests/cache/GridCacheSwapLoadTest.java | 7 +-
.../capacity/GridCapacityLoadTest.java | 3 +-
.../colocation/GridTestCacheStore.java | 2 +-
.../colocation/GridTestLifecycleBean.java | 2 +-
.../loadtests/colocation/GridTestMain.java | 6 +-
.../GridContinuousOperationsLoadTest.java | 4 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 2 +-
.../ignite/loadtests/dsi/GridDsiClient.java | 4 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 6 +-
.../cacheget/GridBenchmarkCacheGetLoadTest.java | 2 +-
.../mapper/GridContinuousMapperTask1.java | 2 +-
.../mapper/GridContinuousMapperTask2.java | 2 +-
.../swap/GridSwapEvictAllBenchmark.java | 4 +-
.../marshaller/GridMarshallerAbstractTest.java | 6 +-
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
.../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 3 +
.../ignite/testframework/junits/IgniteMock.java | 6 +-
.../cache/GridAbstractCacheStoreSelfTest.java | 34 +-
.../GridAbstractLifecycleAwareSelfTest.java | 7 +
.../junits/common/GridCommonAbstractTest.java | 13 +-
.../IgniteCacheFailoverTestSuite.java | 5 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +
.../tests/p2p/CacheDeploymentTestTask1.java | 2 +-
.../tests/p2p/CacheDeploymentTestTask3.java | 2 +-
.../p2p/GridP2PContinuousDeploymentTask1.java | 2 +-
modules/geospatial/README.txt | 33 ++
modules/geospatial/readme.txt | 33 --
.../query/h2/GridH2IndexingGeoSelfTest.java | 8 +-
modules/hadoop/README.txt | 33 ++
modules/hadoop/readme.txt | 33 --
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 4 +-
modules/hibernate/README.txt | 33 ++
modules/hibernate/readme.txt | 33 --
.../HibernateAccessStrategyAdapter.java | 2 +-
.../cache/hibernate/HibernateRegionFactory.java | 6 +-
.../hibernate/CacheHibernateBlobStore.java | 6 +-
.../HibernateL2CacheConfigurationSelfTest.java | 10 +-
modules/indexing/README.txt | 33 ++
modules/indexing/readme.txt | 33 --
.../GridCacheAbstractFieldsQuerySelfTest.java | 46 +--
.../cache/GridCacheCrossCacheQuerySelfTest.java | 15 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +-
.../cache/GridCacheQuerySimpleBenchmark.java | 2 +-
.../processors/cache/GridCacheSwapSelfTest.java | 11 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 40 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 60 +--
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 2 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 6 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 4 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 14 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 32 +-
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 5 +-
...GridCachePartitionedFieldsQuerySelfTest.java | 2 +-
.../IgniteCacheAtomicFieldsQuerySelfTest.java | 2 +-
.../IgniteCachePartitionedQuerySelfTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest.java | 3 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +-
...gniteCacheReplicatedFieldsQuerySelfTest.java | 2 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 12 +-
.../local/IgniteCacheLocalQuerySelfTest.java | 2 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 10 +-
...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +-
.../query/h2/GridH2IndexRebuildTest.java | 17 +-
modules/jcl/README.txt | 33 ++
modules/jcl/readme.txt | 33 --
modules/jta/README.txt | 32 ++
modules/jta/readme.txt | 32 --
.../processors/cache/GridCacheJtaSelfTest.java | 2 +-
modules/log4j/README.txt | 32 ++
modules/log4j/readme.txt | 32 --
modules/rest-http/README.txt | 33 ++
modules/rest-http/readme.txt | 33 --
modules/scalar/README.txt | 32 ++
modules/scalar/readme.txt | 32 --
.../scala/org/apache/ignite/scalar/scalar.scala | 6 +-
modules/schedule/README.txt | 32 ++
modules/schedule/readme.txt | 32 --
modules/schema-import/README.txt | 214 ++++++++++
modules/schema-import/readme.txt | 214 ----------
.../ignite/schema/generator/CodeGenerator.java | 53 ++-
.../org/apache/ignite/schema/ui/MessageBox.java | 2 +-
.../ignite/schema/ui/SchemaImportApp.java | 92 +++--
.../schema/test/generator/XmlGeneratorTest.java | 2 +-
.../apache/ignite/schema/test/model/Ignite.xml | 390 -------------------
.../schema/test/model/ignite-type-metadata.xml | 390 +++++++++++++++++++
modules/slf4j/README.txt | 32 ++
modules/slf4j/readme.txt | 32 --
modules/spring/README.txt | 33 ++
modules/spring/readme.txt | 33 --
.../org/apache/ignite/IgniteSpringBean.java | 12 +-
.../spring/IgniteSpringProcessorImpl.java | 268 -------------
.../util/spring/IgniteSpringHelperImpl.java | 301 ++++++++++++++
.../ignite/internal/GridFactorySelfTest.java | 24 ++
.../internal/IgniteDynamicCacheConfigTest.java | 244 ++++++++++++
.../apache/ignite/internal/TestNodeFilter.java | 36 ++
.../java/org/apache/ignite/internal/cache.xml | 58 +++
.../apache/ignite/internal/filtered-cache.xml | 62 +++
.../apache/ignite/internal/invalid-cache.xml | 78 ++++
.../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +-
.../spring/GridSpringCacheManagerSelfTest.java | 20 +-
.../testsuites/IgniteSpringTestSuite.java | 2 +
modules/ssh/README.txt | 32 ++
modules/ssh/readme.txt | 32 --
.../util/nodestart/IgniteSshHelperImpl.java | 28 ++
.../util/nodestart/IgniteSshProcessorImpl.java | 28 --
modules/urideploy/README.txt | 33 ++
modules/urideploy/readme.txt | 33 --
.../scala/org/apache/ignite/visor/visor.scala | 4 +-
.../cache/VisorCacheClearCommandSpec.scala | 8 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 4 +-
modules/web/README.txt | 34 ++
modules/web/readme.txt | 34 --
.../cache/websession/WebSessionFilter.java | 2 +-
.../internal/websession/WebSessionSelfTest.java | 2 +-
.../IgniteSqlQueryPutOffHeapBenchmark.java | 32 --
.../jdbc/IgniteJdbcStorePutTxBenchmark.java | 5 -
510 files changed, 6528 insertions(+), 3987 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/399a1c96/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java
----------------------------------------------------------------------
diff --cc
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java
index c9563e3,f3c27a5..0000000
deleted file mode 100644,100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java
+++ /dev/null
@@@ -1,32 -1,32 +1,0 @@@
--/*
-- * 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.yardstick.cache;
--
--import org.apache.ignite.*;
--import org.apache.ignite.cache.*;
--
--/**
-- * Ignite benchmark that performs put and query operations
-- * with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} memory mode.
-- */
--public class IgniteSqlQueryPutOffHeapBenchmark extends
IgniteSqlQueryPutBenchmark {
-- /** {@inheritDoc} */
- // @Override protected IgniteCache<Integer, Object> cache() {
- // return ignite().jcache("query-offheap");
- // }
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("query-offheap");
- }
--}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/399a1c96/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java
----------------------------------------------------------------------
diff --cc
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java
index 54c01bb,7d0bfd8..9dac959
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java
@@@ -39,9 -39,9 +39,4 @@@ public class IgniteJdbcStorePutTxBenchm
return true;
}
--
-- /** {@inheritDoc} */
- // @Override protected IgniteCache<Object, Object> cache() {
- // return ignite().jcache("tx");
- // }
- @Override protected IgniteCache<Object, Object> cache() {
- return ignite().cache("tx");
- }
}
