You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/03 01:25:19 UTC
[07/11] incubator-ignite git commit: Merge branch 'ignite-sprint-5'
into ignite-745
Merge branch 'ignite-sprint-5' into ignite-745
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b165ff04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b165ff04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b165ff04
Branch: refs/heads/ignite-sprint-5
Commit: b165ff042a14780c4a502a1272caec7f7440f7e3
Parents: 9943b77 c3dde57
Author: agura <ag...@gridgain.com>
Authored: Mon May 18 12:32:20 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Mon May 18 12:32:20 2015 +0300
----------------------------------------------------------------------
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 2 +-
.../streaming/StreamTransformerExample.java | 4 +-
.../streaming/StreamVisitorExample.java | 4 +-
.../ignite/examples/streaming/package-info.java | 1 -
.../streaming/wordcount/CacheConfig.java | 2 +-
.../streaming/wordcount/QueryWords.java | 12 +-
.../streaming/wordcount/StreamWords.java | 12 +-
.../streaming/wordcount/package-info.java | 1 -
.../socket/WordsSocketStreamerClient.java | 82 +++++
.../socket/WordsSocketStreamerServer.java | 124 ++++++++
.../wordcount/socket/package-info.java | 21 ++
.../org/apache/ignite/internal/IgnitionEx.java | 136 +++-----
.../internal/interop/InteropBootstrap.java | 34 ++
.../interop/InteropBootstrapFactory.java | 39 +++
.../internal/interop/InteropIgnition.java | 166 ++++++++++
.../internal/interop/InteropProcessor.java | 36 +++
.../processors/cache/GridCacheAdapter.java | 127 ++++----
.../processors/cache/GridCacheContext.java | 7 +
.../processors/cache/GridCacheMapEntry.java | 105 +++----
.../GridDistributedCacheAdapter.java | 210 ++++++++-----
.../distributed/GridDistributedLockRequest.java | 111 ++-----
.../GridDistributedTxFinishRequest.java | 70 +----
.../GridDistributedTxPrepareRequest.java | 112 ++-----
.../GridDistributedTxRemoteAdapter.java | 20 +-
.../distributed/dht/GridDhtCacheAdapter.java | 16 +-
.../distributed/dht/GridDhtLockFuture.java | 2 -
.../distributed/dht/GridDhtLockRequest.java | 45 ++-
.../dht/GridDhtOffHeapCacheEntry.java | 63 ++++
.../dht/GridDhtTransactionalCacheAdapter.java | 6 -
.../distributed/dht/GridDhtTxFinishFuture.java | 3 -
.../distributed/dht/GridDhtTxFinishRequest.java | 43 ++-
.../cache/distributed/dht/GridDhtTxLocal.java | 6 -
.../distributed/dht/GridDhtTxLocalAdapter.java | 68 +---
.../distributed/dht/GridDhtTxPrepareFuture.java | 18 +-
.../dht/GridDhtTxPrepareRequest.java | 60 ++--
.../cache/distributed/dht/GridDhtTxRemote.java | 8 +-
.../distributed/dht/GridNoStorageCacheMap.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 3 +
.../atomic/GridDhtAtomicOffHeapCacheEntry.java | 63 ++++
.../dht/colocated/GridDhtColocatedCache.java | 5 +-
.../colocated/GridDhtColocatedLockFuture.java | 6 -
.../GridDhtColocatedOffHeapCacheEntry.java | 63 ++++
.../GridDhtPartitionsExchangeFuture.java | 2 +-
.../distributed/near/GridNearCacheAdapter.java | 3 +
.../distributed/near/GridNearLockFuture.java | 6 -
.../distributed/near/GridNearLockRequest.java | 61 ++--
.../near/GridNearOffHeapCacheEntry.java | 60 ++++
.../near/GridNearOptimisticTxPrepareFuture.java | 15 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 -
.../near/GridNearTransactionalCache.java | 4 -
.../near/GridNearTxFinishRequest.java | 28 +-
.../cache/distributed/near/GridNearTxLocal.java | 20 +-
.../near/GridNearTxPrepareRequest.java | 52 ++-
.../distributed/near/GridNearTxRemote.java | 24 +-
.../cache/local/GridLocalCacheEntry.java | 18 ++
.../cache/transactions/IgniteInternalTx.java | 10 -
.../transactions/IgniteTransactionsImpl.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 72 +----
.../cache/transactions/IgniteTxEntry.java | 48 +--
.../cache/transactions/IgniteTxHandler.java | 6 -
.../transactions/IgniteTxLocalAdapter.java | 165 +---------
.../cache/transactions/IgniteTxLocalEx.java | 21 +-
.../cache/transactions/IgniteTxManager.java | 62 +---
.../processors/resource/GridResourceField.java | 5 +-
.../processors/resource/GridResourceIoc.java | 20 +-
.../resource/GridResourceProcessor.java | 16 +-
.../ignite/internal/util/IgniteUtils.java | 3 +
.../util/lang/GridComputeJobWrapper.java | 96 ------
.../internal/util/nio/GridBufferedParser.java | 4 -
.../internal/util/nio/GridDelimitedParser.java | 91 ++++++
.../util/nio/GridNioDelimitedBuffer.java | 106 +++++++
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 28 --
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +-
.../org/apache/ignite/stream/StreamAdapter.java | 111 +++++++
.../ignite/stream/StreamTupleExtractor.java | 33 ++
.../stream/socket/SocketMessageConverter.java | 31 ++
.../ignite/stream/socket/SocketStreamer.java | 218 +++++++++++++
.../ignite/stream/socket/package-info.java | 21 ++
.../resources/META-INF/classnames.properties | 1 -
.../cache/CacheOffheapMapEntrySelfTest.java | 168 ++++++++++
.../cache/CacheRemoveAllSelfTest.java | 81 +++++
.../near/IgniteCacheNearOnlyTxTest.java | 190 +++++++++++
.../near/NoneRebalanceModeSelfTest.java | 67 ++++
.../GridCacheLocalIsolatedNodesSelfTest.java | 18 +-
.../util/nio/GridNioDelimitedBufferTest.java | 112 +++++++
.../discovery/tcp/TcpDiscoveryRestartTest.java | 199 ++++++++++++
.../stream/socket/SocketStreamerSelfTest.java | 315 +++++++++++++++++++
.../ignite/stream/socket/package-info.java | 21 ++
.../testsuites/IgniteCacheTestSuite2.java | 1 +
.../testsuites/IgniteCacheTestSuite4.java | 4 +
.../testsuites/IgniteStreamTestSuite.java | 39 +++
.../testsuites/IgniteUtilSelfTestSuite.java | 1 +
.../processors/cache/jta/CacheJtaManager.java | 4 +-
.../scalar/tests/ScalarCacheQueriesSpec.scala | 154 ++++-----
.../ignite/scalar/tests/ScalarCacheSpec.scala | 23 +-
.../scalar/tests/ScalarConversionsSpec.scala | 43 +--
.../scalar/tests/ScalarProjectionSpec.scala | 128 ++++----
.../scalar/tests/ScalarReturnableSpec.scala | 41 +--
modules/visor-console/pom.xml | 2 +-
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +-
.../visor/commands/VisorArgListSpec.scala | 60 ++--
.../commands/VisorFileNameCompleterSpec.scala | 34 +-
.../commands/ack/VisorAckCommandSpec.scala | 20 +-
.../commands/alert/VisorAlertCommandSpec.scala | 68 ++--
.../cache/VisorCacheClearCommandSpec.scala | 48 +--
.../commands/cache/VisorCacheCommandSpec.scala | 66 ++--
.../config/VisorConfigurationCommandSpec.scala | 8 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 24 +-
.../deploy/VisorDeployCommandSpec.scala | 10 +-
.../disco/VisorDiscoveryCommandSpec.scala | 46 +--
.../events/VisorEventsCommandSpec.scala | 28 +-
.../visor/commands/gc/VisorGcCommandSpec.scala | 30 +-
.../commands/help/VisorHelpCommandSpec.scala | 57 ++--
.../commands/kill/VisorKillCommandSpec.scala | 58 ++--
.../commands/log/VisorLogCommandSpec.scala | 10 +-
.../commands/mem/VisorMemoryCommandSpec.scala | 77 ++---
.../commands/node/VisorNodeCommandSpec.scala | 22 +-
.../commands/open/VisorOpenCommandSpec.scala | 16 +-
.../commands/ping/VisorPingCommandSpec.scala | 16 +-
.../commands/start/VisorStartCommandSpec.scala | 126 ++++----
.../commands/tasks/VisorTasksCommandSpec.scala | 112 +++----
.../commands/top/VisorTopologyCommandSpec.scala | 52 +--
.../commands/vvm/VisorVvmCommandSpec.scala | 30 +-
pom.xml | 2 +
130 files changed, 3911 insertions(+), 2129 deletions(-)
----------------------------------------------------------------------