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/11/20 14:33:44 UTC
[22/24] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-single-op-get
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-get
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a432c70e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a432c70e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a432c70e
Branch: refs/heads/ignite-single-op-get
Commit: a432c70e10790a198644d9e4964f1f2cc8067ba6
Parents: 00c9809 900788b
Author: sboikov <sb...@gridgain.com>
Authored: Fri Nov 20 15:26:43 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Nov 20 15:26:43 2015 +0300
----------------------------------------------------------------------
modules/camel/README.txt | 34 +
modules/camel/licenses/apache-2.0.txt | 202 ++
.../ignite/stream/camel/CamelStreamer.java | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 3 +-
.../java/org/apache/ignite/IgniteCompute.java | 3 +-
.../org/apache/ignite/compute/ComputeJob.java | 2 +-
.../internal/GridEventConsumeHandler.java | 22 +-
.../internal/GridMessageListenHandler.java | 18 +
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../communication/GridIoMessageFactory.java | 18 +-
.../processors/cache/GridCacheEntryEx.java | 12 +-
.../processors/cache/GridCacheMapEntry.java | 147 +-
.../GridCachePartitionExchangeManager.java | 4 +-
.../cache/GridCacheUpdateAtomicResult.java | 15 +-
.../cache/GridCacheUpdateTxResult.java | 24 +-
.../processors/cache/IgniteCacheProxy.java | 3 +
.../GridDistributedTxRemoteAdapter.java | 22 +-
.../dht/GridClientPartitionTopology.java | 38 +-
.../distributed/dht/GridDhtLocalPartition.java | 35 +
.../dht/GridDhtPartitionTopology.java | 26 +-
.../dht/GridDhtPartitionTopologyImpl.java | 112 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 14 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 112 +-
.../dht/atomic/GridDhtAtomicCache.java | 79 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 75 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 147 +-
.../GridDhtPartitionsExchangeFuture.java | 35 +-
.../preloader/GridDhtPartitionsFullMessage.java | 64 +-
.../GridDhtPartitionsSingleMessage.java | 56 +-
.../distributed/near/GridNearAtomicCache.java | 10 +-
.../distributed/near/GridNearTxRemote.java | 7 +
.../CacheContinuousQueryBatchAck.java | 163 ++
.../continuous/CacheContinuousQueryEntry.java | 196 +-
.../continuous/CacheContinuousQueryEvent.java | 3 +-
.../continuous/CacheContinuousQueryHandler.java | 811 ++++++-
.../CacheContinuousQueryListener.java | 35 +
.../continuous/CacheContinuousQueryManager.java | 151 +-
.../cache/transactions/IgniteTxEntry.java | 20 +
.../cache/transactions/IgniteTxHandler.java | 3 +
.../transactions/IgniteTxLocalAdapter.java | 18 +-
.../cache/transactions/IgniteTxRemoteEx.java | 7 +-
.../continuous/GridContinuousBatch.java | 44 +
.../continuous/GridContinuousBatchAdapter.java | 46 +
.../continuous/GridContinuousHandler.java | 22 +
.../continuous/GridContinuousProcessor.java | 221 +-
.../StartRoutineAckDiscoveryMessage.java | 14 +-
.../StartRoutineDiscoveryMessage.java | 21 +-
.../ignite/marshaller/MarshallerExclusions.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 10 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 2235 ++++++++++++++++++
...ryFailoverAtomicNearEnabledSelfSelfTest.java | 46 +
...FailoverAtomicPrimaryWriteOrderSelfTest.java | 44 +
...usQueryFailoverAtomicReplicatedSelfTest.java | 40 +
...inuousQueryFailoverTxReplicatedSelfTest.java | 32 +
.../CacheContinuousQueryFailoverTxSelfTest.java | 39 +
...ridCacheContinuousQueryAbstractSelfTest.java | 153 +-
.../GridCacheContinuousQueryTxSelfTest.java | 49 +
...CacheContinuousQueryClientReconnectTest.java | 187 ++
.../IgniteCacheContinuousQueryClientTest.java | 157 +-
...cheContinuousQueryClientTxReconnectTest.java | 32 +
.../p2p/GridP2PSameClassLoaderSelfTest.java | 16 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 3 +
modules/flume/README.md | 40 -
modules/flume/README.txt | 72 +
modules/flume/licenses/apache-2.0.txt | 202 ++
.../IgniteCacheQuerySelfTestSuite.java | 16 +-
modules/twitter/README.txt | 32 +
modules/twitter/licenses/apache-2.0.txt | 202 ++
modules/twitter/pom.xml | 122 +
.../ignite/stream/twitter/OAuthSettings.java | 86 +
.../ignite/stream/twitter/TwitterStreamer.java | 295 +++
.../twitter/IgniteTwitterStreamerTest.java | 234 ++
.../twitter/IgniteTwitterStreamerTestSuite.java | 32 +
.../stream/twitter/TwitterStreamerImpl.java | 79 +
.../config/benchmark-multicast.properties | 6 +-
.../benchmark-query-put-separated.properties | 87 +
.../yardstick/cache/CacheEntryEventProbe.java | 156 ++
.../cache/IgniteSqlQueryPutBenchmark.java | 20 +
.../IgniteSqlQueryPutSeparatedBenchmark.java | 84 +
pom.xml | 1 +
81 files changed, 7569 insertions(+), 364 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a432c70e/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 3548aac,c671582..90c275d
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -708,7 -709,12 +709,22 @@@ public class GridIoMessageFactory imple
break;
- // [-3..114] - this
++ case 116:
++ msg = new GridNearSingleGetRequest();
++
++ break;
++
++ case 117:
++ msg = new GridNearSingleGetResponse();
++
++ break;
++
+ case 118:
+ msg = new CacheContinuousQueryBatchAck();
+
+ break;
+
+ // [-3..118] - this
// [120..123] - DR
// [-4..-22] - SQL
default:
http://git-wip-us.apache.org/repos/asf/ignite/blob/a432c70e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 1219f2f,72a60d2..54814c8
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@@ -532,12 -609,12 +609,19 @@@ public class GridDhtAtomicUpdateReques
/**
* @return {@code True} if on response flag changed.
+ */
+ public boolean onResponse() {
+ return !onRes && (onRes = true);
+ }
+
+ /**
++ * @return {@code True} if on response flag changed.
+ */
+ public boolean onResponse() {
+ return !onRes && (onRes = true);
+ }
+
+ /**
* @return Optional arguments for entry processor.
*/
@Nullable public Object[] invokeArguments() {