ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [11/11] ignite git commit: Merge branch 'ignite-1.5' into ignite-426-2
Date Thu, 19 Nov 2015 14:54:06 GMT
Merge branch 'ignite-1.5' into ignite-426-2


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

Branch: refs/heads/ignite-426-2
Commit: 946a7426f3c6adcf1545b4b2c84437e9d4c89c55
Parents: 23e3074 f0db0d9
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Nov 19 17:53:34 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Nov 19 17:53:34 2015 +0300

----------------------------------------------------------------------
 modules/camel/README.txt                        |  34 +
 modules/camel/licenses/apache-2.0.txt           | 202 ++++++
 modules/camel/pom.xml                           | 102 +++
 .../ignite/stream/camel/CamelStreamer.java      | 237 +++++++
 .../stream/camel/IgniteCamelStreamerTest.java   | 420 +++++++++++
 .../camel/IgniteCamelStreamerTestSuite.java     |  48 ++
 .../src/test/resources/camel.test.properties    |  18 +
 .../java/org/apache/ignite/IgniteCache.java     |   3 +-
 .../java/org/apache/ignite/IgniteCompute.java   |   3 +-
 .../org/apache/ignite/compute/ComputeJob.java   |   2 +-
 .../ignite/internal/GridUpdateNotifier.java     |   2 +-
 .../communication/GridIoMessageFactory.java     |  12 +
 .../processors/cache/GridCacheAdapter.java      | 103 ++-
 .../processors/cache/GridCacheAtomicFuture.java |   6 +
 .../processors/cache/GridCacheFuture.java       |  13 -
 .../processors/cache/GridCacheIoManager.java    |  50 +-
 .../processors/cache/GridCacheMessage.java      |  20 +-
 .../processors/cache/GridCacheMvccFuture.java   |   7 +
 .../processors/cache/GridCacheMvccManager.java  | 108 +--
 .../distributed/GridCacheTxRecoveryFuture.java  |  13 +-
 .../dht/CacheDistributedGetFutureAdapter.java   |  27 +-
 .../cache/distributed/dht/CacheGetFuture.java   |  32 +
 .../distributed/dht/GridDhtCacheAdapter.java    | 141 ++++
 .../distributed/dht/GridDhtLockFuture.java      |  16 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   9 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |  24 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  17 +-
 .../dht/GridPartitionedGetFuture.java           |  69 +-
 .../dht/GridPartitionedSingleGetFuture.java     | 697 +++++++++++++++++++
 .../dht/atomic/GridDhtAtomicCache.java          | 127 +++-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   5 -
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   5 -
 .../dht/colocated/GridDhtColocatedCache.java    | 160 ++++-
 .../colocated/GridDhtColocatedLockFuture.java   |  26 +-
 .../distributed/near/CacheVersionedValue.java   |   2 +-
 .../distributed/near/GridNearCacheAdapter.java  |   4 +-
 .../distributed/near/GridNearGetFuture.java     |  57 +-
 .../distributed/near/GridNearGetRequest.java    |   1 -
 .../distributed/near/GridNearGetResponse.java   |   2 -
 .../distributed/near/GridNearLockFuture.java    |  16 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  17 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  19 +-
 .../GridNearPessimisticTxPrepareFuture.java     |  19 +-
 .../near/GridNearSingleGetRequest.java          | 396 +++++++++++
 .../near/GridNearSingleGetResponse.java         | 321 +++++++++
 .../near/GridNearTransactionalCache.java        |   2 +-
 .../near/GridNearTxFinishFuture.java            |  24 +-
 .../cache/distributed/near/GridNearTxLocal.java | 149 ++--
 .../near/GridNearTxPrepareFutureAdapter.java    |   6 +-
 .../processors/cache/local/GridLocalCache.java  |   4 +-
 .../cache/local/GridLocalLockFuture.java        |   5 -
 .../cache/transactions/IgniteTxHandler.java     |  19 +-
 .../transactions/IgniteTxLocalAdapter.java      |   2 +-
 .../cache/transactions/IgniteTxManager.java     |   2 +-
 .../ignite/marshaller/MarshallerExclusions.java |   4 +-
 .../org/apache/ignite/stream/StreamAdapter.java |  19 +-
 .../IgniteClientReconnectCacheTest.java         |  11 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  75 ++
 .../GridCacheConcurrentTxMultiNodeTest.java     |  15 -
 .../cache/GridCachePartitionedGetSelfTest.java  |   3 +-
 .../IgniteCacheAbstractStopBusySelfTest.java    |  27 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   | 184 +++--
 .../CacheGetFutureHangsSelfTest.java            |   6 +
 .../GridCacheAbstractNodeRestartSelfTest.java   |   2 +
 .../IgniteCacheSingleGetMessageTest.java        | 357 ++++++++++
 .../GridCacheReplicatedMetricsSelfTest.java     |   9 -
 .../testsuites/IgniteCacheTestSuite4.java       |   3 +
 modules/flume/licenses/apache-2.0.txt           | 202 ++++++
 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 +++
 pom.xml                                         |   2 +
 78 files changed, 5219 insertions(+), 611 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/946a7426/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 0e5755c,3548aac..1749c9b
--- 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
@@@ -698,11 -699,16 +700,21 @@@ public class GridIoMessageFactory imple
                  break;
  
              case 116:
+                 msg = new GridNearSingleGetRequest();
+ 
+                 break;
+ 
+             case 117:
+                 msg = new GridNearSingleGetResponse();
+ 
+                 break;
+ 
 -            // [-3..114] - this
++            case 116:
 +                msg = new CacheContinuousQueryBatchAck();
 +
 +                break;
 +
 +            // [-3..116] - this
              // [120..123] - DR
              // [-4..-22] - SQL
              default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/946a7426/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/946a7426/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 94c3ee1,75f8c2f..3ee1048
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@@ -64,8 -64,8 +64,9 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
  import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture;
  import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
 +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
  import org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture;
+ import org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture;
  import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
  import org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache;
  import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;

http://git-wip-us.apache.org/repos/asf/ignite/blob/946a7426/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/946a7426/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/946a7426/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------


Mime
View raw message