ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [49/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-530-pull-fixes
Date Thu, 19 Nov 2015 12:18:18 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-530-pull-fixes


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

Branch: refs/heads/ignite-530-pull-fixes
Commit: ae7bc421978a604ab44ec0613cd629f9cbd25c2f
Parents: a0e7073 2b7246b
Author: Anton Vinogradov <av@apache.org>
Authored: Thu Nov 19 14:44:58 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Thu Nov 19 14:44:58 2015 +0300

----------------------------------------------------------------------
 .../java8/messaging/MessagingExample.java       |    7 +-
 .../rest/AbstractRestProcessorSelfTest.java     |    5 +-
 .../JettyRestProcessorAbstractSelfTest.java     |  142 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   12 +-
 .../java/org/apache/ignite/IgniteCache.java     |    1 +
 .../eviction/random/RandomEvictionPolicy.java   |    4 +
 .../cache/store/CacheStoreSessionListener.java  |    9 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |   34 +-
 .../jdbc/CacheJdbcStoreSessionListener.java     |    8 +-
 .../configuration/CacheConfiguration.java       |   91 +-
 .../configuration/ConnectorConfiguration.java   |   61 +-
 .../configuration/IgniteConfiguration.java      |   32 +-
 .../apache/ignite/internal/IgniteKernal.java    |   63 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |    3 +
 .../managers/communication/GridIoMessage.java   |    4 +-
 .../communication/GridIoMessageFactory.java     |   10 +-
 .../discovery/GridDiscoveryManager.java         |    5 +-
 .../affinity/GridAffinityAssignmentCache.java   |   13 +
 .../cache/CacheStoreBalancingWrapper.java       |    5 +-
 .../processors/cache/GridCacheAdapter.java      |   70 +-
 .../cache/GridCacheAffinityManager.java         |   10 +
 .../processors/cache/GridCacheContext.java      |   29 +-
 .../processors/cache/GridCacheEntryEx.java      |    4 +-
 .../processors/cache/GridCacheIoManager.java    |   19 +-
 .../processors/cache/GridCacheMapEntry.java     |  102 +-
 .../processors/cache/GridCacheMvccManager.java  |  145 +-
 .../GridCachePartitionExchangeManager.java      |  208 ++-
 .../processors/cache/GridCachePreloader.java    |   60 +-
 .../cache/GridCachePreloaderAdapter.java        |   45 +-
 .../processors/cache/GridCacheProcessor.java    |   74 +-
 .../cache/GridCacheSharedContext.java           |   31 +-
 .../processors/cache/IgniteCacheProxy.java      |    6 +
 .../distributed/GridDistributedCacheEntry.java  |    2 +-
 .../distributed/GridDistributedTxMapping.java   |   84 +-
 .../GridDistributedTxRemoteAdapter.java         |  141 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   11 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   63 +-
 .../distributed/dht/GridDhtLockFuture.java      |    7 +-
 .../dht/GridDhtPartitionsReservation.java       |    2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   14 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   24 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  123 +-
 .../cache/distributed/dht/GridDhtTxMapping.java |  134 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  127 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   66 +-
 .../dht/atomic/GridDhtAtomicCache.java          |    1 -
 .../dht/colocated/GridDhtColocatedCache.java    |    7 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   14 +
 .../GridDhtPartitionDemandMessage.java          |   14 +-
 .../preloader/GridDhtPartitionDemandPool.java   | 1192 ---------------
 .../dht/preloader/GridDhtPartitionDemander.java | 1408 +++++++++++++++++
 .../dht/preloader/GridDhtPartitionSupplier.java | 1037 +++++++++++++
 .../GridDhtPartitionSupplyMessageV2.java        |  380 +++++
 .../preloader/GridDhtPartitionSupplyPool.java   |  555 -------
 .../GridDhtPartitionsExchangeFuture.java        |    8 +
 .../dht/preloader/GridDhtPreloader.java         |  299 +++-
 ...arOptimisticSerializableTxPrepareFuture.java |   16 -
 .../near/GridNearOptimisticTxPrepareFuture.java |  112 +-
 ...ridNearOptimisticTxPrepareFutureAdapter.java |   72 +-
 .../GridNearPessimisticTxPrepareFuture.java     |    1 -
 .../near/GridNearTransactionalCache.java        |    8 +-
 .../near/GridNearTxFinishFuture.java            |  216 +--
 .../cache/distributed/near/GridNearTxLocal.java |  126 +-
 .../near/GridNearTxPrepareRequest.java          |    9 -
 .../distributed/near/GridNearTxRemote.java      |   26 +-
 .../distributed/near/IgniteTxMappings.java      |   75 +
 .../distributed/near/IgniteTxMappingsImpl.java  |   92 ++
 .../near/IgniteTxMappingsSingleImpl.java        |  101 ++
 .../store/GridCacheStoreManagerAdapter.java     |   29 +-
 .../cache/transactions/IgniteInternalTx.java    |   15 +-
 .../cache/transactions/IgniteTxAdapter.java     |  318 ++--
 .../cache/transactions/IgniteTxHandler.java     |   53 +-
 .../IgniteTxImplicitSingleStateImpl.java        |  259 ++++
 .../transactions/IgniteTxLocalAdapter.java      | 1420 ++++++++++--------
 .../cache/transactions/IgniteTxLocalEx.java     |   30 +-
 .../cache/transactions/IgniteTxLocalState.java  |   44 +
 .../transactions/IgniteTxLocalStateAdapter.java |   41 +
 .../cache/transactions/IgniteTxManager.java     |  189 ++-
 .../cache/transactions/IgniteTxMap.java         |    3 +-
 .../cache/transactions/IgniteTxRemoteEx.java    |   17 +-
 .../IgniteTxRemoteSingleStateImpl.java          |  108 ++
 .../cache/transactions/IgniteTxRemoteState.java |   34 +
 .../IgniteTxRemoteStateAdapter.java             |  110 ++
 .../transactions/IgniteTxRemoteStateImpl.java   |  124 ++
 .../cache/transactions/IgniteTxState.java       |  171 +++
 .../cache/transactions/IgniteTxStateImpl.java   |  375 +++++
 .../datastructures/DataStructuresProcessor.java |    3 +
 .../GridCacheAtomicReferenceImpl.java           |    2 +-
 .../processors/igfs/IgfsMetaManager.java        |    2 +-
 .../processors/job/GridJobProcessor.java        |   96 +-
 .../handlers/cache/GridCacheCommandHandler.java |  128 +-
 .../handlers/query/QueryCommandHandler.java     |  254 +++-
 .../top/GridTopologyCommandHandler.java         |    4 -
 .../processors/task/GridTaskWorker.java         |    4 +-
 .../GridBoundedConcurrentLinkedHashMap.java     |    7 +-
 .../GridBoundedConcurrentLinkedHashSet.java     |    7 +-
 .../util/GridBoundedConcurrentOrderedMap.java   |   39 +-
 .../internal/util/GridConcurrentFactory.java    |   11 +-
 .../util/GridConcurrentLinkedHashSet.java       |    9 +-
 .../ignite/internal/util/IgniteUuidCache.java   |    6 +-
 .../util/future/GridCompoundFuture.java         |  155 +-
 .../ignite/internal/util/lang/GridTuple4.java   |    2 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |    8 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  381 +++--
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |    4 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    2 +-
 .../tcp/internal/TcpDiscoveryNodesRing.java     |   95 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |   37 +
 .../TcpDiscoveryClientReconnectMessage.java     |    1 +
 .../messages/TcpDiscoveryDiscardMessage.java    |    1 +
 .../TcpDiscoveryStatusCheckMessage.java         |   11 +
 .../org/apache/ignite/stream/StreamAdapter.java |    2 +-
 .../apache/ignite/stream/StreamTransformer.java |    9 +-
 .../java/org/jsr166/ConcurrentHashMap8.java     |    2 +-
 .../java/org/jsr166/ConcurrentLinkedDeque8.java |    2 +-
 .../org/jsr166/ConcurrentLinkedHashMap.java     |  195 ++-
 .../GridCacheAffinityBackupsSelfTest.java       |    8 +
 .../store/GridCacheBalancingStoreSelfTest.java  |  220 ++-
 .../GridCacheLoadOnlyStoreAdapterSelfTest.java  |  145 +-
 .../GridTaskFailoverAffinityRunTest.java        |    3 +
 .../CacheDeferredDeleteSanitySelfTest.java      |   98 ++
 .../processors/cache/CacheNamesSelfTest.java    |   69 +
 .../cache/GridCacheAbstractFullApiSelfTest.java |    2 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |   40 +-
 .../processors/cache/GridCacheTestEntryEx.java  |    3 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |    2 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   20 +-
 ...niteCacheClientNodeChangingTopologyTest.java |    4 +-
 .../dht/GridCacheTxNodeFailureSelfTest.java     |   21 +-
 ...gniteCachePutRetryTransactionalSelfTest.java |   10 +
 .../near/GridCacheNearTxExceptionSelfTest.java  |   11 +
 ...achePartitionedMultiNodeFullApiSelfTest.java |    2 +-
 .../GridCacheRebalancingAsyncSelfTest.java      |   68 +
 .../GridCacheRebalancingSyncSelfTest.java       |  506 +++++++
 ...eRebalancingUnmarshallingFailedSelfTest.java |  147 ++
 .../GridCacheReplicatedPreloadSelfTest.java     |   22 +-
 .../continuous/GridEventConsumeSelfTest.java    |    2 +-
 ...dBoundedConcurrentLinkedHashMapSelfTest.java |    2 +-
 .../GridConcurrentLinkedHashMapSelfTest.java    |   62 +-
 ...gniteClientReconnectMassiveShutdownTest.java |   84 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |  159 +-
 .../discovery/tcp/TcpDiscoveryRestartTest.java  |   10 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  476 +++++-
 .../spi/discovery/tcp/TestTcpDiscoverySpi.java  |   46 +
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  |   28 +-
 .../testframework/junits/GridAbstractTest.java  |   32 +-
 .../ignite/testframework/junits/IgniteMock.java |    5 +
 .../junits/common/GridCommonAbstractTest.java   |   25 +-
 .../junits/multijvm/IgniteProcessProxy.java     |    7 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |    6 +-
 .../testsuites/IgniteCacheTestSuite3.java       |    6 +
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |  104 +-
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |   33 +-
 modules/flume/README.md                         |   40 +
 modules/flume/pom.xml                           |   77 +
 .../ignite/stream/flume/EventTransformer.java   |   36 +
 .../apache/ignite/stream/flume/IgniteSink.java  |  186 +++
 .../stream/flume/IgniteSinkConstants.java       |   35 +
 .../ignite/stream/flume/IgniteSinkTest.java     |  142 ++
 .../stream/flume/IgniteSinkTestSuite.java       |   37 +
 .../stream/flume/TestEventTransformer.java      |   66 +
 .../flume/src/test/resources/example-ignite.xml |   71 +
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |    7 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |   18 +-
 modules/rest-http/pom.xml                       |   17 +
 .../http/jetty/GridJettyRestProtocol.java       |    4 +-
 .../scala/org/apache/ignite/spark/Entity.scala  |    2 +-
 .../org/apache/ignite/spark/IgniteRDDSpec.scala |  249 +++
 .../org/apache/ignite/spark/IgniteRddSpec.scala |  249 ---
 .../org/apache/ignite/IgniteSpringBean.java     |   10 +-
 .../GridSpringResourceInjectionSelfTest.java    |  143 ++
 .../processors/resource/spring-resource.xml     |   27 +
 .../testsuites/IgniteResourceSelfTestSuite.java |    2 +
 modules/ssh/pom.xml                             |    2 +-
 .../visor/commands/open/VisorOpenCommand.scala  |   14 +-
 .../scala/org/apache/ignite/visor/visor.scala   |    3 +-
 modules/yardstick/README.txt                    |   16 +-
 .../config/benchmark-multicast.properties       |    9 +-
 .../yardstick/config/benchmark-store.properties |   86 +-
 .../yardstick/config/ignite-store-config.xml    |   31 +-
 .../yardstick/IgniteBenchmarkArguments.java     |    2 +-
 .../ignite/yardstick/IgniteBenchmarkUtils.java  |   75 +
 .../org/apache/ignite/yardstick/IgniteNode.java |   23 +-
 .../IgniteAccountSerializableTxBenchmark.java   |   11 +-
 .../cache/IgniteAccountTxBenchmark.java         |   11 +-
 .../cache/IgniteGetAllPutAllTxBenchmark.java    |   73 +
 .../cache/IgnitePutGetTxBenchmark.java          |   41 +-
 .../yardstick/cache/IgnitePutTxBenchmark.java   |   10 +
 .../cache/IgnitePutTxPrimaryOnlyBenchmark.java  |   65 +
 .../IgnitePutTxSkipLocalBackupBenchmark.java    |   65 +
 .../cache/WaitMapExchangeFinishCallable.java    |   95 ++
 ...IgniteTransactionalWriteInvokeBenchmark.java |   41 +-
 .../IgniteTransactionalWriteReadBenchmark.java  |   41 +-
 modules/zookeeper/pom.xml                       |    2 +-
 parent/pom.xml                                  |    1 +
 pom.xml                                         |    1 +
 196 files changed, 12127 insertions(+), 5195 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ae7bc421/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2bd290c,c40b551..540e05b
--- a/pom.xml
+++ b/pom.xml
@@@ -73,9 -73,9 +73,10 @@@
          <module>modules/cloud</module>
          <module>modules/mesos</module>
          <module>modules/kafka</module>
+         <module>modules/flume</module>
          <module>modules/yarn</module>
          <module>modules/jms11</module>
 +        <module>modules/twitter</module>
          <module>modules/mqtt</module>
          <module>modules/zookeeper</module>
          <module>modules/platform</module>


Mime
View raw message