You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/04/10 08:46:47 UTC
[07/12] incubator-ignite git commit: Merge branch ignite-sprint-3
into ignite-674
Merge branch ignite-sprint-3 into ignite-674
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27e43cfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27e43cfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27e43cfa
Branch: refs/heads/ignite-sprint-3
Commit: 27e43cfa244b90a40fcea277c77898f5ca4fc95d
Parents: 650bfc7 e6a6b64
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Apr 6 10:54:11 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Apr 6 10:54:11 2015 -0700
----------------------------------------------------------------------
assembly/release-fabric.xml | 5 -
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
modules/clients/readme.md | 2 -
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 -
.../apache/ignite/internal/IgniteKernal.java | 27 +---
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/CacheDistributionMode.java | 67 --------
.../internal/processors/cache/CacheType.java | 77 +++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 139 ++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 ++-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../DiscoveryNodeValidationProcessor.java | 27 ++++
.../OsDiscoveryNodeValidationProcessor.java | 72 +++++++++
.../processors/query/GridQueryProcessor.java | 8 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/internal/util/IgniteUtils.java | 46 +++++-
.../internal/visor/util/VisorTaskUtils.java | 18 ++-
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 --------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +------------
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++---
.../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++
.../IgniteCollectionAbstractTest.java | 23 ---
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 --------------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 ++++++
.../testframework/GridSpiTestContext.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
.../query/h2/sql/GridSqlQuerySplitter.java | 22 ++-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
modules/schedule/pom.xml | 20 +++
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 ++-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
parent/pom.xml | 49 +++---
pom.xml | 143 ++++++++++++++++-
70 files changed, 1177 insertions(+), 625 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27e43cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27e43cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 78bf4a8,017b363..5e43f0f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@@ -794,8 -794,7 +794,8 @@@ public abstract class GridDhtTransactio
req.threadId(),
req.implicitTx(),
req.implicitSingleTx(),
- ctx.system(),
+ ctx.systemTx(),
+ false,
ctx.ioPolicy(),
PESSIMISTIC,
req.isolation(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27e43cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27e43cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27e43cfa/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index ece9cea,00dfc76..c5281cb
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@@ -427,9 -427,8 +427,11 @@@ public class IgniteCacheTestSuite exten
suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheLockFailoverSelfTest.class);
+ suite.addTestSuite(IgniteCacheMultiTxLockSelfTest.class);
+
+ suite.addTestSuite(IgniteInternalCacheTypesTest.class);
+
return suite;
}
}