ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [11/42] incubator-ignite git commit: Merge branches 'ignite-624' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Date Wed, 08 Apr 2015 12:59:14 GMT
Merge branches 'ignite-624' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-624


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e89dde7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e89dde7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e89dde7

Branch: refs/heads/ignite-gg-9829
Commit: 0e89dde70168433d18fb4bbd67e7d992c2029dda
Parents: 98de490 09a3a82
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Fri Apr 3 13:54:19 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Fri Apr 3 13:54:19 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   19 +-
 examples/pom-standalone.xml                     |    1 -
 examples/pom.xml                                |   19 +-
 examples/schema-import/pom.xml                  |   10 +-
 .../examples/datagrid/CacheQueryExample.java    |   12 +-
 ipc/shmem/README.txt                            |    2 +-
 modules/aop/pom.xml                             |    6 +-
 modules/aws/pom.xml                             |    4 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |   12 +-
 modules/clients/pom.xml                         |   10 +-
 modules/codegen/pom.xml                         |    4 +-
 modules/core/pom.xml                            |   38 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |    4 +-
 .../apache/ignite/cache/CachingProvider.java    |    2 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |    2 +-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |    9 +-
 .../configuration/CacheConfiguration.java       |   52 +-
 .../configuration/FileSystemConfiguration.java  |    6 +
 .../ignite/internal/GridCachePluginContext.java |   72 ++
 .../ignite/internal/GridKernalContextImpl.java  |   12 +-
 .../apache/ignite/internal/IgniteKernal.java    |    5 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   10 +-
 .../internal/MarshallerContextAdapter.java      |    6 +-
 .../ignite/internal/MarshallerContextImpl.java  |   90 +-
 .../cache/CacheEvictableEntryImpl.java          |   11 +-
 .../processors/cache/CacheMetricsImpl.java      |    1 +
 .../cache/CacheObjectByteArrayImpl.java         |    2 +-
 .../processors/cache/CacheObjectContext.java    |   14 +-
 .../processors/cache/CacheObjectImpl.java       |   10 +-
 .../processors/cache/CacheProjection.java       |   36 -
 .../cache/CacheStorePartialUpdateException.java |    2 +-
 .../cache/DynamicCacheDescriptor.java           |    2 +-
 .../processors/cache/GridCacheAdapter.java      |  278 +---
 .../processors/cache/GridCacheAttributes.java   |    8 -
 .../cache/GridCacheConcurrentMap.java           |   34 +-
 .../processors/cache/GridCacheContext.java      |   26 +-
 .../cache/GridCacheDeploymentManager.java       |    7 +-
 .../processors/cache/GridCacheEntryEx.java      |   55 +-
 .../processors/cache/GridCacheMapEntry.java     |  288 +----
 .../cache/GridCacheMapEntryFactory.java         |    2 -
 .../processors/cache/GridCachePeekMode.java     |   81 --
 .../processors/cache/GridCacheProcessor.java    |  128 +-
 .../cache/GridCacheProjectionImpl.java          |   11 -
 .../processors/cache/GridCacheProxyImpl.java    |   24 -
 .../processors/cache/GridCacheStoreManager.java | 1202 ------------------
 .../processors/cache/GridCacheUtils.java        |   50 +-
 .../cache/GridCacheWriteBehindStore.java        | 1015 ---------------
 .../distributed/GridDistributedCacheEntry.java  |    4 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   31 +-
 .../distributed/dht/GridDhtCacheEntry.java      |    8 +-
 .../distributed/dht/GridDhtLocalPartition.java  |    4 +-
 .../distributed/dht/GridDhtLockFuture.java      |    2 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   11 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   40 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |    4 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   35 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |    4 +-
 .../colocated/GridDhtDetachedCacheEntry.java    |    5 +-
 .../distributed/near/GridNearAtomicCache.java   |    3 +-
 .../distributed/near/GridNearCacheAdapter.java  |   75 +-
 .../distributed/near/GridNearCacheEntry.java    |    4 +-
 .../distributed/near/GridNearTxRemote.java      |   11 +-
 .../processors/cache/local/GridLocalCache.java  |    3 +-
 .../cache/local/GridLocalCacheEntry.java        |    4 +-
 .../local/atomic/GridLocalAtomicCache.java      |    7 +-
 .../cache/query/GridCacheQueryManager.java      |   16 +-
 .../CacheContinuousQueryListener.java           |    3 +
 .../continuous/CacheContinuousQueryManager.java |   30 +-
 .../cache/store/CacheOsStoreManager.java        |   59 +
 .../cache/store/CacheStoreManager.java          |  182 +++
 .../store/GridCacheStoreManagerAdapter.java     | 1111 ++++++++++++++++
 .../cache/store/GridCacheWriteBehindStore.java  | 1015 +++++++++++++++
 .../transactions/IgniteTransactionsImpl.java    |    4 +
 .../cache/transactions/IgniteTxAdapter.java     |    5 +-
 .../transactions/IgniteTxLocalAdapter.java      |   43 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   14 +-
 .../IgniteCacheObjectProcessorImpl.java         |  183 ++-
 .../datastreamer/DataStreamerImpl.java          |   21 +-
 .../processors/igfs/IgfsDataManager.java        |   11 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |   23 +-
 .../processors/igfs/IgfsHelperImpl.java         |    3 +-
 .../processors/plugin/CachePluginManager.java   |  113 ++
 .../processors/query/GridQueryProcessor.java    |  143 ++-
 .../messages/GridQueryNextPageResponse.java     |   34 +-
 .../processors/task/GridTaskProcessor.java      |    9 +-
 .../ignite/internal/util/IgniteUtils.java       |    2 +-
 .../visor/cache/VisorCacheConfiguration.java    |   81 +-
 .../cache/VisorCacheDefaultConfiguration.java   |   21 -
 .../cache/VisorCacheNearConfiguration.java      |   11 +-
 .../visor/node/VisorGridConfiguration.java      |   28 +-
 .../internal/visor/util/VisorMimeTypes.java     |    4 +-
 .../ignite/marshaller/MarshallerContext.java    |    3 +-
 .../optimized/OptimizedMarshallerUtils.java     |    9 +-
 .../ignite/plugin/CachePluginConfiguration.java |   36 +
 .../ignite/plugin/CachePluginContext.java       |   54 +
 .../ignite/plugin/CachePluginProvider.java      |   84 ++
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    9 +-
 .../ignite/startup/BasicWarmupClosure.java      |    2 +-
 .../resources/META-INF/classnames.properties    |   94 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |    2 +
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |   11 +-
 .../managers/GridNoopManagerSelfTest.java       |    2 +-
 .../communication/GridIoManagerSelfTest.java    |    9 +-
 ...idCacheConfigurationConsistencySelfTest.java |    3 -
 .../cache/GridCacheMemoryModeSelfTest.java      |   12 +-
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |   16 +-
 .../cache/GridCachePartitionedWritesTest.java   |    3 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |    4 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   40 +-
 ...idCacheWriteBehindStoreAbstractSelfTest.java |  189 ---
 .../GridCacheWriteBehindStoreAbstractTest.java  |  349 -----
 .../GridCacheWriteBehindStoreLocalTest.java     |   30 -
 ...heWriteBehindStoreMultithreadedSelfTest.java |  163 ---
 ...BehindStorePartitionedMultiNodeSelfTest.java |  215 ----
 ...ridCacheWriteBehindStorePartitionedTest.java |   30 -
 ...GridCacheWriteBehindStoreReplicatedTest.java |   30 -
 .../GridCacheWriteBehindStoreSelfTest.java      |  267 ----
 .../IgniteCacheAtomicLocalStoreValueTest.java   |   49 +
 ...iteCacheAtomicNearEnabledStoreValueTest.java |   30 +
 ...maryWriteOrderNearEnabledStoreValueTest.java |   31 +
 ...heAtomicPrimaryWriteOrderStoreValueTest.java |   32 +
 .../cache/IgniteCacheAtomicStoreValueTest.java  |   55 +
 .../IgniteCacheStoreValueAbstractTest.java      |  311 +++++
 .../cache/IgniteCacheTxLocalStoreValueTest.java |   49 +
 .../IgniteCacheTxNearEnabledStoreValueTest.java |   30 +
 .../cache/IgniteCacheTxStoreValueTest.java      |   49 +
 .../IgniteCacheSystemTransactionsSelfTest.java  |   38 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   14 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |   24 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |    8 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |    2 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |    2 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |  103 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |   33 +-
 .../near/GridCacheNearReadersSelfTest.java      |  154 +--
 .../GridCacheReplicatedPreloadSelfTest.java     |   11 +-
 ...IgniteCacheJdbcBlobStoreNodeRestartTest.java |   52 +
 ...IgniteCacheStoreNodeRestartAbstractTest.java |  116 ++
 ...ridCacheContinuousQueryAbstractSelfTest.java |    2 +-
 ...idCacheWriteBehindStoreAbstractSelfTest.java |  191 +++
 .../GridCacheWriteBehindStoreAbstractTest.java  |  350 +++++
 .../GridCacheWriteBehindStoreLocalTest.java     |   30 +
 ...heWriteBehindStoreMultithreadedSelfTest.java |  163 +++
 ...BehindStorePartitionedMultiNodeSelfTest.java |  216 ++++
 ...ridCacheWriteBehindStorePartitionedTest.java |   30 +
 ...GridCacheWriteBehindStoreReplicatedTest.java |   30 +
 .../GridCacheWriteBehindStoreSelfTest.java      |  268 ++++
 .../processors/igfs/IgfsProcessorSelfTest.java  |    3 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |   46 +-
 .../processors/igfs/IgsfStartCacheTest.java     |  115 ++
 .../internal/util/IgniteUtilsSelfTest.java      |    2 +-
 .../loadtests/hashmap/GridCacheTestContext.java |   12 +-
 .../loadtests/hashmap/GridHashMapLoadTest.java  |    2 +-
 .../OptimizedMarshallerNodeFailoverTest.java    |   71 +-
 .../spi/GridSpiLocalHostInjectionTest.java      |    2 +-
 .../GridPriorityQueueCollisionSpiSelfTest.java  |    2 +-
 ...RobinLoadBalancingSpiNotPerTaskSelfTest.java |    2 +-
 .../testframework/junits/GridAbstractTest.java  |   28 +-
 .../junits/GridTestKernalContext.java           |    2 +-
 .../junits/IgniteTestResources.java             |    8 +-
 .../junits/common/GridCommonAbstractTest.java   |   44 +-
 .../junits/spi/GridSpiAbstractTest.java         |   13 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   12 +
 .../IgniteCacheWriteBehindTestSuite.java        |    3 +-
 modules/extdata/p2p/pom.xml                     |    4 +-
 modules/extdata/uri/pom.xml                     |    4 +-
 modules/geospatial/pom.xml                      |    4 +-
 modules/hadoop/pom.xml                          |    8 +-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |    3 +
 modules/hibernate/pom.xml                       |    6 +-
 .../hibernate/CacheHibernateBlobStore.java      |    9 +-
 .../CacheHibernateBlobStoreNodeRestartTest.java |   52 +
 .../testsuites/IgniteHibernateTestSuite.java    |    2 +
 modules/indexing/pom.xml                        |    4 +-
 .../processors/query/h2/IgniteH2Indexing.java   |    4 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   86 +-
 .../query/h2/twostep/GridResultPage.java        |    9 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |    2 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     |  368 ++++++
 .../ttl/CacheTtlOffheapAbstractSelfTest.java    |   29 +
 .../CacheTtlOffheapAtomicAbstractSelfTest.java  |   29 +
 .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java |   34 +
 ...acheTtlOffheapAtomicPartitionedSelfTest.java |   34 +
 ...TtlOffheapTransactionalAbstractSelfTest.java |   29 +
 ...cheTtlOffheapTransactionalLocalSelfTest.java |   34 +
 ...OffheapTransactionalPartitionedSelfTest.java |   34 +
 .../ttl/CacheTtlOnheapAbstractSelfTest.java     |   29 +
 .../CacheTtlOnheapAtomicAbstractSelfTest.java   |   29 +
 .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java  |   34 +
 ...CacheTtlOnheapAtomicPartitionedSelfTest.java |   34 +
 ...eTtlOnheapTransactionalAbstractSelfTest.java |   29 +
 ...acheTtlOnheapTransactionalLocalSelfTest.java |   34 +
 ...lOnheapTransactionalPartitionedSelfTest.java |   34 +
 .../IgniteCacheWithIndexingTestSuite.java       |   51 +
 .../IgniteH2IndexingSpiTestSuite.java           |    7 -
 modules/jcl/pom.xml                             |    4 +-
 modules/jta/pom.xml                             |    4 +-
 modules/log4j/pom.xml                           |    4 +-
 modules/rest-http/pom.xml                       |    2 +-
 modules/scalar/pom.xml                          |   10 +-
 modules/schedule/pom.xml                        |    4 +-
 modules/schema-import/pom.xml                   |    2 +-
 modules/slf4j/pom.xml                           |    2 +-
 modules/spring/pom.xml                          |    8 +-
 modules/ssh/pom.xml                             |    8 +-
 .../ant/beautifier/GridJavadocAntTask.java      |    8 +-
 modules/urideploy/pom.xml                       |    6 +-
 .../GridUriDeploymentFileResourceLoader.java    |    2 +-
 modules/visor-console/pom.xml                   |    8 +-
 .../commands/cache/VisorCacheCommand.scala      |    4 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |    8 +-
 .../commands/events/VisorEventsCommand.scala    |   24 +-
 .../commands/tasks/VisorTasksCommand.scala      |    6 +-
 .../scala/org/apache/ignite/visor/visor.scala   |    2 +-
 modules/visor-plugins/pom.xml                   |    2 +-
 modules/web/pom.xml                             |    8 +-
 modules/yardstick/pom.xml                       |    6 +-
 parent/pom.xml                                  |   10 +-
 pom.xml                                         |   56 +-
 219 files changed, 7409 insertions(+), 5482 deletions(-)
----------------------------------------------------------------------



Mime
View raw message