ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [28/29] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-80
Date Mon, 27 Apr 2015 23:29:28 GMT
Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-80


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

Branch: refs/heads/ignite-80
Commit: a1dbea62ed07df8a957b665e289f4d75d52e96a3
Parents: c054bc5 bd3a572
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Apr 27 16:19:21 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Apr 27 16:19:21 2015 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/Ignition.java   |   44 +
 .../cache/CacheServerNotFoundException.java     |   12 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  165 ++-
 .../ClusterTopologyServerNotFoundException.java |   12 +-
 .../affinity/GridAffinityAssignmentCache.java   |    4 +-
 .../processors/cache/CacheInvokeResult.java     |   24 +-
 .../processors/cache/GridCacheAdapter.java      |    2 +-
 .../processors/cache/GridCacheMapEntry.java     |    4 +-
 .../GridCachePartitionExchangeManager.java      |    2 +-
 .../processors/cache/GridCacheReturn.java       |    5 +-
 .../processors/cache/GridCacheUtils.java        |   47 +-
 .../dht/GridPartitionedGetFuture.java           |    7 +
 .../dht/atomic/GridDhtAtomicCache.java          |    3 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   24 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   20 +-
 .../colocated/GridDhtColocatedLockFuture.java   |    4 +
 .../distributed/near/GridNearCacheEntry.java    |    7 +-
 .../distributed/near/GridNearGetFuture.java     |   17 +-
 .../distributed/near/GridNearLockFuture.java    |    4 +
 .../near/GridNearTransactionalCache.java        |   18 +-
 .../local/atomic/GridLocalAtomicCache.java      |    6 +-
 .../cache/query/GridCacheQueryManager.java      |   11 +-
 .../datastreamer/DataStreamProcessor.java       |   28 +-
 .../datastreamer/DataStreamerImpl.java          |    3 +-
 .../datastreamer/DataStreamerRequest.java       |   38 +-
 .../portable/GridPortableInputStream.java       |   26 -
 .../top/GridTopologyCommandHandler.java         |    3 +-
 .../ignite/internal/util/IgniteUtils.java       |   20 +-
 .../util/spring/IgniteSpringHelper.java         |   54 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   15 +-
 .../cache/IgniteExcangeFutureHistoryTest.java   |   74 -
 .../cache/IgniteExchangeFutureHistoryTest.java  |   77 ++
 .../CacheNoValueClassOnServerNodeTest.java      |  129 ++
 .../DataStreamerMultiThreadedSelfTest.java      |  110 ++
 .../GridSwapSpaceSpiAbstractSelfTest.java       |    2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |    7 +-
 .../CacheNoValueClassOnServerTestClient.java    |   88 ++
 .../apache/ignite/tests/p2p/cache/Person.java   |   42 +
 .../CacheConfigurationP2PTestClient.java        |    1 -
 .../GridCacheAbstractFieldsQuerySelfTest.java   | 1284 ------------------
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  235 +++-
 ...artitionedFieldsQueryP2PEnabledSelfTest.java |   34 -
 ...GridCachePartitionedFieldsQuerySelfTest.java |  115 --
 ...rtitionedFieldsQueryP2PDisabledSelfTest.java |   34 -
 ...artitionedFieldsQueryP2PEnabledSelfTest.java |   34 +
 ...eReplicatedFieldsQueryP2PEnableSelfTest.java |   34 -
 .../GridCacheReplicatedFieldsQuerySelfTest.java |  157 ---
 ...eplicatedFieldsQueryP2PDisabledSelfTest.java |   34 -
 ...ReplicatedFieldsQueryP2PEnabledSelfTest.java |   34 +
 .../query/h2/sql/BaseH2CompareQueryTest.java    |   32 +-
 .../IgniteCacheQuerySelfTestSuite.java          |    4 +-
 .../util/spring/IgniteSpringHelperImpl.java     |  217 ++-
 .../IgniteStartFromStreamConfigurationTest.java |   50 +
 .../testsuites/IgniteSpringTestSuite.java       |    2 +
 54 files changed, 1472 insertions(+), 1987 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1dbea62/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1dbea62/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1dbea62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 9025fee,5f82ae2..cea6b2c
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@@ -409,10 -409,10 +409,10 @@@ public class GridCachePartitionExchange
       * @param ver Topology version.
       * @return Future or {@code null} is future is already completed.
       */
-     @Nullable IgniteInternalFuture<?> affinityReadyFuture(AffinityTopologyVersion
ver) {
+     public @Nullable IgniteInternalFuture<?> affinityReadyFuture(AffinityTopologyVersion
ver) {
          GridDhtPartitionsExchangeFuture lastInitializedFut0 = lastInitializedFut;
  
 -        if (lastInitializedFut0 != null && lastInitializedFut0.topologyVersion().compareTo(ver)
>= 0) {
 +        if (lastInitializedFut0 != null && lastInitializedFut0.topologyVersion().compareTo(ver)
== 0) {
              if (log.isDebugEnabled())
                  log.debug("Return lastInitializedFut for topology ready future " +
                      "[ver=" + ver + ", fut=" + lastInitializedFut0 + ']');

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1dbea62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1dbea62/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------


Mime
View raw message