Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07866c48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07866c48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07866c48 Branch: refs/heads/ignite-45 Commit: 07866c4810ecbdbd339208514e1ccf0ddec0bea5 Parents: b10ae79 3fe4a98 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Mar 17 21:34:42 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Mar 17 21:34:42 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/gridify/AbstractAopTest.java | 6 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- modules/core/pom.xml | 105 ++++++++ .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 38 +-- .../ignite/cache/CacheEntryProcessor.java | 28 ++ .../java/org/apache/ignite/cache/GridCache.java | 221 --------------- .../ignite/cache/IgniteEntryProcessor.java | 28 -- .../apache/ignite/cache/IgniteImmutable.java | 45 ---- .../cache/affinity/CacheAffinityKeyMapped.java | 12 +- .../ignite/cache/query/SqlFieldsQuery.java | 7 + .../org/apache/ignite/cache/query/SqlQuery.java | 7 + .../apache/ignite/cache/query/TextQuery.java | 7 + .../cache/store/CacheLoadOnlyStoreAdapter.java | 6 +- .../configuration/CacheConfiguration.java | 3 +- .../ignite/internal/GridKernalContextImpl.java | 7 +- .../org/apache/ignite/internal/IgniteEx.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../ignite/internal/MarshallerContextImpl.java | 30 ++- .../internal/managers/GridManagerAdapter.java | 6 - .../processors/cache/CacheObjectImpl.java | 6 + .../internal/processors/cache/GridCache.java | 222 +++++++++++++++ .../processors/cache/GridCacheAdapter.java | 6 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 30 ++- .../cache/GridCacheWriteBehindStore.java | 69 +++-- .../processors/cache/IgniteCacheProxy.java | 4 +- .../cache/query/GridCacheQueryManager.java | 1 - .../processors/cache/query/QueryCursorEx.java | 46 ++++ .../processors/cache/query/QueryCursorImpl.java | 14 +- .../continuous/CacheContinuousQueryHandler.java | 3 + .../continuous/CacheContinuousQueryManager.java | 11 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../cacheobject/IgniteCacheObjectProcessor.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 85 +++--- .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../datastructures/DataStructuresProcessor.java | 1 - .../datastructures/GridCacheSetImpl.java | 1 - .../processors/task/GridTaskProcessor.java | 2 +- .../apache/ignite/internal/util/GridTimer.java | 2 +- .../internal/util/IgniteExceptionRegistry.java | 164 +++++------ .../internal/util/io/GridFilenameUtils.java | 1 - .../apache/ignite/internal/visor/VisorJob.java | 3 + .../internal/visor/VisorMultiNodeTask.java | 1 + .../visor/cache/VisorCacheMetadataTask.java | 1 + .../internal/visor/cache/VisorCacheMetrics.java | 1 + .../cache/VisorCacheMetricsCollectorTask.java | 1 + .../visor/cache/VisorCachePreloadTask.java | 1 + .../visor/cache/VisorCacheResetMetricsTask.java | 1 + .../visor/cache/VisorCacheSwapBackupsTask.java | 1 + .../compute/VisorComputeMonitoringHolder.java | 10 +- .../visor/node/VisorNodeDataCollectorJob.java | 7 +- .../node/VisorNodeDataCollectorJobResult.java | 17 ++ .../visor/node/VisorNodeDataCollectorTask.java | 2 + .../node/VisorNodeDataCollectorTaskResult.java | 10 + .../node/VisorNodeSuppressedErrorsTask.java | 99 +++++++ .../internal/visor/query/VisorQueryTask.java | 4 +- .../org/apache/ignite/lang/IgniteImmutable.java | 49 ++++ .../org/apache/ignite/lang/IgnitePredicate.java | 4 +- .../optimized/OptimizedMarshallerUtils.java | 16 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 8 - .../TcpDiscoveryMulticastIpFinder.java | 4 +- .../ignite/startup/BasicWarmupClosure.java | 1 + .../StreamerCacheAffinityEventRouter.java | 2 +- .../TransactionSynchronization.java | 2 +- .../resources/META-INF/classnames.properties | 44 +-- modules/core/src/test/java/ExcludeList | 4 + .../GridCacheAffinityBackupsSelfTest.java | 2 + .../ignite/igfs/IgfsFragmentizerSelfTest.java | 1 + .../cache/GridCacheAbstractFullApiSelfTest.java | 8 +- .../cache/GridCacheClearLocalySelfTest.java | 19 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 1 - .../GridCacheReturnValueTransferSelfTest.java | 1 + ...idCacheWriteBehindStoreAbstractSelfTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 9 +- .../GridCacheAtomicTimeoutSelfTest.java | 5 + .../GridCacheNodeFailureAbstractTest.java | 1 + ...GridCachePreloadRestartAbstractSelfTest.java | 1 + .../IgniteTxTimeoutAbstractTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java | 1 + .../near/GridCacheNearEvictionSelfTest.java | 1 + .../near/GridCacheNearMultiNodeSelfTest.java | 1 + ...GridCachePartitionedFilteredPutSelfTest.java | 1 + ...achePartitionedPreloadLifecycleSelfTest.java | 1 + ...hePartitionedQueryMultiThreadedSelfTest.java | 1 + .../GridCacheReplicatedInvalidateSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 1 + ...eCacheAtomicStoreSessionWriteBehindTest.java | 38 +++ ...acheStoreSessionWriteBehindAbstractTest.java | 269 +++++++++++++++++++ ...gniteCacheTxStoreSessionWriteBehindTest.java | 32 +++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 1 + ...ridCacheContinuousQueryAbstractSelfTest.java | 75 +++++- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 1 - .../processors/igfs/IgfsAbstractSelfTest.java | 1 + .../igfs/IgfsDualAbstractSelfTest.java | 1 + .../processors/igfs/IgfsProcessorSelfTest.java | 1 + .../processors/igfs/IgfsStreamsSelfTest.java | 1 + .../util/IgniteExceptionRegistrySelfTest.java | 51 ++-- .../OptimizedMarshallerNodeFailoverTest.java | 200 ++++++++++++++ .../testframework/GridSpiTestContext.java | 5 - .../junits/GridTestKernalContext.java | 2 - .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../IgniteMarshallerSelfTestSuite.java | 1 + .../query/h2/GridH2IndexingGeoSelfTest.java | 1 - .../igfs/HadoopIgfsDualAbstractSelfTest.java | 1 + .../HadoopDefaultMapReducePlannerSelfTest.java | 6 +- .../HibernateAccessStrategyAdapter.java | 1 - .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 2 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 34 +-- .../ignite/cache/hibernate/HibernateRegion.java | 2 +- .../cache/hibernate/HibernateRegionFactory.java | 6 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 4 +- .../HibernateTransactionalDataRegion.java | 2 +- .../HibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 1 + .../schema-import/src/main/java/media/style.css | 2 +- .../schema/generator/SnippetGenerator.java | 10 +- .../ignite/cache/spring/SpringCacheManager.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 8 +- 129 files changed, 1716 insertions(+), 690 deletions(-) ----------------------------------------------------------------------
