ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [26/47] incubator-ignite git commit: Merge ignite-705_2 to ignite-836_2
Date Fri, 15 May 2015 14:02:28 GMT
Merge ignite-705_2 to ignite-836_2


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

Branch: refs/heads/ignite-709_3
Commit: 8bc46ec23b69766656680fc1675008e8c18e1f34
Parents: 8c105ec 98743ef
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Thu May 14 17:57:59 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Thu May 14 17:57:59 2015 +0300

----------------------------------------------------------------------
 bin/ignite-schema-import.bat                    |   2 +-
 bin/ignite-schema-import.sh                     |   2 +-
 bin/ignite.bat                                  |   2 +-
 bin/ignite.sh                                   |   2 +-
 bin/ignitevisorcmd.bat                          |   2 +-
 bin/ignitevisorcmd.sh                           |   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   2 +-
 .../processors/cache/GridCacheAdapter.java      | 119 +++++------
 .../processors/cache/GridCacheContext.java      |   7 +
 .../processors/cache/GridCacheMapEntry.java     |  70 +++---
 .../processors/cache/GridCacheUtils.java        |  14 +-
 .../GridDistributedCacheAdapter.java            | 210 +++++++++++-------
 .../distributed/dht/GridDhtCacheAdapter.java    |  16 +-
 .../dht/GridDhtOffHeapCacheEntry.java           |  63 ++++++
 .../dht/GridDhtTransactionalCacheAdapter.java   |   9 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   3 +
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |  63 ++++++
 .../dht/colocated/GridDhtColocatedCache.java    |   5 +-
 .../GridDhtColocatedOffHeapCacheEntry.java      |  63 ++++++
 .../GridDhtPartitionsExchangeFuture.java        |   9 +-
 .../distributed/near/GridNearCacheAdapter.java  |   3 +
 .../near/GridNearOffHeapCacheEntry.java         |  60 ++++++
 .../cache/local/GridLocalCacheEntry.java        |  18 ++
 .../datastructures/DataStructuresProcessor.java |   4 +-
 .../processors/resource/GridResourceField.java  |   5 +-
 .../processors/resource/GridResourceIoc.java    |  20 +-
 .../resource/GridResourceProcessor.java         |  16 +-
 .../ignite/internal/util/IgniteUtils.java       |   3 +
 .../internal/util/future/SettableFuture.java    |  22 +-
 .../util/lang/GridComputeJobWrapper.java        |  96 ---------
 .../discovery/tcp/TcpClientDiscoverySpi.java    | 180 +++++++++-------
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  11 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   5 -
 .../tcp/internal/TcpDiscoveryNodesRing.java     |   2 +-
 .../resources/META-INF/classnames.properties    |   1 -
 .../cache/CacheOffheapMapEntrySelfTest.java     | 168 +++++++++++++++
 .../cache/CacheRemoveAllSelfTest.java           |  81 +++++++
 .../IgniteClientDataStructuresAbstractTest.java | 211 +++++++++++++++++++
 .../IgniteClientDataStructuresTest.java         |  28 +++
 ...IgniteClientDiscoveryDataStructuresTest.java |  28 +++
 .../distributed/GridCacheLockAbstractTest.java  |   2 -
 ...achePartitionedNearDisabledLockSelfTest.java |  47 +++++
 .../near/NoneRebalanceModeSelfTest.java         |  67 ++++++
 .../GridCacheReplicatedLockSelfTest.java        |   5 +
 .../GridCacheLocalIsolatedNodesSelfTest.java    |  18 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |  46 +++-
 .../discovery/tcp/TcpDiscoveryRestartTest.java  | 199 +++++++++++++++++
 .../IgniteCacheDataStructuresSelfTestSuite.java |   3 +
 .../testsuites/IgniteCacheTestSuite2.java       |   2 +
 .../testsuites/IgniteCacheTestSuite4.java       |   4 +
 .../scalar/tests/ScalarCacheQueriesSpec.scala   | 154 +++++++-------
 .../ignite/scalar/tests/ScalarCacheSpec.scala   |  23 +-
 .../scalar/tests/ScalarConversionsSpec.scala    |  43 ++--
 .../scalar/tests/ScalarProjectionSpec.scala     | 128 ++++++-----
 .../scalar/tests/ScalarReturnableSpec.scala     |  41 ++--
 modules/visor-console/pom.xml                   |   2 +-
 .../ignite/visor/VisorRuntimeBaseSpec.scala     |   2 +-
 .../visor/commands/VisorArgListSpec.scala       |  60 +++---
 .../commands/VisorFileNameCompleterSpec.scala   |  34 +--
 .../commands/ack/VisorAckCommandSpec.scala      |  20 +-
 .../commands/alert/VisorAlertCommandSpec.scala  |  68 +++---
 .../cache/VisorCacheClearCommandSpec.scala      |  48 ++---
 .../commands/cache/VisorCacheCommandSpec.scala  |  66 +++---
 .../config/VisorConfigurationCommandSpec.scala  |   8 +-
 .../cswap/VisorCacheSwapCommandSpec.scala       |  24 +--
 .../deploy/VisorDeployCommandSpec.scala         |  10 +-
 .../disco/VisorDiscoveryCommandSpec.scala       |  46 ++--
 .../events/VisorEventsCommandSpec.scala         |  28 +--
 .../visor/commands/gc/VisorGcCommandSpec.scala  |  30 +--
 .../commands/help/VisorHelpCommandSpec.scala    |  57 ++---
 .../commands/kill/VisorKillCommandSpec.scala    |  58 ++---
 .../commands/log/VisorLogCommandSpec.scala      |  10 +-
 .../commands/mem/VisorMemoryCommandSpec.scala   |  77 ++++---
 .../commands/node/VisorNodeCommandSpec.scala    |  22 +-
 .../commands/open/VisorOpenCommandSpec.scala    |  16 +-
 .../commands/ping/VisorPingCommandSpec.scala    |  16 +-
 .../commands/start/VisorStartCommandSpec.scala  | 126 +++++------
 .../commands/tasks/VisorTasksCommandSpec.scala  | 112 +++++-----
 .../commands/top/VisorTopologyCommandSpec.scala |  52 ++---
 .../commands/vvm/VisorVvmCommandSpec.scala      |  30 +--
 81 files changed, 2320 insertions(+), 1115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc46ec2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index e8b5a92,9678b87..f32a991
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@@ -1397,9 -1455,9 +1458,9 @@@ public class TcpClientDiscoverySpi exte
  
                      if (node != null && node.visible()) {
                          try {
 -                            Serializable msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader());
 +                            DiscoverySpiCustomMessage msgObj = marsh.unmarshal(msg.messageBytes(),
U.gridClassLoader());
  
-                             notifyDiscovery(EVT_DISCOVERY_CUSTOM_EVT, topVer, node, allNodes(),
msgObj);
+                             notifyDiscovery(EVT_DISCOVERY_CUSTOM_EVT, topVer, node, allVisibleNodes(),
msgObj);
                          }
                          catch (IgniteCheckedException e) {
                              U.error(log, "Failed to unmarshal discovery custom message.",
e);
@@@ -1516,8 -1531,8 +1534,8 @@@
           * @param node Node.
           * @param top Topology snapshot.
           */
-         private void notifyDiscovery(int type, long topVer, ClusterNode node, Collection<ClusterNode>
top,
+         private void notifyDiscovery(int type, long topVer, ClusterNode node, NavigableSet<ClusterNode>
top,
 -            @Nullable Serializable data) {
 +            @Nullable DiscoverySpiCustomMessage data) {
              DiscoverySpiListener lsnr = TcpClientDiscoverySpi.this.lsnr;
  
              if (lsnr != null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc46ec2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc46ec2/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
----------------------------------------------------------------------


Mime
View raw message