Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-683-1


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

Branch: refs/heads/ignite-683-1
Commit: 2cfbbd8cf199bf37e7de76e7032d28c7d41ef251
Parents: b21e9ef 682dcd1
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Wed Apr 8 13:08:24 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Wed Apr 8 13:08:24 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |    2 +-
 bin/ignite.bat                                  |    2 +-
 bin/ignite.sh                                   |    2 +-
 bin/include/service.sh                          |    8 +-
 config/hadoop/default-config.xml                |   15 +-
 examples/README.txt                             |   11 +-
 examples/config/example-ignite.xml              |    2 +-
 .../streaming/StreamTransformerExample.java     |  100 +
 .../streaming/StreamVisitorExample.java         |  171 +
 .../streaming/marketdata/CacheConfig.java       |   44 -
 .../streaming/marketdata/Instrument.java        |  106 -
 .../marketdata/QueryTopInstruments.java         |   73 -
 .../streaming/marketdata/StreamMarketData.java  |  103 -
 .../examples/streaming/numbers/CacheConfig.java |   46 -
 .../streaming/numbers/QueryPopularNumbers.java  |   74 -
 .../streaming/numbers/StreamRandomNumbers.java  |   78 -
 .../streaming/wordcount/CacheConfig.java        |   48 +
 .../streaming/wordcount/QueryWords.java         |   77 +
 .../streaming/wordcount/StreamWords.java        |   68 +
 .../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
 .../streaming/wordcount/package-info.java       |   22 +
 .../streaming/StreamTransformerExample.java     |   97 +
 .../java8/streaming/StreamVisitorExample.java   |  168 +
 .../java8/streaming/marketdata/CacheConfig.java |   44 -
 .../java8/streaming/marketdata/Instrument.java  |  106 -
 .../marketdata/QueryTopInstruments.java         |   73 -
 .../streaming/marketdata/StreamMarketData.java  |  101 -
 .../java8/streaming/numbers/CacheConfig.java    |   46 -
 .../streaming/numbers/QueryPopularNumbers.java  |   74 -
 .../streaming/numbers/StreamRandomNumbers.java  |   74 -
 .../src/main/java/org/apache/ignite/Ignite.java |   15 +
 .../ignite/cache/affinity/AffinityUuid.java     |   50 +
 .../store/jdbc/CacheAbstractJdbcStore.java      |  104 +-
 .../configuration/CacheConfiguration.java       |    3 -
 .../apache/ignite/internal/IgniteKernal.java    |   37 +
 .../internal/managers/GridManagerAdapter.java   |   34 +-
 .../processors/cache/CacheLazyEntry.java        |   10 +-
 .../cache/DynamicCacheChangeRequest.java        |   17 +
 .../cache/DynamicCacheDescriptor.java           |   17 +-
 .../processors/cache/GridCacheIoManager.java    |    2 +-
 .../processors/cache/GridCacheProcessor.java    |  349 +-
 .../processors/cache/KeyCacheObjectImpl.java    |   13 +-
 .../dht/GridClientPartitionTopology.java        |    6 +-
 .../distributed/dht/GridDhtLockFuture.java      |   10 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |    6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   49 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |    2 +-
 .../GridDhtPartitionsExchangeFuture.java        |    1 +
 .../cacheobject/IgniteCacheObjectProcessor.java |    3 +-
 .../IgniteCacheObjectProcessorImpl.java         |   28 +-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |   48 +-
 .../ignite/internal/visor/cache/VisorCache.java |   19 +-
 .../VisorCacheConfigurationCollectorJob.java    |   76 +
 .../VisorCacheConfigurationCollectorTask.java   |   39 +
 .../VisorIgfsProfilerUniformityCounters.java    |    6 +-
 .../internal/visor/log/VisorLogSearchTask.java  |    3 +-
 .../visor/node/VisorGridConfiguration.java      |   38 -
 .../visor/node/VisorIgfsConfiguration.java      |    2 +-
 .../visor/node/VisorRestConfiguration.java      |    1 +
 .../visor/query/VisorQueryNextPageTask.java     |    5 +-
 .../internal/visor/util/VisorTaskUtils.java     |    3 +-
 .../org/apache/ignite/lang/IgniteImmutable.java |   49 -
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   24 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   14 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |   47 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   78 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |    8 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    4 +-
 .../org/apache/ignite/stream/StreamVisitor.java |    2 +-
 .../resources/META-INF/classnames.properties    |   19 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |    5 +
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |  112 +-
 .../GridCacheReturnValueTransferSelfTest.java   |    1 -
 ...eCacheConfigurationTemplateNotFoundTest.java |  114 +
 .../IgniteCacheConfigurationTemplateTest.java   |  364 ++
 .../IgniteCacheStoreValueAbstractTest.java      |  186 +-
 .../cache/IgniteDynamicCacheStartSelfTest.java  |   23 +
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  110 +-
 ...ridCacheFifoBatchEvictionPolicySelfTest.java |    3 +-
 .../GridAbstractCommunicationSelfTest.java      |    3 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |    5 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |    3 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |    3 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |    3 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |    2 +-
 .../ignite/testframework/junits/IgniteMock.java |   10 +
 .../IgniteCacheEvictionSelfTestSuite.java       |    1 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |    5 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |    2 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   14 +
 .../commands/cache/VisorCacheClearCommand.scala |    3 +-
 .../commands/cache/VisorCacheCommand.scala      |   26 +-
 .../config/VisorConfigurationCommand.scala      |   15 +-
 .../visor/commands/gc/VisorGcCommand.scala      |   15 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   42 +-
 .../yardstick/config/benchmark-store.properties |    5 +-
 parent/pom.xml                                  |    3 +-
 pom.xml                                         |   14 +-
 98 files changed, 6218 insertions(+), 1685 deletions(-)
----------------------------------------------------------------------


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

Reply via email to