You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/10/27 14:33:00 UTC

[15/16] ignite git commit: Merge remote-tracking branch 'remotes/apache-main/master' into ignite-801

Merge remote-tracking branch 'remotes/apache-main/master' into ignite-801


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

Branch: refs/heads/ignite-801
Commit: 5ea234c40ff041c78e05cd5deaf63e3a90fce21b
Parents: d8b2774 b5a3069
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Oct 27 14:30:44 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Oct 27 14:30:44 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   5 +-
 assembly/dependencies-fabric-lgpl.xml           | 169 +++++++++++++
 assembly/dependencies-fabric.xml                |   3 +
 assembly/release-fabric-base.xml                | 107 ++++++++
 assembly/release-fabric-lgpl.xml                |  41 ++--
 assembly/release-fabric.xml                     |  85 +------
 assembly/release-hadoop-lgpl.xml                |  39 ---
 config/fabric-lgpl/default-config.xml           |  29 +++
 examples-lgpl/README.txt                        |  27 --
 examples-lgpl/config/example-cache.xml          |  73 ------
 examples-lgpl/config/example-ignite.xml         |  83 -------
 examples-lgpl/config/hibernate/README.txt       |   8 -
 .../hibernate/example-hibernate-L2-cache.xml    |  64 -----
 examples-lgpl/pom-standalone.xml                | 186 --------------
 examples-lgpl/pom.xml                           | 128 ----------
 .../hibernate/HibernateL2CacheExample.java      | 245 -------------------
 .../examples/datagrid/hibernate/Post.java       | 130 ----------
 .../examples/datagrid/hibernate/User.java       | 154 ------------
 .../datagrid/hibernate/package-info.java        |  22 --
 .../hibernate/CacheHibernatePersonStore.java    | 122 ---------
 .../hibernate/CacheHibernateStoreExample.java   | 151 ------------
 .../datagrid/store/hibernate/Person.hbm.xml     |  34 ---
 .../datagrid/store/hibernate/hibernate.cfg.xml  |  41 ----
 .../datagrid/store/hibernate/package-info.java  |  22 --
 .../misc/schedule/ComputeScheduleExample.java   |  82 -------
 .../examples/misc/schedule/package-info.java    |  22 --
 .../misc/schedule/ComputeScheduleExample.java   |  68 -----
 .../java8/misc/schedule/package-info.java       |  22 --
 .../ignite/examples/java8/package-info.java     |  23 --
 .../scalar/examples/ScalarScheduleExample.scala |  66 -----
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  31 ---
 .../HibernateL2CacheExampleSelfTest.java        |  33 ---
 .../IgniteLgplExamplesSelfTestSuite.java        |  48 ----
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  29 ---
 .../HibernateL2CacheExampleSelfTest.java        |  37 ---
 .../IgniteLgplExamplesJ8SelfTestSuite.java      |  46 ----
 .../ScalarLgplExamplesMultiNodeSelfTest.scala   |  33 ---
 .../examples/ScalarLgplExamplesSelfTest.scala   |  36 ---
 .../ScalarLgplExamplesSelfTestSuite.scala       |  37 ---
 examples/README-LGPL.txt                        |  33 +++
 examples/README.txt                             |  21 +-
 examples/config/hibernate/README.txt            |   8 +
 .../hibernate/example-hibernate-L2-cache.xml    |  64 +++++
 examples/pom-standalone-lgpl.xml                | 217 ++++++++++++++++
 examples/pom-standalone.xml                     | 156 ++++++------
 examples/pom.xml                                | 157 ++++++------
 .../hibernate/HibernateL2CacheExample.java      | 245 +++++++++++++++++++
 .../examples/datagrid/hibernate/Post.java       | 130 ++++++++++
 .../examples/datagrid/hibernate/User.java       | 154 ++++++++++++
 .../datagrid/hibernate/package-info.java        |  22 ++
 .../hibernate/CacheHibernatePersonStore.java    | 122 +++++++++
 .../hibernate/CacheHibernateStoreExample.java   | 151 ++++++++++++
 .../datagrid/store/hibernate/Person.hbm.xml     |  34 +++
 .../datagrid/store/hibernate/hibernate.cfg.xml  |  41 ++++
 .../datagrid/store/hibernate/package-info.java  |  22 ++
 .../misc/schedule/ComputeScheduleExample.java   |  82 +++++++
 .../examples/misc/schedule/package-info.java    |  22 ++
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  31 +++
 .../HibernateL2CacheExampleSelfTest.java        |  33 +++
 .../IgniteLgplExamplesSelfTestSuite.java        |  48 ++++
 .../apache/ignite/IgniteSystemProperties.java   |   9 +
 .../configuration/CacheConfiguration.java       |  28 ++-
 .../internal/GridEventConsumeHandler.java       |  19 +-
 .../apache/ignite/internal/IgniteKernal.java    |   2 +
 .../ignite/internal/IgniteNodeAttributes.java   |   3 +
 .../deployment/GridDeploymentLocalStore.java    |   8 +-
 .../GridDeploymentPerLoaderStore.java           |   8 +-
 .../GridDeploymentPerVersionStore.java          |   8 +-
 .../internal/portable/PortableContext.java      |  91 +++++--
 .../portable/api/PortableMarshaller.java        |   5 +
 .../processors/cache/CacheObjectContext.java    |  17 +-
 .../processors/cache/GridCacheContext.java      |  10 +-
 .../cache/GridCacheEvictionManager.java         |   5 +-
 .../cache/GridCacheEvictionRequest.java         |  18 +-
 .../cache/GridCacheEvictionResponse.java        |   7 +-
 .../processors/cache/GridCacheIoManager.java    |  34 ++-
 .../processors/cache/GridCacheMessage.java      |  72 ++++--
 .../cache/GridCacheSharedContext.java           |   3 +
 .../processors/cache/GridCacheUtils.java        |  18 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |   7 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |   9 +-
 .../distributed/GridCacheTxRecoveryRequest.java |   8 +-
 .../GridCacheTxRecoveryResponse.java            |  10 +-
 .../distributed/GridDistributedBaseMessage.java |  16 +-
 .../distributed/GridDistributedLockRequest.java |   8 +-
 .../GridDistributedLockResponse.java            |  20 +-
 .../GridDistributedTxFinishRequest.java         |   6 +-
 .../GridDistributedTxFinishResponse.java        |   7 +-
 .../GridDistributedTxPrepareRequest.java        |  13 +-
 .../GridDistributedTxPrepareResponse.java       |  12 +-
 .../GridDistributedTxRemoteAdapter.java         |   5 +
 .../GridDistributedUnlockRequest.java           |   7 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   7 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   7 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   3 +-
 .../distributed/dht/GridDhtLockFuture.java      |   5 +-
 .../distributed/dht/GridDhtLockRequest.java     |   7 +-
 .../distributed/dht/GridDhtLockResponse.java    |  14 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  22 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   9 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   7 +-
 .../dht/GridDhtTxFinishResponse.java            |   2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   9 +-
 .../dht/GridDhtTxPrepareRequest.java            |  28 ++-
 .../dht/GridDhtTxPrepareResponse.java           |  13 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |   7 +-
 .../dht/GridPartitionedGetFuture.java           |   3 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  12 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |  12 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   6 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  25 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  11 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  12 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  33 ++-
 .../atomic/GridNearAtomicUpdateResponse.java    |  11 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   8 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   3 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   5 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |  35 ++-
 .../dht/preloader/GridDhtForceKeysResponse.java |  11 +-
 .../GridDhtPartitionDemandMessage.java          |   5 +
 .../GridDhtPartitionSupplyMessage.java          |   9 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |  10 +-
 .../GridDhtPartitionsAbstractMessage.java       |   7 +-
 .../dht/preloader/GridDhtPreloader.java         |   3 +-
 .../distributed/near/GridNearGetFuture.java     |   5 +-
 .../distributed/near/GridNearGetRequest.java    |  12 +-
 .../distributed/near/GridNearGetResponse.java   |  12 +-
 .../distributed/near/GridNearLockFuture.java    |   3 +-
 .../distributed/near/GridNearLockRequest.java   |   8 +-
 .../distributed/near/GridNearLockResponse.java  |   8 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   3 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   3 +-
 .../near/GridNearTransactionalCache.java        |   8 +-
 .../near/GridNearTxFinishFuture.java            |   8 +-
 .../near/GridNearTxFinishRequest.java           |   7 +-
 .../near/GridNearTxFinishResponse.java          |   2 +-
 .../near/GridNearTxPrepareRequest.java          |   8 +-
 .../near/GridNearTxPrepareResponse.java         |   8 +-
 .../distributed/near/GridNearUnlockRequest.java |   7 +-
 .../portable/CacheObjectPortableContext.java    |   6 +-
 .../CacheObjectPortableProcessorImpl.java       |   5 +-
 .../query/GridCacheDistributedQueryFuture.java  |   5 +-
 .../query/GridCacheDistributedQueryManager.java |  25 +-
 .../cache/query/GridCacheQueryRequest.java      |  46 ++--
 .../cache/query/GridCacheQueryResponse.java     |  29 ++-
 .../continuous/CacheContinuousQueryHandler.java |   8 +-
 .../continuous/CacheContinuousQueryManager.java |   6 +-
 .../cache/transactions/IgniteInternalTx.java    |   8 +-
 .../cache/transactions/IgniteTxAdapter.java     |   5 +
 .../cache/transactions/IgniteTxEntry.java       |   8 +-
 .../cache/transactions/IgniteTxHandler.java     |  16 +-
 .../transactions/IgniteTxLocalAdapter.java      |  11 +
 .../IgniteCacheObjectProcessorImpl.java         |   7 +-
 .../ignite/internal/util/lang/GridFunc.java     |   8 +-
 .../ignite/marshaller/AbstractMarshaller.java   |  12 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |   7 +-
 .../optimized/OptimizedMarshaller.java          |  14 +-
 .../optimized/OptimizedMarshallerUtils.java     |  35 ++-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  52 ++++
 modules/core/src/test/config/tests.properties   |   4 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |  44 +++-
 ...eAtomicEntryProcessorDeploymentSelfTest.java | 211 ++++++++++++++++
 .../GridCacheConditionalDeploymentSelfTest.java | 190 ++++++++++++++
 .../GridCacheDeploymentOffHeapSelfTest.java     |  17 +-
 .../cache/GridCacheDeploymentSelfTest.java      |  26 +-
 ...ctionalEntryProcessorDeploymentSelfTest.java |  31 +++
 .../IgniteCacheEntryListenerAbstractTest.java   |  50 +++-
 .../communication/GridCacheMessageSelfTest.java |  17 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |   4 +-
 .../ignite/testframework/GridTestUtils.java     |  19 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   4 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |  18 +-
 .../testsuites/IgniteCacheTestSuite3.java       |   8 +-
 .../testsuites/IgniteP2PSelfTestSuite.java      |  16 +-
 .../p2p/CacheDeploymentEntryProcessor.java      |  35 +++
 .../CacheDeploymentPortableEntryProcessor.java  |  35 +++
 modules/extdata/uri/pom.xml                     |  21 +-
 modules/spark-2.10/pom.xml                      |   4 +-
 modules/spark/pom.xml                           |   4 +-
 .../yardstick/IgniteBenchmarkArguments.java     |  11 +
 .../cache/IgniteCacheAbstractBenchmark.java     |  63 +++++
 .../cache/IgnitePutAllTxBenchmark.java          |   6 +-
 .../ipfinder/zk/ZookeeperIpFinderTestSuite.java |  32 +++
 parent/pom.xml                                  |   1 +
 pom.xml                                         |  64 -----
 186 files changed, 3684 insertions(+), 2894 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ea234c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------