ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [41/42] incubator-ignite git commit: Merge branch ignite-sprint-3 into ignite-80
Date Mon, 13 Apr 2015 21:50:31 GMT
Merge branch ignite-sprint-3 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/7f72d1fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f72d1fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f72d1fc

Branch: refs/heads/ignite-80
Commit: 7f72d1fc3f25be784fb151e0db05b92080e78ca7
Parents: a7f3411 fceebf2
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Apr 13 14:48:11 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Apr 13 14:48:11 2015 -0700

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |  13 +
 .../streaming/wordcount/CacheConfig.java        |   5 +
 .../streaming/wordcount/QueryWords.java         |   4 +-
 .../client/ClientReconnectionSelfTest.java      |   2 +
 .../java/org/apache/ignite/IgniteCache.java     |  10 +-
 .../apache/ignite/IgniteSystemProperties.java   |   7 +
 .../apache/ignite/cache/query/ScanQuery.java    |   2 +-
 .../ignite/cache/query/SqlFieldsQuery.java      |  55 ++-
 .../ignite/internal/ClusterMetricsSnapshot.java |   3 -
 .../GridDhtPartitionsExchangeFuture.java        |   3 +
 .../cache/local/GridLocalLockFuture.java        |   2 +
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 379 +------------------
 .../tcp/messages/TcpDiscoveryClassRequest.java  |  55 ---
 .../tcp/messages/TcpDiscoveryClassResponse.java |  76 ----
 .../fair/GridFairAffinityFunctionSelfTest.java  |   2 -
 .../IgniteFairAffinityDynamicCacheSelfTest.java |   3 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |   5 +
 .../GridCacheSetFailoverAbstractSelfTest.java   |   2 +
 ...ClusterMetricsSnapshotSerializeSelfTest.java |  28 ++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   1 +
 .../CacheConfigurationP2PTestClient.java        |  14 +-
 modules/hadoop/docs/hadoop_readme.pdf           | Bin 82297 -> 82219 bytes
 .../processors/query/h2/IgniteH2Indexing.java   |   2 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |  18 +-
 .../query/h2/twostep/GridMergeIndex.java        |  17 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../cache/CacheConfigurationP2PTest.java        |   2 +
 .../IgniteCacheCollocatedQuerySelfTest.java     | 209 ++++++++++
 .../cache/IgniteCacheLargeResultSelfTest.java   | 104 +++++
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 pom.xml                                         |   3 -
 31 files changed, 503 insertions(+), 527 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f72d1fc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 2e11c24,ed4be4e..1136d06
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@@ -3723,7 -3593,7 +3593,7 @@@ public class TcpDiscoverySpi extends Tc
                      Map<Integer, byte[]> data = msg.newNodeDiscoveryData();
  
                      if (data != null)
-                         onExchange(node.id(), node.id(), node.order(), data, exchangeClassLoader(node,
node.id()));
 -                        onExchange(node.id(), node.id(), data, U.gridClassLoader());
++                        onExchange(node.id(), node.id(), node.order(), data, U.gridClassLoader());
  
                      msg.addDiscoveryData(locNodeId, collectExchangeData(node.id()));
                  }
@@@ -3794,13 -3664,8 +3664,13 @@@
  
                  // Notify outside of synchronized block.
                  if (dataMap != null) {
 -                    for (Map.Entry<UUID, Map<Integer, byte[]>> entry : dataMap.entrySet())
 -                        onExchange(node.id(), entry.getKey(), entry.getValue(), U.gridClassLoader());
 +                    for (Map.Entry<UUID, Map<Integer, byte[]>> entry : dataMap.entrySet())
{
 +                        onExchange(node.id(),
 +                            entry.getKey(),
 +                            node.order(),
 +                            entry.getValue(),
-                             exchangeClassLoader(node, entry.getKey()));
++                            U.gridClassLoader());
 +                    }
                  }
              }
  

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


Mime
View raw message