ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [03/50] incubator-ignite git commit: Merge branches 'ignite-368' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-368
Date Wed, 18 Mar 2015 02:52:12 GMT
Merge branches 'ignite-368' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-368

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.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/7ed41cf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ed41cf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ed41cf9

Branch: refs/heads/ignite-45
Commit: 7ed41cf992d9d59288419edfff181a75dcf3cf87
Parents: 95c58d8 50171ea
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Mar 16 20:27:13 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Mar 16 20:27:13 2015 +0700

----------------------------------------------------------------------
 .../apache/ignite/gridify/AbstractAopTest.java  |   6 +-
 .../rest/AbstractRestProcessorSelfTest.java     |   2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   2 +-
 .../java/org/apache/ignite/IgniteCache.java     |  38 +--
 .../ignite/cache/CacheEntryProcessor.java       |  28 ++
 .../org/apache/ignite/cache/CacheImmutable.java |  45 ++++
 .../java/org/apache/ignite/cache/GridCache.java | 221 ---------------
 .../ignite/cache/IgniteEntryProcessor.java      |  28 --
 .../apache/ignite/cache/IgniteImmutable.java    |  45 ----
 .../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       |   6 +-
 .../org/apache/ignite/internal/IgniteEx.java    |   3 +-
 .../apache/ignite/internal/IgniteKernal.java    |   1 -
 .../ignite/internal/MarshallerContextImpl.java  |  30 ++-
 .../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/CacheContinuousQueryManager.java |  11 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   2 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   3 +-
 .../IgniteCacheObjectProcessorImpl.java         |   2 +-
 .../datastreamer/DataStreamerCacheUpdaters.java |  12 +-
 .../datastructures/DataStructuresProcessor.java |   1 -
 .../datastructures/GridCacheSetImpl.java        |   1 -
 .../processors/task/GridTaskProcessor.java      |   2 +-
 .../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 +
 .../org/apache/ignite/lang/IgnitePredicate.java |   4 +-
 .../optimized/OptimizedMarshallerUtils.java     |  16 +-
 .../TcpDiscoveryMulticastIpFinder.java          |   4 +-
 .../ignite/startup/BasicWarmupClosure.java      |   1 +
 .../StreamerCacheAffinityEventRouter.java       |   2 +-
 .../TransactionSynchronization.java             |   2 +-
 .../GridCacheAffinityBackupsSelfTest.java       |   2 +
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |   1 +
 .../cache/GridCacheAbstractFullApiSelfTest.java |   8 +-
 .../cache/GridCacheClearLocalySelfTest.java     |  19 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |   1 -
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |   4 +-
 .../GridCacheReturnValueTransferSelfTest.java   |   2 +-
 ...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 +
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   1 -
 .../processors/igfs/IgfsAbstractSelfTest.java   |   1 +
 .../igfs/IgfsDualAbstractSelfTest.java          |   1 +
 .../processors/igfs/IgfsProcessorSelfTest.java  |   1 +
 .../processors/igfs/IgfsStreamsSelfTest.java    |   1 +
 .../OptimizedMarshallerNodeFailoverTest.java    | 200 ++++++++++++++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../IgniteMarshallerSelfTestSuite.java          |   1 +
 .../query/h2/GridH2IndexingGeoSelfTest.java     |   1 -
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |   1 +
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   1 -
 .../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/generator/SnippetGenerator.java      |  10 +-
 .../ignite/cache/spring/SpringCacheManager.java |   2 +-
 102 files changed, 1181 insertions(+), 467 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ed41cf9/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ed41cf9/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------


Mime
View raw message