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/11 06:40:08 UTC

[35/50] incubator-ignite git commit: Merge branch ignite-sprint-3 into ignite-80

Merge branch ignite-sprint-3 into ignite-80


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

Branch: refs/heads/ignite-80
Commit: f831568e9d3c881730fd57ba83f8a0cb9e1d4851
Parents: efbdc83 26fa0bf
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Apr 10 10:56:38 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Apr 10 10:56:38 2015 -0700

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   4 +-
 assembly/release-hadoop.xml                     |   4 -
 bin/ignitevisorcmd.bat                          |  39 +--
 examples/pom.xml                                |   2 +-
 .../examples/MessagingExamplesSelfTest.java     |   2 +-
 .../java8/examples/BasicExamplesSelfTest.java   |   3 +
 .../java8/examples/CacheExamplesSelfTest.java   |   4 +
 .../examples/CheckpointExamplesSelfTest.java    |   3 +
 .../examples/ClusterGroupExampleSelfTest.java   |   3 +-
 .../examples/ContinuationExamplesSelfTest.java  |   3 +
 .../ContinuousMapperExamplesSelfTest.java       |   4 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |   2 +
 .../examples/DeploymentExamplesSelfTest.java    |   2 +
 .../HibernateL2CacheExampleSelfTest.java        |   3 +
 .../java8/examples/IgfsExamplesSelfTest.java    |   3 +
 .../examples/LifecycleExamplesSelfTest.java     |   3 +
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |   2 +
 .../examples/MemcacheRestExamplesSelfTest.java  |   2 +
 .../examples/MessagingExamplesSelfTest.java     |   4 +-
 .../examples/MonteCarloExamplesSelfTest.java    |   3 +
 .../examples/SpringBeanExamplesSelfTest.java    |   3 +
 .../java8/examples/TaskExamplesSelfTest.java    |   2 +
 modules/aop/pom.xml                             |   2 +-
 modules/aws/pom.xml                             |   2 +-
 modules/clients/pom.xml                         |   2 +-
 .../client/ClientReconnectionSelfTest.java      |  67 ++---
 modules/codegen/pom.xml                         |   2 +-
 .../ignite/codegen/MessageCodeGenerator.java    |   1 -
 modules/core/pom.xml                            |   4 +-
 .../java/org/apache/ignite/IgniteCache.java     |  18 ++
 .../java/org/apache/ignite/IgniteState.java     |   2 +-
 .../configuration/CacheConfiguration.java       |  76 +++--
 .../configuration/IgniteConfiguration.java      |  35 +--
 .../internal/ComputeTaskInternalFuture.java     |   2 +-
 .../ignite/internal/GridJobExecuteRequest.java  |  10 +-
 .../ignite/internal/GridJobExecuteResponse.java |   4 +-
 .../apache/ignite/internal/GridTaskMessage.java |  30 --
 .../ignite/internal/GridTaskSessionRequest.java |   6 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../client/GridClientConfiguration.java         |  14 +-
 .../GridClientConnectionManagerAdapter.java     |   2 +-
 .../router/GridTcpRouterConfiguration.java      |   6 +-
 .../internal/cluster/ClusterGroupAdapter.java   | 150 ++++++++--
 .../internal/managers/GridManagerAdapter.java   |   4 +-
 .../discovery/GridDiscoveryManager.java         |  32 ++-
 .../eventstorage/GridEventStorageManager.java   |   4 +-
 .../processors/cache/CacheMetricsImpl.java      |   7 +-
 .../processors/cache/CacheMetricsSnapshot.java  | 223 ++++++++++++++-
 .../processors/cache/GridCacheAdapter.java      |  12 +-
 .../processors/cache/GridCacheContext.java      |  64 ++++-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../cache/GridCacheExplicitLockSpan.java        |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   6 +-
 .../processors/cache/GridCacheMvcc.java         |   2 +-
 .../cache/GridCacheMvccCandidate.java           |  50 +++-
 .../processors/cache/GridCacheMvccManager.java  |  44 ++-
 .../processors/cache/GridCacheProcessor.java    |  52 ++--
 .../processors/cache/IgniteCacheProxy.java      |  26 ++
 .../distributed/GridDistributedCacheEntry.java  |  12 +-
 .../distributed/dht/GridDhtCacheEntry.java      |  36 ++-
 .../distributed/dht/GridDhtLockFuture.java      |  18 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  14 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |  22 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   2 +
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  30 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  28 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   6 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  34 ++-
 .../colocated/GridDhtColocatedLockFuture.java   |  46 ++-
 .../GridDhtPartitionsExchangeFuture.java        |  39 ++-
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |  10 +-
 .../distributed/near/GridNearLockFuture.java    |  13 +-
 .../near/GridNearTransactionalCache.java        |   2 +-
 .../near/GridNearTxFinishFuture.java            |   8 +-
 .../cache/distributed/near/GridNearTxLocal.java |   7 +
 .../near/GridNearTxPrepareFuture.java           | 122 ++++----
 .../near/GridNearTxPrepareRequest.java          |  64 +++--
 .../local/atomic/GridLocalAtomicCache.java      |   6 +-
 .../cache/query/GridCacheQueryAdapter.java      |   2 +-
 .../continuous/CacheContinuousQueryManager.java |   2 +-
 .../cache/transactions/IgniteTxAdapter.java     |   3 +-
 .../cache/transactions/IgniteTxHandler.java     | 120 ++++++--
 .../transactions/IgniteTxLocalAdapter.java      |  82 ++++--
 .../cache/transactions/IgniteTxManager.java     |   7 +
 .../internal/processors/igfs/IgfsAsyncImpl.java |   4 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |   4 +-
 .../processors/igfs/IgfsFileWorker.java         | 180 ------------
 .../processors/igfs/IgfsFileWorkerBatch.java    | 225 ++++++---------
 .../processors/igfs/IgfsFileWorkerTask.java     |  32 ---
 .../internal/processors/igfs/IgfsImpl.java      | 150 ++++++----
 .../internal/processors/igfs/IgfsProcessor.java |   2 +-
 .../query/GridQueryFieldMetadata.java           |   2 +-
 .../processors/query/GridQueryProcessor.java    |  89 +++---
 .../processors/rest/GridRestProcessor.java      |  33 +--
 .../security/GridSecurityProcessor.java         |  13 +-
 .../processors/security/SecurityContext.java    |   8 +-
 .../security/os/GridOsSecurityProcessor.java    |  11 +-
 .../processors/task/GridTaskProcessor.java      |   9 +-
 .../internal/util/future/GridFutureAdapter.java |  20 +-
 .../ignite/internal/util/worker/GridWorker.java |   6 +-
 .../visor/cache/VisorCacheClearTask.java        |   3 +
 .../visor/cache/VisorCacheConfiguration.java    |   2 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   2 +-
 .../cache/VisorCacheQueryConfiguration.java     |   9 -
 .../internal/visor/log/VisorLogSearchTask.java  |  12 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |   1 +
 .../node/VisorNodeEventsCollectorTask.java      |   3 +
 .../node/VisorSegmentationConfiguration.java    |   4 +-
 .../internal/visor/query/VisorQueryArg.java     |  82 ++++++
 .../visor/query/VisorQueryCleanupTask.java      |  10 +-
 .../internal/visor/query/VisorQueryCursor.java  |  96 +++++++
 .../internal/visor/query/VisorQueryField.java   |  66 ++++-
 .../internal/visor/query/VisorQueryJob.java     | 174 ++++++++++++
 .../visor/query/VisorQueryNextPageTask.java     |  75 +++--
 .../internal/visor/query/VisorQueryResult.java  |   6 +-
 .../visor/query/VisorQueryResultEx.java         |  16 +-
 .../internal/visor/query/VisorQueryTask.java    | 281 ++-----------------
 .../internal/visor/query/VisorQueryUtils.java   |  55 ++--
 .../internal/visor/util/VisorTaskUtils.java     |   3 +
 .../plugin/security/AuthenticationContext.java  |  12 +-
 .../security/GridSecurityCredentials.java       | 184 ------------
 .../GridSecurityCredentialsBasicProvider.java   |  44 ---
 .../GridSecurityCredentialsProvider.java        |  44 ---
 .../plugin/security/GridSecurityException.java  |  58 ----
 .../plugin/security/GridSecurityPermission.java |  69 -----
 .../security/GridSecurityPermissionSet.java     |  66 -----
 .../plugin/security/GridSecuritySubject.java    |  62 ----
 .../security/GridSecuritySubjectType.java       |  48 ----
 .../plugin/security/SecurityCredentials.java    | 191 +++++++++++++
 .../SecurityCredentialsBasicProvider.java       |  44 +++
 .../security/SecurityCredentialsProvider.java   |  44 +++
 .../plugin/security/SecurityException.java      |  61 ++++
 .../plugin/security/SecurityPermission.java     |  69 +++++
 .../plugin/security/SecurityPermissionSet.java  |  66 +++++
 .../ignite/plugin/security/SecuritySubject.java |  62 ++++
 .../plugin/security/SecuritySubjectType.java    |  48 ++++
 .../segmentation/GridSegmentationPolicy.java    |  47 ----
 .../segmentation/GridSegmentationResolver.java  |  64 -----
 .../plugin/segmentation/SegmentationPolicy.java |  49 ++++
 .../segmentation/SegmentationResolver.java      |  65 +++++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   4 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   4 +-
 .../spi/discovery/DiscoveryMetricsProvider.java |  10 +
 .../DiscoverySpiNodeAuthenticator.java          |   2 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  35 ++-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  57 +++-
 .../tcp/internal/TcpDiscoveryNode.java          |  76 ++++-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  65 +++++
 .../ignite/startup/BasicWarmupClosure.java      |   9 +-
 .../startup/cmdline/CommandLineStartup.java     |   7 +-
 .../resources/META-INF/classnames.properties    |  36 ++-
 .../GridCacheAffinityBackupsSelfTest.java       |  15 +-
 .../cache/IgniteWarmupClosureSelfTest.java      |  82 ++++++
 .../IgniteFairAffinityDynamicCacheSelfTest.java |  96 +++++++
 .../internal/GridLifecycleAwareSelfTest.java    |   2 +-
 .../ignite/internal/GridProjectionSelfTest.java |  82 ++++++
 .../ignite/internal/GridStartStopSelfTest.java  |   8 +-
 .../CacheMetricsForClusterGroupSelfTest.java    | 236 ++++++++++++++++
 .../cache/GridCacheBasicApiAbstractTest.java    |   4 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |  42 +--
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   4 +-
 .../cache/GridCacheReloadSelfTest.java          |   3 +-
 .../GridCacheReturnValueTransferSelfTest.java   |  15 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |   5 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |   5 +-
 .../GridCacheSetAbstractSelfTest.java           |  10 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../distributed/GridCacheEventAbstractTest.java |  16 +-
 .../GridCacheNodeFailureAbstractTest.java       |  15 +-
 .../dht/IgniteCacheLockFailoverSelfTest.java    | 156 ++++++++++
 .../dht/IgniteCacheMultiTxLockSelfTest.java     | 219 +++++++++++++++
 ...licatedNearOnlyMultiNodeFullApiSelfTest.java |   2 +-
 .../continuous/GridEventConsumeSelfTest.java    |   7 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  24 +-
 .../tostring/GridToStringBuilderSelfTest.java   |   5 +-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |   2 +-
 .../tcp/TcpClientDiscoverySelfTest.java         |   5 +-
 .../testframework/GridSpiTestContext.java       |   4 +-
 .../testframework/junits/GridAbstractTest.java  |   6 +-
 .../junits/common/GridCommonAbstractTest.java   |  13 +-
 .../junits/spi/GridSpiAbstractTest.java         |  72 +----
 .../IgniteCacheMetricsSelfTestSuite.java        |   4 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   8 +
 .../IgniteSpiDiscoverySelfTestSuite.java        |   2 +
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |   4 +-
 modules/extdata/p2p/pom.xml                     |   2 +-
 modules/extdata/uri/pom.xml                     |   2 +-
 modules/geospatial/pom.xml                      |   2 +-
 modules/hadoop/pom.xml                          |   2 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   2 +-
 modules/hibernate/pom.xml                       |   2 +-
 modules/indexing/pom.xml                        |   2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  17 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |  10 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   5 +-
 ...CacheOffheapTieredMultithreadedSelfTest.java |   4 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |   2 +-
 .../cache/IgniteCacheQueryIndexSelfTest.java    |   3 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |   5 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |  18 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java    |  20 ++
 .../IgniteCacheQuerySelfTestSuite.java          |   1 +
 modules/jcl/pom.xml                             |   2 +-
 modules/jta/pom.xml                             |   2 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |   6 +-
 modules/log4j/pom.xml                           |   2 +-
 modules/rest-http/pom.xml                       |   2 +-
 .../http/jetty/GridJettyRestHandler.java        |   2 +-
 modules/scalar/pom.xml                          |   2 +-
 modules/schedule/pom.xml                        |   2 +-
 modules/schema-import/pom.xml                   |   2 +-
 modules/slf4j/pom.xml                           |   2 +-
 modules/spring/pom.xml                          |   2 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |   8 +-
 modules/ssh/pom.xml                             |   2 +-
 modules/tools/pom.xml                           |   2 +-
 .../ignite/tools/classgen/ClassesGenerator.java |   2 +-
 modules/urideploy/pom.xml                       |   2 +-
 modules/visor-console/pom.xml                   |   2 +-
 .../ignite/visor/commands/VisorConsole.scala    |  19 ++
 .../commands/cache/VisorCacheScanCommand.scala  |  13 +-
 modules/visor-plugins/pom.xml                   |   2 +-
 modules/web/pom.xml                             |   2 +-
 modules/yardstick/pom.xml                       |   2 +-
 pom.xml                                         |  48 ++--
 226 files changed, 4293 insertions(+), 2315 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f831568e/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/f831568e/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 7368cc6,02f82ce..b37cbfa
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@@ -429,8 -433,9 +434,11 @@@ public class IgniteCacheTestSuite exten
          suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
          suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
  
 +        suite.addTestSuite(IgniteCacheAtomicOpWithinTxSelfTest.class);
 +
+         suite.addTestSuite(IgniteCacheLockFailoverSelfTest.class);
+         suite.addTestSuite(IgniteCacheMultiTxLockSelfTest.class);
+ 
          suite.addTestSuite(IgniteInternalCacheTypesTest.class);
  
          return suite;