You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/03/05 10:02:46 UTC
[01/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-339' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-313 4362085aa -> bc18635a9 (forced update)
Merge branches 'ignite-339' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60e0ecb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60e0ecb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60e0ecb2
Branch: refs/heads/ignite-313
Commit: 60e0ecb2e269e6af2b0c04df2aed6f494657b03c
Parents: 5d3a2be 13e2d1f
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Mar 2 15:59:00 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Mar 2 15:59:00 2015 +0700
----------------------------------------------------------------------
.../store/CacheNodeWithStoreStartup.java | 6 +-
.../store/jdbc/CacheJdbcPersonStore.java | 115 ++++++----------
.../apache/ignite/cache/store/CacheStore.java | 4 +-
.../ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../ignite/cache/store/CacheStoreSession.java | 17 ++-
.../processors/cache/GridCacheStoreManager.java | 6 +-
.../ignite/internal/util/IgniteUtils.java | 90 ++++++++++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++++++++++--------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++++++++++++++++
.../core/src/test/config/store/jdbc/Ignite.xml | 63 +++++++--
.../junits/cache/TestCacheSession.java | 5 +
.../cache/TestThreadLocalCacheSession.java | 5 +
.../ignite/schema/generator/XmlGenerator.java | 8 +-
.../apache/ignite/schema/model/PojoField.java | 11 +-
.../apache/ignite/schema/load/model/Ignite.xml | 133 +++++++++++++-----
.../yardstick/config/ignite-store-config.xml | 15 +-
16 files changed, 521 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
[08/50] [abbrv] incubator-ignite git commit: Improve
IgniteCacheExpiryPolicyAbstractTest.
Posted by yz...@apache.org.
Improve IgniteCacheExpiryPolicyAbstractTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0086e9cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0086e9cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0086e9cd
Branch: refs/heads/ignite-313
Commit: 0086e9cd2ab652d58adc4edf016932388de9686a
Parents: c847e88
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Mar 2 14:23:19 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Mar 2 14:25:02 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheExpiryPolicyAbstractTest.java | 38 ++------------------
1 file changed, 3 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0086e9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 3110cbc..e04659c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -103,23 +103,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
* @throws Exception If failed.
*/
public void testZeroOnUpdate() throws Exception {
- factory = new Factory<ExpiryPolicy>() {
- @Override public ExpiryPolicy create() {
- return new ExpiryPolicy() {
- @Override public Duration getExpiryForCreation() {
- return null;
- }
-
- @Override public Duration getExpiryForAccess() {
- return null;
- }
-
- @Override public Duration getExpiryForUpdate() {
- return Duration.ZERO;
- }
- };
- }
- };
+ factory = new FactoryBuilder.SingletonFactory<>(new TestPolicy(null, 0L, null));
startGrids();
@@ -150,23 +134,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
* @throws Exception If failed.
*/
public void testZeroOnAccess() throws Exception {
- factory = new Factory<ExpiryPolicy>() {
- @Override public ExpiryPolicy create() {
- return new ExpiryPolicy() {
- @Override public Duration getExpiryForCreation() {
- return null;
- }
-
- @Override public Duration getExpiryForAccess() {
- return Duration.ZERO;
- }
-
- @Override public Duration getExpiryForUpdate() {
- return null;
- }
- };
- }
- };
+ factory = new FactoryBuilder.SingletonFactory<>(new TestPolicy(null, null, 0L));
startGrids();
@@ -1087,7 +1055,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
/**
*
*/
- private class TestPolicy implements ExpiryPolicy {
+ private static class TestPolicy implements ExpiryPolicy {
/** */
private Long create;
[29/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-237' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-237' into sprint-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/d33abdba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d33abdba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d33abdba
Branch: refs/heads/ignite-313
Commit: d33abdba733987609f592b046d87209e976ba616
Parents: e5e2a8e f144a89
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Mar 3 11:49:54 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Mar 3 11:49:54 2015 +0300
----------------------------------------------------------------------
.../ClientAbstractMultiThreadedSelfTest.java | 37 +-
.../impl/ClientPartitionAffinitySelfTest.java | 406 -----------
.../ClientAbstractMultiNodeSelfTest.java | 54 +-
.../integration/ClientAbstractSelfTest.java | 8 -
.../ClientTcpUnreachableMultiNodeSelfTest.java | 4 -
.../client/suite/IgniteClientTestSuite.java | 1 -
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../java/org/apache/ignite/cache/GridCache.java | 2 +-
.../CacheConsistentHashAffinityFunction.java | 702 -------------------
.../cache/affinity/consistenthash/package.html | 24 -
.../CacheRendezvousAffinityFunction.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/internal/client/GridClientNode.java | 8 -
.../client/GridClientPartitionAffinity.java | 2 +-
.../client/impl/GridClientNodeImpl.java | 22 -
.../connection/GridClientNioTcpConnection.java | 3 +-
.../processors/cache/GridCacheAttributes.java | 32 +-
.../processors/cache/GridCacheProcessor.java | 29 +-
.../rest/client/message/GridClientNodeBean.java | 23 -
.../top/GridTopologyCommandHandler.java | 8 -
.../cache/VisorCacheAffinityConfiguration.java | 9 +-
.../config/load/dsi-49-server-production.xml | 2 +-
.../GridCacheAffinityBackupsSelfTest.java | 9 -
.../ignite/IgniteCacheAffinitySelfTest.java | 30 +-
...AffinityProcessorConsistentHashSelfTest.java | 31 -
...idCacheConfigurationConsistencySelfTest.java | 46 +-
...ridCacheConfigurationValidationSelfTest.java | 8 +-
.../cache/GridCacheOffHeapSelfTest.java | 12 +-
.../GridCachePartitionedAffinitySpreadTest.java | 16 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 16 +-
.../GridCacheClientModesAbstractSelfTest.java | 4 +-
...dCachePartitionedAffinityFilterSelfTest.java | 6 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../dht/GridCacheColocatedDebugTest.java | 4 +-
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 13 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 13 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 4 +-
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 6 +-
...dCachePartitionedTopologyChangeSelfTest.java | 7 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 5 +-
...ffinityFunctionExcludeNeighborsSelfTest.java | 32 -
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 226 ------
.../GridCachePartitionedFullApiSelfTest.java | 11 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 4 +-
.../capacity/spring-capacity-cache.xml | 2 +-
.../loadtests/colocation/spring-colocation.xml | 2 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 4 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 4 +-
.../ignite/testframework/GridTestUtils.java | 11 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 -
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
.../hibernate/HibernateL2CacheSelfTest.java | 8 +-
.../processors/cache/GridCacheSwapSelfTest.java | 12 +-
73 files changed, 160 insertions(+), 1852 deletions(-)
----------------------------------------------------------------------
[20/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-382' into sprint-2
Posted by yz...@apache.org.
Merge branch 'ignite-382' into sprint-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/3b309f25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b309f25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b309f25
Branch: refs/heads/ignite-313
Commit: 3b309f250e872fff4ea290fb2b8acb7388fadfb2
Parents: 028e446 f252ee4
Author: anovikov <an...@gridgain.com>
Authored: Mon Mar 2 21:48:07 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Mon Mar 2 21:48:07 2015 +0700
----------------------------------------------------------------------
examples/pom-standalone.xml | 2 +-
modules/core/src/main/resources/ignite.properties | 2 +-
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[06/50] [abbrv] incubator-ignite git commit: #ignite-237: remove test
for consistent hash replicaCount.
Posted by yz...@apache.org.
#ignite-237: remove test for consistent hash replicaCount.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a76d70f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a76d70f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a76d70f
Branch: refs/heads/ignite-313
Commit: 5a76d70f99c276f95cfdb4ae97c09341fefc468a
Parents: 5f620d6
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 12:49:56 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 12:49:56 2015 +0300
----------------------------------------------------------------------
.../impl/ClientPartitionAffinitySelfTest.java | 323 -------------------
.../client/suite/IgniteClientTestSuite.java | 1 -
2 files changed, 324 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a76d70f/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
deleted file mode 100644
index 6af1c4c..0000000
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.client.impl;
-
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-/**
- * Client's partitioned affinity tests.
- */
-public class ClientPartitionAffinitySelfTest extends GridCommonAbstractTest {
- /** Hash ID resolver. */
- private static final GridClientPartitionAffinity.HashIdResolver HASH_ID_RSLVR =
- new GridClientPartitionAffinity.HashIdResolver() {
- @Override public Object getHashId(GridClientNode node) {
- return node.nodeId();
- }
- };
-
- /**
- * Test predefined affinity - must be ported to other clients.
- */
- @SuppressWarnings("UnaryPlus")
- public void testPredefined() throws Exception {
- // Use Md5 hasher for this test.
- GridClientPartitionAffinity aff = new GridClientPartitionAffinity();
-
- getTestResources().inject(aff);
-
- aff.setHashIdResolver(HASH_ID_RSLVR);
-
- List<GridClientNode> nodes = new ArrayList<>();
-
- nodes.add(createNode("000ea4cd-f449-4dcb-869a-5317c63bd619", 50));
- nodes.add(createNode("010ea4cd-f449-4dcb-869a-5317c63bd62a", 60));
- nodes.add(createNode("0209ec54-ff53-4fdb-8239-5a3ac1fb31bd", 70));
- nodes.add(createNode("0309ec54-ff53-4fdb-8239-5a3ac1fb31ef", 80));
- nodes.add(createNode("040c9b94-02ae-45a6-9d5c-a066dbdf2636", 90));
- nodes.add(createNode("050c9b94-02ae-45a6-9d5c-a066dbdf2747", 100));
- nodes.add(createNode("0601f916-4357-4cfe-a7df-49d4721690bf", 110));
- nodes.add(createNode("0702f916-4357-4cfe-a7df-49d4721691c0", 120));
-
- Map<Object, Integer> data = new LinkedHashMap<>();
-
- data.put("", 4);
- data.put("asdf", 4);
- data.put("224ea4cd-f449-4dcb-869a-5317c63bd619", 5);
- data.put("fdc9ec54-ff53-4fdb-8239-5a3ac1fb31bd", 2);
- data.put("0f9c9b94-02ae-45a6-9d5c-a066dbdf2636", 2);
- data.put("d8f1f916-4357-4cfe-a7df-49d4721690bf", 7);
- data.put("c77ffeae-78a1-4ee6-a0fd-8d197a794412", 3);
- data.put("35de9f21-3c9b-4f4a-a7d5-3e2c6cb01564", 1);
- data.put("d67eb652-4e76-47fb-ad4e-cd902d9b868a", 7);
-
- data.put(0, 4);
- data.put(1, 7);
- data.put(12, 5);
- data.put(123, 6);
- data.put(1234, 4);
- data.put(12345, 6);
- data.put(123456, 6);
- data.put(1234567, 6);
- data.put(12345678, 0);
- data.put(123456789, 7);
- data.put(1234567890, 7);
- data.put(1234567890L, 7);
- data.put(12345678901L, 2);
- data.put(123456789012L, 1);
- data.put(1234567890123L, 0);
- data.put(12345678901234L, 1);
- data.put(123456789012345L, 6);
- data.put(1234567890123456L, 7);
- data.put(-23456789012345L, 4);
- data.put(-2345678901234L, 1);
- data.put(-234567890123L, 5);
- data.put(-23456789012L, 5);
- data.put(-2345678901L, 7);
- data.put(-234567890L, 4);
- data.put(-234567890, 7);
- data.put(-23456789, 7);
- data.put(-2345678, 0);
- data.put(-234567, 6);
- data.put(-23456, 6);
- data.put(-2345, 6);
- data.put(-234, 7);
- data.put(-23, 5);
- data.put(-2, 4);
-
- data.put(0x80000000, 4);
- data.put(0x7fffffff, 7);
- data.put(0x8000000000000000L, 4);
- data.put(0x7fffffffffffffffL, 4);
-
- data.put(+1.1, 3);
- data.put(-10.01, 4);
- data.put(+100.001, 4);
- data.put(-1000.0001, 4);
- data.put(+1.7976931348623157E+308, 6);
- data.put(-1.7976931348623157E+308, 6);
- data.put(+4.9E-324, 7);
- data.put(-4.9E-324, 7);
-
- boolean ok = true;
-
- for (Map.Entry<Object, Integer> entry : data.entrySet()) {
- UUID exp = nodes.get(entry.getValue()).nodeId();
- UUID act = aff.node(entry.getKey(), nodes).nodeId();
-
- if (exp.equals(act))
- continue;
-
- ok = false;
-
- info("Failed to validate affinity for key '" + entry.getKey() + "' [expected=" + exp +
- ", actual=" + act + ".");
- }
-
- if (ok)
- return;
-
- fail("Client partitioned affinity validation fails.");
- }
-
- /**
- * Test predefined affinity - must be ported to other clients.
- */
- @SuppressWarnings("UnaryPlus")
- public void testPredefinedHashIdResolver() throws Exception {
- // Use Md5 hasher for this test.
- GridClientPartitionAffinity aff = new GridClientPartitionAffinity();
-
- getTestResources().inject(aff);
-
- aff.setHashIdResolver(new GridClientPartitionAffinity.HashIdResolver() {
- @Override public Object getHashId(GridClientNode node) {
- return 1;
- }
- });
-
- List<GridClientNode> nodes = new ArrayList<>();
-
- nodes.add(createNode("000ea4cd-f449-4dcb-869a-5317c63bd619", 50));
- nodes.add(createNode("010ea4cd-f449-4dcb-869a-5317c63bd62a", 60));
- nodes.add(createNode("0209ec54-ff53-4fdb-8239-5a3ac1fb31bd", 70));
- nodes.add(createNode("0309ec54-ff53-4fdb-8239-5a3ac1fb31ef", 80));
- nodes.add(createNode("040c9b94-02ae-45a6-9d5c-a066dbdf2636", 90));
- nodes.add(createNode("050c9b94-02ae-45a6-9d5c-a066dbdf2747", 100));
- nodes.add(createNode("0601f916-4357-4cfe-a7df-49d4721690bf", 110));
- nodes.add(createNode("0702f916-4357-4cfe-a7df-49d4721691c0", 120));
-
- Map<Object, Integer> data = new LinkedHashMap<>();
-
- data.put("", 4);
- data.put("asdf", 3);
- data.put("224ea4cd-f449-4dcb-869a-5317c63bd619", 5);
- data.put("fdc9ec54-ff53-4fdb-8239-5a3ac1fb31bd", 2);
- data.put("0f9c9b94-02ae-45a6-9d5c-a066dbdf2636", 2);
- data.put("d8f1f916-4357-4cfe-a7df-49d4721690bf", 4);
- data.put("c77ffeae-78a1-4ee6-a0fd-8d197a794412", 3);
- data.put("35de9f21-3c9b-4f4a-a7d5-3e2c6cb01564", 4);
- data.put("d67eb652-4e76-47fb-ad4e-cd902d9b868a", 2);
-
- data.put(0, 4);
- data.put(1, 1);
- data.put(12, 7);
- data.put(123, 1);
- data.put(1234, 6);
- data.put(12345, 2);
- data.put(123456, 5);
- data.put(1234567, 4);
- data.put(12345678, 6);
- data.put(123456789, 3);
- data.put(1234567890, 3);
- data.put(1234567890L, 3);
- data.put(12345678901L, 0);
- data.put(123456789012L, 1);
- data.put(1234567890123L, 3);
- data.put(12345678901234L, 5);
- data.put(123456789012345L, 5);
- data.put(1234567890123456L, 7);
- data.put(-23456789012345L, 6);
- data.put(-2345678901234L, 4);
- data.put(-234567890123L, 3);
- data.put(-23456789012L, 0);
- data.put(-2345678901L, 4);
- data.put(-234567890L, 5);
- data.put(-234567890, 3);
- data.put(-23456789, 3);
- data.put(-2345678, 6);
- data.put(-234567, 4);
- data.put(-23456, 5);
- data.put(-2345, 2);
- data.put(-234, 7);
- data.put(-23, 6);
- data.put(-2, 6);
-
- data.put(0x80000000, 7);
- data.put(0x7fffffff, 1);
- data.put(0x8000000000000000L, 7);
- data.put(0x7fffffffffffffffL, 7);
-
- data.put(+1.1, 2);
- data.put(-10.01, 0);
- data.put(+100.001, 2);
- data.put(-1000.0001, 0);
- data.put(+1.7976931348623157E+308, 6);
- data.put(-1.7976931348623157E+308, 1);
- data.put(+4.9E-324, 1);
- data.put(-4.9E-324, 1);
-
- boolean ok = true;
-
- for (Map.Entry<Object, Integer> entry : data.entrySet()) {
- UUID exp = nodes.get(entry.getValue()).nodeId();
- UUID act = aff.node(entry.getKey(), nodes).nodeId();
-
- if (exp.equals(act))
- continue;
-
- ok = false;
-
- info("Failed to validate affinity for key '" + entry.getKey() + "' [expected=" + exp +
- ", actual=" + act + ".");
- }
-
- if (ok)
- return;
-
- fail("Client partitioned affinity validation fails.");
- }
-
- /**
- * Create node with specified node id and replica count.
- *
- * @param nodeId Node id.
- * @param replicaCnt Node partitioned affinity replica count.
- * @return New node with specified node id and replica count.
- */
- private GridClientNode createNode(String nodeId, int replicaCnt) {
- return GridClientNodeImpl.builder()
- .nodeId(UUID.fromString(nodeId))
- .build();
- }
-
- /**
- * Add {@code cnt} nodes into emulated topology.
- *
- * @param cnt Number of nodes to add into emulated topology.
- * @param nodes Client topology.
- * @param srvNodes Server topology.
- */
- private void addNodes(int cnt, Collection<GridClientNode> nodes, Collection<ClusterNode> srvNodes) {
- while (cnt-- > 0) {
- UUID nodeId = UUID.randomUUID();
- int replicaCnt = (int)Math.round(Math.random() * 500) + 1;
-
- nodes.add(GridClientNodeImpl.builder()
- .nodeId(nodeId)
- .build());
-
- ClusterNode srvNode = new TestRichNode(nodeId);
-
- srvNodes.add(srvNode);
- }
- }
-
- /**
- * Rich node stub to use in emulated server topology.
- */
- private static class TestRichNode extends GridTestNode {
- /**
- * Node id.
- */
- private final UUID nodeId;
-
-
- /**
- * Externalizable class requires public no-arg constructor.
- */
- @SuppressWarnings("UnusedDeclaration")
- public TestRichNode() {
- this(UUID.randomUUID());
- }
-
- /**
- * Constructs rich node stub to use in emulated server topology.
- *
- * @param nodeId Node id.
- */
- private TestRichNode(UUID nodeId) {
- this.nodeId = nodeId;
- }
-
- /** {@inheritDoc} */
- @Override public UUID id() {
- return nodeId;
- }
-
- /** {@inheritDoc} */
- @Override public <T> T attribute(String name) {
- return super.attribute(name);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a76d70f/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index d89a960..4785248 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -95,7 +95,6 @@ public class IgniteClientTestSuite extends TestSuite {
suite.addTest(new TestSuite(ClientDefaultCacheSelfTest.class));
suite.addTestSuite(ClientFutureAdapterSelfTest.class);
- suite.addTestSuite(ClientPartitionAffinitySelfTest.class);
suite.addTestSuite(ClientPropertiesConfigurationSelfTest.class);
suite.addTestSuite(ClientConsistentHashSelfTest.class);
suite.addTestSuite(ClientJavaHasherSelfTest.class);
[18/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/028e4463
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/028e4463
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/028e4463
Branch: refs/heads/ignite-313
Commit: 028e44637fe9ff3fe3347d685f7d52422ff1cb0d
Parents: 2511ebe 235758c
Author: anovikov <an...@gridgain.com>
Authored: Mon Mar 2 21:44:49 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Mon Mar 2 21:44:49 2015 +0700
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/IgniteCluster.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[45/50] [abbrv] incubator-ignite git commit: futures: api cleanup
Posted by yz...@apache.org.
futures: api cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/680b0bac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/680b0bac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/680b0bac
Branch: refs/heads/ignite-313
Commit: 680b0bac27ccc159b20e509d6a62ca8fc3631b9a
Parents: 9b2a034
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Mar 4 18:46:24 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Mar 4 18:46:24 2015 +0300
----------------------------------------------------------------------
.../ComputeFibonacciContinuationExample.java | 12 ++--
.../examples/datagrid/CacheApiExample.java | 2 +-
.../examples/ScalarContinuationExample.scala | 12 ++--
.../ignite/internal/IgniteInternalFuture.java | 8 ---
.../util/future/GridFinishedFuture.java | 5 --
.../util/future/GridFinishedFutureEx.java | 5 --
.../internal/util/future/GridFutureAdapter.java | 22 --------
.../util/future/GridFutureAdapterEx.java | 17 ------
.../internal/util/future/IgniteFutureImpl.java | 9 +--
.../visor/cache/VisorCacheClearTask.java | 2 +-
.../org/apache/ignite/lang/IgniteFuture.java | 9 +--
.../internal/GridMultipleJobsSelfTest.java | 2 +-
.../GridTaskFutureImplStopGridSelfTest.java | 2 +-
.../internal/GridTaskListenerSelfTest.java | 2 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 3 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 6 +-
.../util/future/IgniteFutureImplTest.java | 58 +++-----------------
.../loadtests/colocation/GridTestMain.java | 2 +-
...GridJobExecutionLoadTestClientSemaphore.java | 2 +-
...JobExecutionSingleNodeSemaphoreLoadTest.java | 2 +-
.../mergesort/GridMergeSortLoadTask.java | 2 +-
.../GridCacheStoreValueBytesTest.java | 4 +-
.../processors/schedule/ScheduleFutureImpl.java | 22 ++------
.../schedule/GridScheduleSelfTest.java | 4 +-
24 files changed, 41 insertions(+), 173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
index 5665b9e..1dc96e5 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
@@ -138,9 +138,9 @@ public final class ComputeFibonacciContinuationExample {
compute.apply(new FibonacciClosure(nodeFilter), n - 1);
ComputeTaskFuture<BigInteger> futVal = compute.future();
-
+
fut1 = locMap.putIfAbsent(n - 1, futVal);
-
+
if (fut1 == null)
fut1 = futVal;
}
@@ -150,9 +150,9 @@ public final class ComputeFibonacciContinuationExample {
compute.apply(new FibonacciClosure(nodeFilter), n - 2);
ComputeTaskFuture<BigInteger> futVal = compute.<BigInteger>future();
-
+
fut2 = locMap.putIfAbsent(n - 2, futVal);
-
+
if (fut2 == null)
fut2 = futVal;
}
@@ -178,8 +178,8 @@ public final class ComputeFibonacciContinuationExample {
jobCtx.holdcc();
// Attach the same listener to both futures.
- fut1.listenAsync(lsnr);
- fut2.listenAsync(lsnr);
+ fut1.listen(lsnr);
+ fut2.listen(lsnr);
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
index d702555..1bec481 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
@@ -86,7 +86,7 @@ public class CacheApiExample {
IgniteFuture<String> fut = asyncCache.future();
//Asynchronously wait for result.
- fut.listenAsync(new IgniteInClosure<IgniteFuture<String>>() {
+ fut.listen(new IgniteInClosure<IgniteFuture<String>>() {
@Override
public void apply(IgniteFuture<String> fut) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
index 9067918..9a9e666 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
@@ -122,9 +122,9 @@ class FibonacciClosure (
comp.apply(new FibonacciClosure(excludeNodeId), n - 1)
val futVal = comp.future[BigInteger]()
-
+
fut1 = store.putIfAbsent(n - 1, futVal)
-
+
if (fut1 == null)
fut1 = futVal
}
@@ -134,9 +134,9 @@ class FibonacciClosure (
comp.apply(new FibonacciClosure(excludeNodeId), n - 2)
val futVal = comp.future[BigInteger]()
-
+
fut2 = store.putIfAbsent(n - 2, futVal)
-
+
if (fut2 == null)
fut2 = futVal
}
@@ -152,8 +152,8 @@ class FibonacciClosure (
}
// Attach the same listener to both futures.
- fut1.listenAsync(lsnr)
- fut2.listenAsync(lsnr)
+ fut1.listen(lsnr)
+ fut2.listen(lsnr)
// Hold (suspend) job execution.
// It will be resumed in listener above via 'callcc()' call
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
index 6f9be27..ed4a820 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
@@ -172,14 +172,6 @@ public interface IgniteInternalFuture<R> {
public void listenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>> lsnr);
/**
- * Removes given listeners from the future. If no listener is passed in, then all listeners
- * will be removed.
- *
- * @param lsnr Listeners to remove.
- */
- public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>>... lsnr);
-
- /**
* Make a chained future to convert result of this future (when complete) into a new format.
* It is guaranteed that done callback will be called only ONCE.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
index 32924f2..c2f1b89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
@@ -183,11 +183,6 @@ public class GridFinishedFuture<T> implements IgniteInternalFuture<T>, Externali
}
/** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<T>>... lsnr) {
- // No-op.
- }
-
- /** {@inheritDoc} */
@Override public <R> IgniteInternalFuture<R> chain(final IgniteClosure<? super IgniteInternalFuture<T>, R> doneCb) {
GridFutureAdapter<R> fut = new GridFutureAdapter<R>(ctx, syncNotify) {
@Override public String toString() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
index f7eb9d9..84323be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
@@ -165,11 +165,6 @@ public class GridFinishedFutureEx<T> implements IgniteInternalFuture<T>, Externa
lsnr.apply(this);
}
- /** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<T>>... lsnr) {
- // No-op.
- }
-
/**
* @return {@code True} if future failed.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
index 5a7dcdd..4beb89a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -300,28 +300,6 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
}
/** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>>... lsnr) {
- synchronized (mux) {
- if (lsnrs == null)
- return;
-
- if (lsnr == null || lsnr.length == 0)
- lsnrs.clear();
- else {
- // Iterate through the whole list, removing all occurrences, if any.
- for (Iterator<IgniteInClosure<? super IgniteInternalFuture<R>>> it = lsnrs.iterator(); it.hasNext();) {
- IgniteInClosure<? super IgniteInternalFuture<R>> l1 = it.next();
-
- for (IgniteInClosure<? super IgniteInternalFuture<R>> l2 : lsnr)
- // Must be l1.equals(l2), not l2.equals(l1), because of the way listeners are added.
- if (l1.equals(l2))
- it.remove();
- }
- }
- }
- }
-
- /** {@inheritDoc} */
@Override public <T> IgniteInternalFuture<T> chain(final IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb) {
return new ChainFuture<>(ctx, syncNotify, this, doneCb);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
index 4836a90..ccce6e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
@@ -250,23 +250,6 @@ public class GridFutureAdapterEx<R> extends AbstractQueuedSynchronizer implement
}
/** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>>... lsnr) {
- if (lsnr == null || lsnr.length == 0)
- lsnrs.clear();
- else {
- // Iterate through the whole list, removing all occurrences, if any.
- for (Iterator<IgniteInClosure<? super IgniteInternalFuture<R>>> it = lsnrs.iterator(); it.hasNext(); ) {
- IgniteInClosure<? super IgniteInternalFuture<R>> l1 = it.next();
-
- for (IgniteInClosure<? super IgniteInternalFuture<R>> l2 : lsnr)
- // Must be l1.equals(l2), not l2.equals(l1), because of the way listeners are added.
- if (l1.equals(l2))
- it.remove();
- }
- }
- }
-
- /** {@inheritDoc} */
@Override public <T> IgniteInternalFuture<T> chain(final IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb) {
final GridFutureAdapterEx<T> fut = new GridFutureAdapterEx<T>() {
@Override public String toString() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
index ded75ef..028616e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
@@ -91,19 +91,12 @@ public class IgniteFutureImpl<V> implements IgniteFuture<V> {
}
/** {@inheritDoc} */
- @Override public void listenAsync(@Nullable final IgniteInClosure<? super IgniteFuture<V>> lsnr) {
+ @Override public void listen(@Nullable final IgniteInClosure<? super IgniteFuture<V>> lsnr) {
if (lsnr != null)
fut.listenAsync(new InternalFutureListener(lsnr));
}
/** {@inheritDoc} */
- @Override public void stopListenAsync(IgniteInClosure<? super IgniteFuture<V>> lsnr) {
- A.notNull(lsnr, "lsnr");
-
- fut.stopListenAsync(new InternalFutureListener(lsnr));
- }
-
- /** {@inheritDoc} */
@Override public <T> IgniteFuture<T> chain(final IgniteClosure<? super IgniteFuture<V>, T> doneCb) {
IgniteInternalFuture<T> fut0 = fut.chain(new C1<IgniteInternalFuture<V>, T>() {
@Override public T apply(IgniteInternalFuture<V> fut) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
index f341a04..ce725a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
@@ -100,7 +100,7 @@ public class VisorCacheClearTask extends VisorOneNodeTask<String, IgniteBiTuple<
jobCtx.holdcc();
- fut.listenAsync(lsnr);
+ fut.listen(lsnr);
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index 2fcf7f4..79b01e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -153,14 +153,7 @@ public interface IgniteFuture<V> extends Future<V> {
*
* @param lsnr Listener closure to register. If not provided - this method is no-op.
*/
- public void listenAsync(IgniteInClosure<? super IgniteFuture<V>> lsnr);
-
- /**
- * Removes given listener from the future.
- *
- * @param lsnr Listener to remove.
- */
- public void stopListenAsync(IgniteInClosure<? super IgniteFuture<V>> lsnr);
+ public void listen(IgniteInClosure<? super IgniteFuture<V>> lsnr);
/**
* Make a chained future to convert result of this future (when complete) into a new format.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
index 565aaa7..62ade4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
@@ -157,7 +157,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
if (cnt % LOG_MOD == 0)
X.println("Submitted jobs: " + cnt);
- fut.listenAsync(new CIX1<IgniteFuture<Boolean>>() {
+ fut.listen(new CIX1<IgniteFuture<Boolean>>() {
@Override public void applyx(IgniteFuture<Boolean> f) {
try {
assert f.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
index 3718373..f02899f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
@@ -67,7 +67,7 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
try {
final ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridStopTestTask.class.getName(), null);
- fut.listenAsync(new CI1<IgniteFuture>() {
+ fut.listen(new CI1<IgniteFuture>() {
@SuppressWarnings({"NakedNotify"})
@Override public void apply(IgniteFuture gridFut) {
synchronized (mux) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
index 351eeac..dd9cb9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
@@ -63,7 +63,7 @@ public class GridTaskListenerSelfTest extends GridCommonAbstractTest {
ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), TestTask.class.getName(), null);
- fut.listenAsync(lsnr);
+ fut.listen(lsnr);
fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
index a199619..545447d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
@@ -65,7 +64,7 @@ public class GridCacheAsyncOperationsLimitSelfTest extends GridCacheAbstractSelf
IgniteFuture<?> fut = cacheAsync.future();
- fut.listenAsync(new CI1<IgniteFuture<?>>() {
+ fut.listen(new CI1<IgniteFuture<?>>() {
@Override public void apply(IgniteFuture<?> t) {
cnt.decrementAndGet();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 9d2fe99..90aa7ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -259,7 +259,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
resQueue.put(fut); // Blocks if queue is full.
- fut.listenAsync(new CI1<IgniteFuture<Void>>() {
+ fut.listen(new CI1<IgniteFuture<Void>>() {
@Override public void apply(IgniteFuture<Void> f) {
ComputeTaskFuture<?> taskFut = (ComputeTaskFuture<?>)f;
@@ -431,7 +431,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
resQueue.put(fut); // Blocks if queue is full.
- fut.listenAsync(new CI1<IgniteFuture<Void>>() {
+ fut.listen(new CI1<IgniteFuture<Void>>() {
@Override public void apply(IgniteFuture<Void> f) {
ComputeTaskFuture<?> taskFut = (ComputeTaskFuture<?>)f;
@@ -482,7 +482,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
resQueue.put(fut); // Blocks if queue is full.
- fut.listenAsync(new CI1<IgniteFuture<Void>>() {
+ fut.listen(new CI1<IgniteFuture<Void>>() {
@Override public void apply(IgniteFuture<Void> f) {
ComputeTaskFuture<?> taskFut = (ComputeTaskFuture<?>)f;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
index d57ed8e..d782d32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
@@ -189,8 +189,8 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
assertFalse(fut.isDone());
- fut.listenAsync(lsnr1);
- fut.listenAsync(lsnr2);
+ fut.listen(lsnr1);
+ fut.listen(lsnr2);
U.sleep(100);
@@ -201,50 +201,6 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
assertEquals(1, lsnr1Cnt.get());
assertEquals(1, lsnr2Cnt.get());
-
- lsnr1Cnt.set(0);
- lsnr2Cnt.set(0);
-
- // Stop one listener.
- {
- fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
-
- fut = new IgniteFutureImpl<>(fut0);
-
- fut.syncNotify(true);
-
- fut.listenAsync(lsnr1);
- fut.listenAsync(lsnr2);
-
- fut.stopListenAsync(lsnr2);
-
- fut0.onDone("test");
-
- assertEquals(1, lsnr1Cnt.get());
- assertEquals(0, lsnr2Cnt.get());
-
- lsnr1Cnt.set(0);
- }
-
- // Stop both listeners.
- {
- fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
-
- fut = new IgniteFutureImpl<>(fut0);
-
- fut.syncNotify(true);
-
- fut.listenAsync(lsnr1);
- fut.listenAsync(lsnr2);
-
- fut.stopListenAsync(lsnr2);
- fut.stopListenAsync(lsnr1);
-
- fut0.onDone("test");
-
- assertEquals(0, lsnr1Cnt.get());
- assertEquals(0, lsnr2Cnt.get());
- }
}
/**
@@ -277,7 +233,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
};
- fut.listenAsync(lsnr1);
+ fut.listen(lsnr1);
fut0.onDone(err0);
@@ -310,7 +266,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
};
- fut.listenAsync(lsnr1);
+ fut.listen(lsnr1);
fut0.onDone(err0);
@@ -342,7 +298,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
final AtomicInteger lsnrCnt = new AtomicInteger();
- chained.listenAsync(new CI1<IgniteFuture<Integer>>() {
+ chained.listen(new CI1<IgniteFuture<Integer>>() {
@Override public void apply(IgniteFuture<Integer> fut) {
assertEquals(10, (int)fut.get());
@@ -422,7 +378,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
};
- chained.listenAsync(lsnr1);
+ chained.listen(lsnr1);
fut0.onDone(err0);
@@ -496,7 +452,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
};
- chained.listenAsync(lsnr1);
+ chained.listen(lsnr1);
fut0.onDone(err0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
index e8ffedf..892f405 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
@@ -97,7 +97,7 @@ public class GridTestMain {
q.put(f);
- f.listenAsync(new CI1<IgniteFuture<?>>() {
+ f.listen(new CI1<IgniteFuture<?>>() {
@Override public void apply(IgniteFuture<?> o) {
q.poll();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
index 9ddc91d..327e2da 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
@@ -74,7 +74,7 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object>
ComputeTaskFuture<Object> f = comp.future();
- f.listenAsync(lsnr);
+ f.listen(lsnr);
txCnt.increment();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
index e8d7a13..d1665b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
@@ -180,7 +180,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest {
ComputeTaskFuture<Object> f = comp.future();
- f.listenAsync(lsnr);
+ f.listen(lsnr);
iterCntr.increment();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
index 34c8fb9..9e73c71 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
@@ -77,7 +77,7 @@ public class GridMergeSortLoadTask extends ComputeTaskSplitAdapter<int[], int[]>
// Add a listener to the future, that will resume the
// parent task once the child one is completed.
- fut.listenAsync(new CI1<IgniteFuture<int[]>>() {
+ fut.listen(new CI1<IgniteFuture<int[]>>() {
@Override public void apply(IgniteFuture<int[]> fut) {
// CONTINUATION:
// =============
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
index 05fd5f8..3cf96d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
@@ -18,8 +18,6 @@
package org.apache.ignite.storevalbytes;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
@@ -238,7 +236,7 @@ public class GridCacheStoreValueBytesTest {
IgniteFuture<Object> f = asyncCache.future();
- f.listenAsync(lsnr);
+ f.listen(lsnr);
cntr.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
index 34284ac..409915a 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
@@ -582,7 +582,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
+ @Override public void listen(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
if (lsnr != null) {
Throwable err;
R res;
@@ -612,15 +612,6 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
- A.notNull(lsnr, "lsnr");
-
- synchronized (mux) {
- lsnrs.remove(lsnr);
- }
- }
-
- /** {@inheritDoc} */
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
@Override public <T> IgniteFuture<T> chain(final IgniteClosure<? super IgniteFuture<R>, T> doneCb) {
final GridFutureAdapter<T> fut = new GridFutureAdapter<T>(ctx, syncNotify) {
@@ -629,7 +620,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
};
- listenAsync(new CI1<IgniteFuture<R>>() {
+ listen(new CI1<IgniteFuture<R>>() {
@Override public void apply(IgniteFuture<R> fut0) {
try {
fut.onDone(doneCb.apply(fut0));
@@ -964,13 +955,8 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
- ref.listenAsync(lsnr);
- }
-
- /** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
- ref.stopListenAsync(lsnr);
+ @Override public void listen(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
+ ref.listen(lsnr);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/680b0bac/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
index c9444bf..c887b2d 100644
--- a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
+++ b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
@@ -113,7 +113,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
final AtomicInteger notifyCnt = new AtomicInteger();
- fut.listenAsync(new CI1<IgniteFuture<?>>() {
+ fut.listen(new CI1<IgniteFuture<?>>() {
@Override public void apply(IgniteFuture<?> e) {
notifyCnt.incrementAndGet();
}
@@ -171,7 +171,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
final AtomicInteger notifyCnt = new AtomicInteger();
- fut.listenAsync(new CI1<IgniteFuture<?>>() {
+ fut.listen(new CI1<IgniteFuture<?>>() {
@Override public void apply(IgniteFuture<?> e) {
notifyCnt.incrementAndGet();
}
[35/50] [abbrv] incubator-ignite git commit: # sprint-2 Fixed replace
in build script.
Posted by yz...@apache.org.
# sprint-2 Fixed replace in build script.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be3c24cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be3c24cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be3c24cd
Branch: refs/heads/ignite-313
Commit: be3c24cd3fd4a9aaf9a6922eac7bc56b5f85473c
Parents: c4030f9
Author: anovikov <an...@gridgain.com>
Authored: Wed Mar 4 14:34:50 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Wed Mar 4 14:34:50 2015 +0700
----------------------------------------------------------------------
pom.xml | 49 ++++---------------------------------------------
1 file changed, 4 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be3c24cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b176b10..b561aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1121,38 +1121,6 @@
<configuration>
<target>
<replaceregexp byline="true">
- <regexp pattern='pushd "%~dp0"/\.\./\.\.(\s*&::.+)?'/>
- <substitution expression='pushd "%~dp0"/..'/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
- <regexp pattern='IGNITE_HOME_TMP="\$\(dirname "\$\{IGNITE_HOME_TMP\}"\)"(\s*#.*)?'/>
- <substitution expression=""/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
- <regexp pattern='set SCRIPTS_HOME=%IGNITE_HOME%\\os\\bin(\s*&::.*)?'/>
- <substitution expression='set SCRIPTS_HOME=%IGNITE_HOME%\\\\bin'/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
- <regexp pattern='SCRIPTS_HOME="\$\{IGNITE_HOME_TMP\}/os/bin"(\s*#.*)?'/>
- <substitution expression='SCRIPTS_HOME="$${IGNITE_HOME_TMP}/bin"'/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
<regexp pattern='\. "\$\{SCRIPTS_HOME\}"/include/target-classpath.sh(\s*#.*)?'/>
<substitution expression=""/>
<fileset dir="${basedir}/target/release-package/bin">
@@ -1184,23 +1152,14 @@
</fileset>
</replaceregexp>
- <replace token="@sh.file.version" value="${ignite.version}">
+ <replaceregexp byline="true">
+ <regexp pattern='-DIGNITE_UPDATE_NOTIFIER=false'/>
+ <substitution expression=""/>
<fileset dir="${basedir}/target/release-package/bin">
<include name="**/*.sh"/>
- </fileset>
- </replace>
-
- <replace token="@bat.file.version" value="${ignite.version}">
- <fileset dir="${basedir}/target/release-package/bin">
<include name="**/*.bat"/>
</fileset>
- </replace>
-
- <replace token="@xml.file.version" value="${ignite.version}">
- <fileset dir="${basedir}/target/release-package">
- <include name="**/*.xml"/>
- </fileset>
- </replace>
+ </replaceregexp>
<zip destfile="${basedir}/target/ignite-${ignite.edition}-${ignite.version}.zip"
encoding="UTF-8">
[04/50] [abbrv] incubator-ignite git commit: #ignite-239: remove
replicaCount from GridClientNode and GridClientNodeBean.
Posted by yz...@apache.org.
#ignite-239: remove replicaCount from GridClientNode and GridClientNodeBean.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f620d62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f620d62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f620d62
Branch: refs/heads/ignite-313
Commit: 5f620d62191188ff4dcbe55c5d0399603e494b45
Parents: 6c67bdf
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 12:40:13 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 12:40:13 2015 +0300
----------------------------------------------------------------------
.../impl/ClientPartitionAffinitySelfTest.java | 4 +---
.../ClientTcpUnreachableMultiNodeSelfTest.java | 4 ----
.../ignite/internal/client/GridClientNode.java | 8 -------
.../client/GridClientPartitionAffinity.java | 2 +-
.../client/impl/GridClientNodeImpl.java | 22 -------------------
.../connection/GridClientNioTcpConnection.java | 3 +--
.../rest/client/message/GridClientNodeBean.java | 23 --------------------
7 files changed, 3 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
index 7ece534..6af1c4c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
@@ -152,7 +152,7 @@ public class ClientPartitionAffinitySelfTest extends GridCommonAbstractTest {
aff.setHashIdResolver(new GridClientPartitionAffinity.HashIdResolver() {
@Override public Object getHashId(GridClientNode node) {
- return node.replicaCount();
+ return 1;
}
});
@@ -258,7 +258,6 @@ public class ClientPartitionAffinitySelfTest extends GridCommonAbstractTest {
private GridClientNode createNode(String nodeId, int replicaCnt) {
return GridClientNodeImpl.builder()
.nodeId(UUID.fromString(nodeId))
- .replicaCount(replicaCnt)
.build();
}
@@ -276,7 +275,6 @@ public class ClientPartitionAffinitySelfTest extends GridCommonAbstractTest {
nodes.add(GridClientNodeImpl.builder()
.nodeId(nodeId)
- .replicaCount(replicaCnt)
.build());
ClusterNode srvNode = new TestRichNode(nodeId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
index bb3710e..fda7e99 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
@@ -85,10 +85,6 @@ public class ClientTcpUnreachableMultiNodeSelfTest extends ClientTcpMultiNodeSel
return node.caches();
}
- @Override public int replicaCount() {
- return node.replicaCount();
- }
-
@Override public List<String> tcpAddresses() {
return node.tcpAddresses();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
index ac2fe86..74e612d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
@@ -99,14 +99,6 @@ public interface GridClientNode {
public Map<String, GridClientCacheMode> caches();
/**
- * Gets node replica count for consistent hash ring (valid only for
- * {@code PARTITIONED} caches).
- *
- * @return Node replica count for consistent hash ring.
- */
- public int replicaCount();
-
- /**
* Gets collection of addresses on which REST binary protocol is bound.
*
* @param proto Protocol for which addresses are obtained.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
index a0fad61..b747bc4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
@@ -274,7 +274,7 @@ public class GridClientPartitionAffinity implements GridClientDataAffinity, Grid
nodeInfo = new NodeInfo(nodeId, hashIdRslvr == null ? nodeId : hashIdRslvr.getHashId(n));
addedNodes.put(nodeId, nodeInfo);
- nodeHash.addNode(nodeInfo, n.replicaCount());
+ nodeHash.addNode(nodeInfo, 1);
return nodeInfo;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
index 6692550..9c59b84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
@@ -53,9 +53,6 @@ public class GridClientNodeImpl implements GridClientNode {
/** Node caches. */
private Map<String, GridClientCacheMode> caches = Collections.emptyMap();
- /** Replica count for partitioned cache. */
- private int replicaCnt;
-
/** Connectable property. */
private boolean connectable;
@@ -95,7 +92,6 @@ public class GridClientNodeImpl implements GridClientNode {
.tcpAddresses(from.tcpAddresses())
.tcpPort(from.tcpPort())
.caches(from.caches())
- .replicaCount(from.replicaCount())
.connectable(from.connectable());
if (!skipAttrs)
@@ -154,11 +150,6 @@ public class GridClientNodeImpl implements GridClientNode {
}
/** {@inheritDoc} */
- @Override public int replicaCount() {
- return replicaCnt;
- }
-
- /** {@inheritDoc} */
@Override public Collection<InetSocketAddress> availableAddresses(GridClientProtocol proto,
boolean filterResolved) {
Collection<String> addrs;
@@ -368,19 +359,6 @@ public class GridClientNodeImpl implements GridClientNode {
return this;
}
-
- /**
- * Sets replica count for node on consistent hash ring.
- *
- * @param replicaCnt Replica count.
- * @return This for chaining.
- */
- public Builder replicaCount(int replicaCnt) {
- impl.replicaCnt = replicaCnt;
-
- return this;
- }
-
/**
* Sets connectable property.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index d84bca5..44d10f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
@@ -868,8 +868,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
.nodeId(nodeBean.getNodeId())
.consistentId(nodeBean.getConsistentId())
.tcpAddresses(nodeBean.getTcpAddresses())
- .tcpPort(nodeBean.getTcpPort())
- .replicaCount(nodeBean.getReplicaCount());
+ .tcpPort(nodeBean.getTcpPort());
Map<String, GridClientCacheMode> caches = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
index 6605a15..833abd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
@@ -56,9 +56,6 @@ public class GridClientNodeBean implements Externalizable {
/** Node caches. */
private Map<String, String> caches;
- /** Default replica count for partitioned cache. */
- private int replicaCnt;
-
/**
* Gets node ID.
*
@@ -209,24 +206,6 @@ public class GridClientNodeBean implements Externalizable {
}
/**
- * Gets node replica count on consistent hash ring.
- *
- * @return Node replica count.
- */
- public int getReplicaCount() {
- return replicaCnt;
- }
-
- /**
- * Sets node replica count on consistent hash ring.
- *
- * @param replicaCnt Node replica count.
- */
- public void setReplicaCount(int replicaCnt) {
- this.replicaCnt = replicaCnt;
- }
-
- /**
* Sets REST binary protocol port.
*
* @param tcpPort Port on which REST binary protocol is bound.
@@ -257,7 +236,6 @@ public class GridClientNodeBean implements Externalizable {
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(tcpPort);
out.writeInt(0); // Jetty port.
- out.writeInt(replicaCnt);
U.writeString(out, dfltCacheMode);
@@ -279,7 +257,6 @@ public class GridClientNodeBean implements Externalizable {
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
tcpPort = in.readInt();
in.readInt(); // Jetty port.
- replicaCnt = in.readInt();
dfltCacheMode = U.readString(in);
[33/50] [abbrv] incubator-ignite git commit: # sprint-2 - removing
gridgain.com.
Posted by yz...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/test/resources/log/ignite.log.tst
----------------------------------------------------------------------
diff --git a/modules/core/src/test/resources/log/ignite.log.tst b/modules/core/src/test/resources/log/ignite.log.tst
deleted file mode 100644
index ea74097..0000000
--- a/modules/core/src/test/resources/log/ignite.log.tst
+++ /dev/null
@@ -1,13706 +0,0 @@
-[14:14:22,515][INFO ][main][GridListenActorSelfTest]
-
->>> _____ _ _______ _
->>> / ___/____(_)___/ / ___/___ _(_)___
->>> / (_ // __/ // _ / (_ // _ `/ // _ \
->>> \___//_/ /_/ \_,_/\___/ \_,_/_//_//_/
->>>
->>> ---==++ IN-MEMORY BIG DATA ++==---
->>> ver. x.x.x-DDMMYYYY
->>> Copyright (C) 2012 GridGain Systems
-
-[14:14:22,515][INFO ][main][GridListenActorSelfTest] << Enterprise Edition >>
-[14:14:22,516][INFO ][main][GridListenActorSelfTest] Config URL: n/a
-[14:14:22,516][INFO ][main][GridListenActorSelfTest] Daemon mode: off
-[14:14:22,516][INFO ][main][GridListenActorSelfTest] Language runtime: Java Platform API Specification ver. 1.6
-[14:14:22,516][INFO ][main][GridListenActorSelfTest] JVM name: Java HotSpot(TM) 64-Bit Server VM
-[14:14:22,516][INFO ][main][GridListenActorSelfTest] Remote Management [restart: off, REST: on, JMX (remote: off)]
-[14:14:22,516][INFO ][main][GridListenActorSelfTest] GRIDGAIN_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2
-[14:14:22,516][INFO ][main][GridListenActorSelfTest] VM arguments: [-ea, -XX:MaxPermSize=128m, -Xms512m, -Xmx1024m, -Duser.name=bamboo, -DGRIDGAIN_UPDATE_NOTIFIER=false, -DGRIDGAIN_DISABLED=true, -DGRIDGAIN_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -DGRIDGAIN_STABLE_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -DGRIDGAIN_ROUTER_PREFER_REMOTE=true, -DGRIDGAIN_NO_DISCO_ORDER=true, -DGRIDGAIN_QUIET=false, -DGG_TEST_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dteamcity.build.id=34324, -Dteamcity.buildType.id=bt5, -Dagent.ownPort=9090, -Dteamcity.build.checkoutDir=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dteamcity.build.workingDir=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dagent.work.dir=/usr/local/TeamCityAgent/work, -Dagent.name=teamcity-4, -Dagent.home.dir=/usr/local/TeamCityAgent, -Dteamcity.runtime.props.file=/usr/local/TeamCityAgent/temp/agentTmp/ant2684847485530994862runtime]
-[14:14:22,517][WARN ][main][GridListenActorSelfTest] SMTP is not configured - email notifications are off.
-[14:14:22,517][WARN ][main][GridListenActorSelfTest] Cache is not configured - data grid is off.
-[14:14:22,521][INFO ][main][GridListenActorSelfTest] 3-rd party licenses can be found at: /usr/local/TeamCityAgent/work/d46fc9c3d71112c2/libs/licenses
-[14:14:22,522][INFO ][main][GridListenActorSelfTest] Non-loopback local IPs: fe80:0:0:0:ca60:ff:fe68:582c%2, 192.168.2.14
-[14:14:22,522][INFO ][main][GridListenActorSelfTest] Enabled local MACs: C8600068582C
-[14:14:23,112][INFO ][main][GridJdkLocalMetricsSpi] Hyperic Sigar 'CpuPerc.getCombined()' method will be used to detect average CPU load.
-[14:14:23,165][INFO ][main][GridTcpCommunicationSpi] Successfully bound to TCP port [port=45010, locHost=/192.168.2.14]
-[14:14:23,462][INFO ][main][GridListenActorSelfTest] Security status [authentication=on, secure-session=on]
-[14:14:23,504][WARN ][main][GridMulticastDiscoverySpi] Heartbeat frequency is too low (at least 2000 ms): 1000
-[14:14:23,505][INFO ][main][GridMulticastDiscoverySpi] Successfully bound to TCP port: 55010
-[14:14:23,507][INFO ][main][GridMulticastDiscoverySpi] Successfully bound to Multicast port: 50001
-[14:14:23,516][INFO ][main][GridMulticastDiscoverySpi] Local node: GridMulticastDiscoveryNode [id=353d63b5-a2f0-41d1-a30e-37016f357233, state=READY, lastHeartbeat=1353320063506, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55010, startTime=1353320063496]
-[14:14:23,526][INFO ][main][GridDiscoveryManager] Topology snapshot [nodes=1, CPUs=4, hash=0x8C20EE0]
-[14:14:23,529][INFO ][main][GridMulticastDiscoverySpi] Waiting for initial heartbeat timeout (1000 ms)
-[14:14:24,707][INFO ][main][GridJettyRestProtocol] Command protocol successfully started: Jetty REST
-[14:14:24,720][INFO ][main][GridTcpRestProtocol] Command protocol successfully started: TCP binary
-[14:14:24,721][INFO ][main][GridLicenseControllerImpl] Licensed to 'GridGain Systems, Internal Development Only' on Feb 3, 2011
-[14:14:24,721][INFO ][main][GridLicenseControllerImpl] License [ID=7D5CB773-225C-4165-8162-3BB67337894B, type=ENT]
-[14:14:24,721][INFO ][main][GridLicenseControllerImpl] License limits [expire-date: never]
-[14:14:24,740][INFO ][main][GridListenActorSelfTest]
-
->>> +--------------------------+
->>> GridGain ver. x.x.x-DDMMYYYY
->>> +--------------------------+
->>> OS name: Linux 2.6.32-38-generic amd64
->>> OS user: bamboo
->>> CPU(s): 4
->>> VM information: Java(TM) SE Runtime Environment 1.6.0_30-b12 Sun Microsystems Inc. Java HotSpot(TM) 64-Bit Server VM 20.5-b03
->>> VM name: 573@gg-teamcity-4
->>> Grid name: kernal.GridListenActorSelfTest
->>> Local node [ID=353D63B5-A2F0-41D1-A30E-37016F357233, order=1353320063496]
->>> Local node addresses: [192.168.2.14]
->>> Local ports: TCP:8080 TCP:11211 TCP:45010 UDP:50001 TCP:55010
->>> GridGain documentation: http://www.gridgain.com/product.html
-
-[14:14:24,740][INFO ][main][GridListenActorSelfTest] >>> Starting test: testListenByClosure <<<
-[14:14:26,895][INFO ][main][GridListenActorSelfTest] >>> Stopping test: testListenByClosure in 2155 ms <<<
-[14:14:26,902][INFO ][main][GridListenActorSelfTest] >>> Starting test: testBasicFlow <<<
-[14:14:28,919][INFO ][main][GridListenActorSelfTest] >>> Stopping test: testBasicFlow in 2016 ms <<<
-[14:14:28,925][INFO ][main][GridListenActorSelfTest] >>> Starting test: testImmediateStop <<<
-[14:14:30,930][INFO ][main][GridListenActorSelfTest] >>> Stopping test: testImmediateStop in 2005 ms <<<
-[14:14:30,938][INFO ][main][GridListenActorSelfTest] >>> Starting test: testReceiveAll <<<
-[14:14:32,948][INFO ][main][GridListenActorSelfTest] >>> Stopping test: testReceiveAll in 2010 ms <<<
-[14:14:32,956][INFO ][main][GridListenActorSelfTest] >>> Starting test: testRespondToRemote <<<
-[14:14:32,960][INFO ][test-runner][GridListenActorSelfTest1]
-
->>> _____ _ _______ _
->>> / ___/____(_)___/ / ___/___ _(_)___
->>> / (_ // __/ // _ / (_ // _ `/ // _ \
->>> \___//_/ /_/ \_,_/\___/ \_,_/_//_//_/
->>>
->>> ---==++ IN-MEMORY BIG DATA ++==---
->>> ver. x.x.x-DDMMYYYY
->>> Copyright (C) 2012 GridGain Systems
-
-[14:14:32,960][INFO ][test-runner][GridListenActorSelfTest1] << Enterprise Edition >>
-[14:14:32,960][INFO ][test-runner][GridListenActorSelfTest1] Config URL: n/a
-[14:14:32,960][INFO ][test-runner][GridListenActorSelfTest1] Daemon mode: off
-[14:14:32,961][INFO ][test-runner][GridListenActorSelfTest1] Language runtime: Java Platform API Specification ver. 1.6
-[14:14:32,961][INFO ][test-runner][GridListenActorSelfTest1] JVM name: Java HotSpot(TM) 64-Bit Server VM
-[14:14:32,961][INFO ][test-runner][GridListenActorSelfTest1] Remote Management [restart: off, REST: on, JMX (remote: off)]
-[14:14:32,961][INFO ][test-runner][GridListenActorSelfTest1] GRIDGAIN_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2
-[14:14:32,961][INFO ][test-runner][GridListenActorSelfTest1] VM arguments: [-ea, -XX:MaxPermSize=128m, -Xms512m, -Xmx1024m, -Duser.name=bamboo, -DGRIDGAIN_UPDATE_NOTIFIER=false, -DGRIDGAIN_DISABLED=true, -DGRIDGAIN_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -DGRIDGAIN_STABLE_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -DGRIDGAIN_ROUTER_PREFER_REMOTE=true, -DGRIDGAIN_NO_DISCO_ORDER=true, -DGRIDGAIN_QUIET=false, -DGG_TEST_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dteamcity.build.id=34324, -Dteamcity.buildType.id=bt5, -Dagent.ownPort=9090, -Dteamcity.build.checkoutDir=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dteamcity.build.workingDir=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dagent.work.dir=/usr/local/TeamCityAgent/work, -Dagent.name=teamcity-4, -Dagent.home.dir=/usr/local/TeamCityAgent, -Dteamcity.runtime.props.file=/usr/local/TeamCityAgent/temp/agentTmp/ant2684847485530994862runtime]
-[14:14:32,961][WARN ][test-runner][GridListenActorSelfTest1] SMTP is not configured - email notifications are off.
-[14:14:32,961][WARN ][test-runner][GridListenActorSelfTest1] Cache is not configured - data grid is off.
-[14:14:32,964][INFO ][test-runner][GridListenActorSelfTest1] 3-rd party licenses can be found at: /usr/local/TeamCityAgent/work/d46fc9c3d71112c2/libs/licenses
-[14:14:32,965][INFO ][test-runner][GridListenActorSelfTest1] Non-loopback local IPs: fe80:0:0:0:ca60:ff:fe68:582c%2, 192.168.2.14
-[14:14:32,966][INFO ][test-runner][GridListenActorSelfTest1] Enabled local MACs: C8600068582C
-[14:14:33,480][INFO ][test-runner][GridJdkLocalMetricsSpi] Hyperic Sigar 'CpuPerc.getCombined()' method will be used to detect average CPU load.
-[14:14:33,499][INFO ][test-runner][GridTcpCommunicationSpi] Successfully bound to TCP port [port=45011, locHost=/192.168.2.14]
-[14:14:33,559][INFO ][test-runner][GridListenActorSelfTest1] Security status [authentication=on, secure-session=on]
-[14:14:33,565][WARN ][test-runner][GridMulticastDiscoverySpi] Heartbeat frequency is too low (at least 2000 ms): 1000
-[14:14:33,566][INFO ][test-runner][GridMulticastDiscoverySpi] Successfully bound to TCP port: 55011
-[14:14:33,566][INFO ][test-runner][GridMulticastDiscoverySpi] Successfully bound to Multicast port: 50001
-[14:14:33,567][INFO ][test-runner][GridMulticastDiscoverySpi] Local node: GridMulticastDiscoveryNode [id=1f7e8040-8a17-4e14-a513-1709bebe265b, state=READY, lastHeartbeat=1353320073559, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55011, startTime=1353320073559]
-[14:14:33,568][INFO ][test-runner][GridDiscoveryManager] Topology snapshot [nodes=1, CPUs=4, hash=0xAB3F3CCB]
-[14:14:33,568][INFO ][test-runner][GridMulticastDiscoverySpi] Waiting for initial heartbeat timeout (1000 ms)
-[14:14:33,637][INFO ][disco-event-worker-#15%kernal.GridListenActorSelfTest%][GridDiscoveryManager] Added new node to topology: GridMulticastDiscoveryNode [id=1f7e8040-8a17-4e14-a513-1709bebe265b, state=READY, lastHeartbeat=1353320073570, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55011, startTime=1353320073559]
-[14:14:33,637][INFO ][disco-event-worker-#55%kernal.GridListenActorSelfTest1%][GridDiscoveryManager] Added new node to topology: GridMulticastDiscoveryNode [id=353d63b5-a2f0-41d1-a30e-37016f357233, state=READY, lastHeartbeat=1353320073600, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55010, startTime=1353320063496]
-[14:14:33,638][INFO ][disco-event-worker-#15%kernal.GridListenActorSelfTest%][GridDiscoveryManager] Topology snapshot [nodes=2, CPUs=4, hash=0x93B555F6]
-[14:14:34,571][INFO ][disco-event-worker-#55%kernal.GridListenActorSelfTest1%][GridDiscoveryManager] Topology snapshot [nodes=2, CPUs=4, hash=0x93B555F6]
-[14:14:35,650][WARN ][test-runner][GridJettyRestProtocol] Jetty failed to start (retrying every 3000 ms). Another node on this host?
-[14:14:35,651][WARN ][test-runner][GridTcpRestProtocol] TCP binary REST server failed to start (retrying every 3000 ms). Another node on this host?
-[14:14:35,652][INFO ][test-runner][GridLicenseControllerImpl] Licensed to 'GridGain Systems, Internal Development Only' on Feb 3, 2011
-[14:14:35,652][INFO ][test-runner][GridLicenseControllerImpl] License [ID=7D5CB773-225C-4165-8162-3BB67337894B, type=ENT]
-[14:14:35,652][INFO ][test-runner][GridLicenseControllerImpl] License limits [expire-date: never]
-[14:14:35,667][INFO ][test-runner][GridListenActorSelfTest1]
-
->>> +--------------------------+
->>> GridGain ver. x.x.x-DDMMYYYY
->>> +--------------------------+
->>> OS name: Linux 2.6.32-38-generic amd64
->>> OS user: bamboo
->>> CPU(s): 4
->>> VM information: Java(TM) SE Runtime Environment 1.6.0_30-b12 Sun Microsystems Inc. Java HotSpot(TM) 64-Bit Server VM 20.5-b03
->>> VM name: 573@gg-teamcity-4
->>> Grid name: kernal.GridListenActorSelfTest1
->>> Local node [ID=1F7E8040-8A17-4E14-A513-1709BEBE265B, order=1353320073559]
->>> Local node addresses: [192.168.2.14]
->>> Local ports: TCP:45011 UDP:50001 TCP:55011
->>> GridGain documentation: http://www.gridgain.com/product.html
-
-[14:14:36,672][INFO ][test-runner][GridListenActorSelfTest] >>> Stopping grid [name=kernal.GridListenActorSelfTest1, id=1f7e8040-8a17-4e14-a513-1709bebe265b]
-[14:14:36,674][INFO ][test-runner][GridJettyRestProtocol] Command protocol successfully stopped: Jetty REST
-[14:14:36,674][INFO ][test-runner][GridTcpRestProtocol] Command protocol successfully stopped: TCP binary
-[14:14:36,679][INFO ][disco-event-worker-#15%kernal.GridListenActorSelfTest%][GridDiscoveryManager] Node left topology: GridMulticastDiscoveryNode [id=1f7e8040-8a17-4e14-a513-1709bebe265b, state=LEFT, lastHeartbeat=1353320076673, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55011, startTime=1353320073559]
-[14:14:36,680][INFO ][disco-event-worker-#15%kernal.GridListenActorSelfTest%][GridDiscoveryManager] Topology snapshot [nodes=1, CPUs=4, hash=0x8C20EE0]
-[14:14:36,693][INFO ][test-runner][GridDeploymentLocalStore] Removed undeployed class: GridDeployment [ts=1353320075676, depMode=SHARED, clsLdr=sun.misc.Launcher$AppClassLoader@3326b249, clsLdrId=e4269281b31-1f7e8040-8a17-4e14-a513-1709bebe265b, userVer=0, loc=true, sampleCls=class java.lang.String, sampleClsName=java.lang.String, undeployed=true, pendingUndeploy=false, usage=0]
-[14:14:36,701][INFO ][test-runner][GridListenActorSelfTest1]
-
->>> +-------------------------------------+
->>> GridGain ver. x.x.x-DDMMYYYY stopped OK
->>> +-------------------------------------+
->>> Grid name: kernal.GridListenActorSelfTest1
->>> Grid uptime: 00:00:01:28
-
-
-[14:14:36,703][INFO ][main][GridListenActorSelfTest] >>> Stopping test: testRespondToRemote in 3747 ms <<<
-[14:14:36,712][INFO ][main][GridListenActorSelfTest] >>> Starting test: testPingPong <<<
-[14:14:36,726][INFO ][main][GridListenActorSelfTest] >>> Stopping test: testPingPong in 14 ms <<<
-[14:14:36,726][INFO ][main][GridListenActorSelfTest] >>> Stopping grid [name=kernal.GridListenActorSelfTest, id=353d63b5-a2f0-41d1-a30e-37016f357233]
-[14:14:37,780][INFO ][main][GridJettyRestProtocol] Command protocol successfully stopped: Jetty REST
-[14:14:37,781][INFO ][main][GridTcpRestProtocol] Command protocol successfully stopped: TCP binary
-[14:14:37,794][INFO ][main][GridDeploymentLocalStore] Removed undeployed class: GridDeployment [ts=1353320064744, depMode=SHARED, clsLdr=sun.misc.Launcher$AppClassLoader@3326b249, clsLdrId=a2269281b31-353d63b5-a2f0-41d1-a30e-37016f357233, userVer=0, loc=true, sampleCls=class org.gridgain.grid.kernal.GridListenActorSelfTest$1, sampleClsName=org.gridgain.grid.kernal.GridListenActorSelfTest$1, undeployed=true, pendingUndeploy=false, usage=0]
-[14:14:37,799][INFO ][main][GridListenActorSelfTest]
-
->>> +-------------------------------------+
->>> GridGain ver. x.x.x-DDMMYYYY stopped OK
->>> +-------------------------------------+
->>> Grid name: kernal.GridListenActorSelfTest
->>> Grid uptime: 00:00:13:57
-
-
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest]
-
->>> _____ _ _______ _
->>> / ___/____(_)___/ / ___/___ _(_)___
->>> / (_ // __/ // _ / (_ // _ `/ // _ \
->>> \___//_/ /_/ \_,_/\___/ \_,_/_//_//_/
->>>
->>> ---==++ IN-MEMORY BIG DATA ++==---
->>> ver. x.x.x-DDMMYYYY
->>> Copyright (C) 2012 GridGain Systems
-
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] << Enterprise Edition >>
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] Config URL: n/a
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] Daemon mode: off
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] Language runtime: Java Platform API Specification ver. 1.6
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] JVM name: Java HotSpot(TM) 64-Bit Server VM
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] Remote Management [restart: off, REST: on, JMX (remote: off)]
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] GRIDGAIN_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2
-[14:14:37,814][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] VM arguments: [-ea, -XX:MaxPermSize=128m, -Xms512m, -Xmx1024m, -Duser.name=bamboo, -DGRIDGAIN_UPDATE_NOTIFIER=false, -DGRIDGAIN_DISABLED=true, -DGRIDGAIN_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -DGRIDGAIN_STABLE_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -DGRIDGAIN_ROUTER_PREFER_REMOTE=true, -DGRIDGAIN_NO_DISCO_ORDER=true, -DGRIDGAIN_QUIET=false, -DGG_TEST_HOME=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dteamcity.build.id=34324, -Dteamcity.buildType.id=bt5, -Dagent.ownPort=9090, -Dteamcity.build.checkoutDir=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dteamcity.build.workingDir=/usr/local/TeamCityAgent/work/d46fc9c3d71112c2, -Dagent.work.dir=/usr/local/TeamCityAgent/work, -Dagent.name=teamcity-4, -Dagent.home.dir=/usr/local/TeamCityAgent, -Dteamcity.runtime.props.file=/usr/local/TeamCityAgent/temp/agentTmp/ant2684847485530994862runtime]
-[14:14:37,814][WARN ][main][GridSessionCancelSiblingsFromFutureSelfTest] SMTP is not configured - email notifications are off.
-[14:14:37,815][WARN ][main][GridSessionCancelSiblingsFromFutureSelfTest] Cache is not configured - data grid is off.
-[14:14:37,815][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] 3-rd party licenses can be found at: /usr/local/TeamCityAgent/work/d46fc9c3d71112c2/libs/licenses
-[14:14:37,815][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] Non-loopback local IPs: fe80:0:0:0:ca60:ff:fe68:582c%2, 192.168.2.14
-[14:14:37,815][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] Enabled local MACs: C8600068582C
-[14:14:38,322][INFO ][main][GridJdkLocalMetricsSpi] Hyperic Sigar 'CpuPerc.getCombined()' method will be used to detect average CPU load.
-[14:14:38,339][INFO ][main][GridTcpCommunicationSpi] Successfully bound to TCP port [port=45020, locHost=/192.168.2.14]
-[14:14:38,398][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] Security status [authentication=on, secure-session=on]
-[14:14:38,403][WARN ][main][GridMulticastDiscoverySpi] Heartbeat frequency is too low (at least 2000 ms): 1000
-[14:14:38,404][INFO ][main][GridMulticastDiscoverySpi] Successfully bound to TCP port: 55020
-[14:14:38,404][INFO ][main][GridMulticastDiscoverySpi] Successfully bound to Multicast port: 50002
-[14:14:38,406][INFO ][main][GridMulticastDiscoverySpi] Local node: GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398]
-[14:14:38,407][INFO ][main][GridDiscoveryManager] Topology snapshot [nodes=1, CPUs=4, hash=0x52EFDFF2]
-[14:14:38,408][INFO ][main][GridMulticastDiscoverySpi] Waiting for initial heartbeat timeout (1000 ms)
-[14:14:39,443][INFO ][main][GridJettyRestProtocol] Command protocol successfully started: Jetty REST
-[14:14:39,448][INFO ][main][GridTcpRestProtocol] Command protocol successfully started: TCP binary
-[14:14:39,448][INFO ][main][GridLicenseControllerImpl] Licensed to 'GridGain Systems, Internal Development Only' on Feb 3, 2011
-[14:14:39,448][INFO ][main][GridLicenseControllerImpl] License [ID=7D5CB773-225C-4165-8162-3BB67337894B, type=ENT]
-[14:14:39,448][INFO ][main][GridLicenseControllerImpl] License limits [expire-date: never]
-[14:14:39,468][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest]
-
->>> +--------------------------+
->>> GridGain ver. x.x.x-DDMMYYYY
->>> +--------------------------+
->>> OS name: Linux 2.6.32-38-generic amd64
->>> OS user: bamboo
->>> CPU(s): 4
->>> VM information: Java(TM) SE Runtime Environment 1.6.0_30-b12 Sun Microsystems Inc. Java HotSpot(TM) 64-Bit Server VM 20.5-b03
->>> VM name: 573@gg-teamcity-4
->>> Grid name: session.GridSessionCancelSiblingsFromFutureSelfTest
->>> Local node [ID=741AF89C-78C4-453D-83D5-86B9A66DCA08, order=1353320078398]
->>> Local node addresses: [192.168.2.14]
->>> Local ports: TCP:8080 TCP:11211 TCP:45020 UDP:50002 TCP:55020
->>> GridGain documentation: http://www.gridgain.com/product.html
-
-[14:14:39,468][INFO ][main][GridSessionCancelSiblingsFromFutureSelfTest] >>> Starting test: testCancelSiblings <<<
-[14:14:39,478][INFO ][gridgain-#95%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Splitting jobs [task=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4b90725e, gridSize=1, arg=0]
-[14:14:39,484][INFO ][gridgain-#96%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@54eeabe8, arg=5]
-[14:14:39,484][INFO ][gridgain-#97%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@39b1ff47, arg=4]
-[14:14:39,485][INFO ][gridgain-#98%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1a0283e, arg=3]
-[14:14:39,486][INFO ][gridgain-#99%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@31f9b804, arg=2]
-[14:14:39,486][INFO ][gridgain-#100%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3a8bd3bb, arg=1]
-[14:14:39,487][INFO ][gridgain-#96%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=5, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,488][INFO ][gridgain-#98%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=3, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,491][INFO ][gridgain-#100%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=1, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,491][INFO ][gridgain-#99%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=2, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,492][INFO ][gridgain-#97%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=4, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,497][INFO ][gridgain-#106%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4b90725e, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@54eeabe8, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=e5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063582--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063582--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=e5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,498][INFO ][gridgain-#106%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4b90725e, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1a0283e, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=26269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063586--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063586--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=26269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,499][INFO ][gridgain-#106%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4b90725e, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@31f9b804, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=46269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063588--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063588--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=46269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,500][INFO ][gridgain-#106%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4b90725e, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3a8bd3bb, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=66269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063590--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063590--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=66269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,500][INFO ][gridgain-#106%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4b90725e, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@39b1ff47, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=06269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063584--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063584--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=06269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,502][INFO ][gridgain-#106%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Aggregating job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4b90725e, results=[GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@54eeabe8, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=e5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063582--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063582--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=e5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscover
yNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@39b1ff47, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=06269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063584--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063584--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=06269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], n
ode=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1a0283e, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=26269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063586--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063586--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=26269281b31-4ffa
f88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@31f9b804, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=46269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063588--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063588--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], j
obCtx=GridJobContextImpl [jobId=46269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3a8bd3bb, sib=GridJobSiblingImpl [sesId=c5269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=66269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063590--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063590--8947096952782337528-8366272608718832957, nodeId=741af89c
-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=66269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false]]]
-[14:14:39,503][INFO ][gridgain-#111%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Splitting jobs [task=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4e0bd5df, gridSize=1, arg=1]
-[14:14:39,505][INFO ][gridgain-#112%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@591bfcbe, arg=1]
-[14:14:39,506][INFO ][gridgain-#113%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3c6e4ba6, arg=2]
-[14:14:39,507][INFO ][gridgain-#114%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@5afc0f5, arg=4]
-[14:14:39,507][INFO ][gridgain-#115%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@55a517bd, arg=5]
-[14:14:39,508][INFO ][gridgain-#116%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6d289e48, arg=3]
-[14:14:39,508][INFO ][gridgain-#112%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=1, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,509][INFO ][gridgain-#113%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=2, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,511][INFO ][gridgain-#115%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=5, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,511][INFO ][gridgain-#114%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=4, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,511][INFO ][gridgain-#116%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=3, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,512][INFO ][gridgain-#121%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4e0bd5df, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@591bfcbe, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=a8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063626--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063626--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=a8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,513][INFO ][gridgain-#121%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4e0bd5df, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@5afc0f5, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=e8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063630--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063630--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=e8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,513][INFO ][gridgain-#121%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4e0bd5df, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6d289e48, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=29269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063634--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063634--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=29269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,513][INFO ][gridgain-#121%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4e0bd5df, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@55a517bd, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=09269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063632--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063632--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=09269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,514][INFO ][gridgain-#121%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4e0bd5df, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3c6e4ba6, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=c8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063628--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063628--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=c8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,515][INFO ][gridgain-#121%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Aggregating job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@4e0bd5df, results=[GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@591bfcbe, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=a8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063626--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063626--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=a8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscover
yNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@55a517bd, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=09269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063632--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063632--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=09269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], n
ode=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@5afc0f5, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=e8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063630--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063630--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=e8269281b31-4ff
af88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6d289e48, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=29269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063634--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063634--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true],
jobCtx=GridJobContextImpl [jobId=29269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3c6e4ba6, sib=GridJobSiblingImpl [sesId=88269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=c8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063628--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063628--8947096952782337528-8366272608718832957, nodeId=741af89
c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=c8269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]]
-[14:14:39,516][INFO ][gridgain-#127%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Splitting jobs [task=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@28c4b5f, gridSize=1, arg=2]
-[14:14:39,518][INFO ][gridgain-#128%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@637644c8, arg=5]
-[14:14:39,519][INFO ][gridgain-#129%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3fa9b4a4, arg=3]
-[14:14:39,519][INFO ][gridgain-#130%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1e929ba3, arg=4]
-[14:14:39,520][INFO ][gridgain-#131%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@4fe2fe5d, arg=2]
-[14:14:39,521][INFO ][gridgain-#132%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6e659812, arg=1]
-[14:14:39,521][INFO ][gridgain-#128%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=5, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,521][INFO ][gridgain-#130%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=4, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,522][INFO ][gridgain-#129%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=3, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,522][INFO ][gridgain-#131%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=2, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,523][INFO ][gridgain-#132%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=1, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,525][INFO ][gridgain-#138%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@28c4b5f, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1e929ba3, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=ab269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063674--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063674--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=ab269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,526][INFO ][gridgain-#138%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@28c4b5f, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3fa9b4a4, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=8b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063672--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063672--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=8b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,527][INFO ][gridgain-#138%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@28c4b5f, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@4fe2fe5d, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=cb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063676--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063676--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=cb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,527][INFO ][gridgain-#138%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@28c4b5f, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@637644c8, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=6b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063670--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063670--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=6b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,528][INFO ][gridgain-#142%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@28c4b5f, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6e659812, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=eb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063678--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063678--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=eb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,530][INFO ][gridgain-#142%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Aggregating job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@28c4b5f, results=[GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1e929ba3, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=ab269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063674--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063674--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=ab269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscovery
Node [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3fa9b4a4, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=8b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063672--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063672--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=8b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], no
de=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@637644c8, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=6b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063670--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063670--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=6b269281b31-4ff
af88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6e659812, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=eb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063678--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063678--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true],
jobCtx=GridJobContextImpl [jobId=eb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@4fe2fe5d, sib=GridJobSiblingImpl [sesId=4b269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=cb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063676--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063676--8947096952782337528-8366272608718832957, nodeId=741af89c
-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=cb269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false]]]
-[14:14:39,531][INFO ][gridgain-#143%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Splitting jobs [task=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@f8b7298, gridSize=1, arg=3]
-[14:14:39,533][INFO ][gridgain-#144%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@44ec366a, arg=5]
-[14:14:39,535][INFO ][gridgain-#145%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@377e4cec, arg=4]
-[14:14:39,536][INFO ][gridgain-#146%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@12d91987, arg=2]
-[14:14:39,537][INFO ][gridgain-#147%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6b1af7bb, arg=3]
-[14:14:39,537][INFO ][gridgain-#148%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@54992725, arg=1]
-[14:14:39,538][INFO ][gridgain-#144%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=5, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,538][INFO ][gridgain-#147%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=3, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,539][INFO ][gridgain-#146%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=2, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,539][INFO ][gridgain-#145%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=4, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,541][INFO ][gridgain-#148%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=1, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,543][INFO ][gridgain-#154%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@f8b7298, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@44ec366a, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=2e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063714--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063714--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=2e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,543][INFO ][gridgain-#154%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@f8b7298, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@12d91987, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=6e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063718--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063718--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=6e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,544][INFO ][gridgain-#154%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@f8b7298, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6b1af7bb, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=8e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063720--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063720--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=8e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,544][INFO ][gridgain-#154%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@f8b7298, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@54992725, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=ae269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063722--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063722--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=ae269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,545][INFO ][gridgain-#154%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@f8b7298, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@377e4cec, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=4e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063716--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063716--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=4e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscov
eryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,546][INFO ][gridgain-#154%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Aggregating job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@f8b7298, results=[GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@377e4cec, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=4e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063716--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063716--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=4e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscovery
Node [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@12d91987, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=6e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063718--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063718--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=6e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], nod
e=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@6b1af7bb, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=8e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063720--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063720--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=8e269281b31-4ffa
f88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@54992725, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=ae269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063722--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063722--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=true], j
obCtx=GridJobContextImpl [jobId=ae269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false], GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@44ec366a, sib=GridJobSiblingImpl [sesId=0e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=2e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063714--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063714--8947096952782337528-8366272608718832957, nodeId=741af89c
-78c4-453d-83d5-86b9a66dca08, isJobDone=true], jobCtx=GridJobContextImpl [jobId=2e269281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDiscoveryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=false]]]
-[14:14:39,547][INFO ][gridgain-#159%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Splitting jobs [task=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@1330b13c, gridSize=1, arg=4]
-[14:14:39,549][INFO ][gridgain-#160%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@742136c6, arg=3]
-[14:14:39,550][INFO ][gridgain-#161%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@5e8518d4, arg=2]
-[14:14:39,550][INFO ][gridgain-#162%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1277f040, arg=5]
-[14:14:39,551][INFO ][gridgain-#163%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@30933cba, arg=4]
-[14:14:39,551][INFO ][gridgain-#164%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Computing job [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3bbe9a50, arg=1]
-[14:14:39,552][INFO ][gridgain-#161%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=2, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,552][INFO ][gridgain-#162%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=5, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,553][INFO ][gridgain-#160%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=3, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,553][INFO ][gridgain-#163%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=4, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,553][INFO ][gridgain-#164%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Job got interrupted [arg=1, e=java.lang.InterruptedException: sleep interrupted]
-[14:14:39,554][INFO ][gridgain-#103%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@1330b13c, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@5e8518d4, sib=GridJobSiblingImpl [sesId=c0369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=01369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063760--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063760--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=01369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,554][INFO ][gridgain-#107%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@1330b13c, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@1277f040, sib=GridJobSiblingImpl [sesId=c0369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=21369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063762--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063762--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=21369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,555][INFO ][gridgain-#107%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@1330b13c, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@742136c6, sib=GridJobSiblingImpl [sesId=c0369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=e0369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063758--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063758--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=e0369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14], addr=/192.168.2.14, tcpPort=55020, startTime=1353320078398], p=GridNodePredicate [ids=[741af89c-78c4-453d-83d5-86b9a66dca08]], isLoc=true, hash=694612240, daemon=false], ex=null, hasRes=true, isCancelled=true, isOccupied=true]]
-[14:14:39,555][INFO ][gridgain-#107%session.GridSessionCancelSiblingsFromFutureSelfTest%][GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask] Received job result [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask@1330b13c, result=GridJobResultImpl [job=org.gridgain.grid.session.GridSessionCancelSiblingsFromFutureSelfTest$GridTaskSessionTestTask$1@3bbe9a50, sib=GridJobSiblingImpl [sesId=c0369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, jobId=61369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, taskTopic=TOPIC_TASK--5725799524765009754-5763191950221394699-1353320063766--8947096952782337528-8366272608718832957, jobTopic=TOPIC_JOB--5725799524765009754-5763191950221394699-1353320063766--8947096952782337528-8366272608718832957, nodeId=741af89c-78c4-453d-83d5-86b9a66dca08, isJobDone=false], jobCtx=GridJobContextImpl [jobId=61369281b31-4ffaf88b-4556-430b-b089-dfab3747f8a6, attrs={}], node=GridRichNodeImpl [node=GridMulticastDisco
veryNode [id=741af89c-78c4-453d-83d5-86b9a66dca08, state=READY, lastHeartbeat=1353320078398, addrs=[192.168.2.14],
<TRUNCATED>
[26/50] [abbrv] incubator-ignite git commit: # IGNITE-298 Escape
cache and grid names.
Posted by yz...@apache.org.
# IGNITE-298 Escape cache and grid names.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b81c6a25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b81c6a25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b81c6a25
Branch: refs/heads/ignite-313
Commit: b81c6a25ba2ed743c251a34eb044123667d4be44
Parents: 7488edd
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Mar 3 15:31:35 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Mar 3 15:31:35 2015 +0700
----------------------------------------------------------------------
.../commands/cache/VisorCacheCommand.scala | 17 +++++++-----
.../commands/cache/VisorCacheScanCommand.scala | 7 +++--
.../config/VisorConfigurationCommand.scala | 5 ++--
.../visor/commands/node/VisorNodeCommand.scala | 6 ++---
.../scala/org/apache/ignite/visor/visor.scala | 27 +++++++++++---------
5 files changed, 35 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b81c6a25/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index e2ca05b..2db43dc 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -22,6 +22,7 @@ import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.internal.util.typedef._
import org.apache.ignite.internal.visor.cache._
import org.apache.ignite.internal.visor.node.{VisorGridConfiguration, VisorNodeConfigurationCollectorTask}
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.apache.ignite.lang.IgniteBiTuple
import org.jetbrains.annotations._
@@ -243,10 +244,11 @@ class VisorCacheCommand {
}
val cacheName = argValue("c", argLst) match {
- case Some("<default>") | Some(CACHE_DFLT) =>
+ case Some(dfltName) if dfltName == DFLT_CACHE_KEY || dfltName == DFLT_CACHE_NAME =>
argLst = argLst.filter(_._1 != "c") ++ Seq("c" -> null)
Some(null)
+
case cn => cn
}
@@ -422,9 +424,9 @@ class VisorCacheCommand {
*/
private def mkCacheName(@Nullable s: String): String = {
if (s == null) {
- val v = mfind(CACHE_DFLT)
+ val v = mfind(DFLT_CACHE_KEY)
- "<default>" + (if (v.isDefined) "(@" + v.get._1 + ')' else "")
+ DFLT_CACHE_NAME + (if (v.isDefined) "(@" + v.get._1 + ')' else "")
}
else {
val v = mfind(s)
@@ -438,7 +440,7 @@ class VisorCacheCommand {
*
* @param s Cache host.
*/
- private def registerCacheName(@Nullable s: String) = setVarIfAbsent(if (s != null) s else CACHE_DFLT, "c")
+ private def registerCacheName(@Nullable s: String) = setVarIfAbsent(if (s != null) s else DFLT_CACHE_KEY, "c")
/**
* ===Command===
@@ -744,8 +746,11 @@ object VisorCacheCommand {
ref = VisorConsoleCommand(cmd.cache, cmd.cache)
)
+ /** Default cache name to show on screen. */
+ private final val DFLT_CACHE_NAME = escapeName(null)
+
/** Default cache key. */
- protected val CACHE_DFLT = "<default>-" + UUID.randomUUID().toString
+ protected val DFLT_CACHE_KEY = DFLT_CACHE_NAME + "-" + UUID.randomUUID().toString
/** Singleton command */
private val cmd = new VisorCacheCommand
@@ -852,7 +857,7 @@ object VisorCacheCommand {
cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
cacheT += ("Memory Mode", cfg.memoryMode())
cacheT += ("Keep Values Bytes", cfg.valueBytes())
- cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
+ cacheT += ("Off-Heap Size", if (cfg.offsetHeapMaxMemory() >= 0) cfg.offsetHeapMaxMemory() else NA)
cacheT += ("Loader Factory Class Name", safe(cfg.loaderFactory()))
cacheT += ("Writer Factory Class Name", safe(cfg.writerFactory()))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b81c6a25/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index a3d6967..4fb1896 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -21,6 +21,7 @@ import org.apache.ignite.internal.visor.query.VisorQueryTask.VisorQueryArg
import org.apache.ignite.internal.visor.query.{VisorQueryNextPageTask, VisorQueryResult, VisorQueryTask}
import org.apache.ignite.cluster.ClusterNode
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.apache.ignite.lang.IgniteBiTuple
import org.apache.ignite.visor.commands._
@@ -177,18 +178,16 @@ class VisorCacheScanCommand {
return
}
- def escapeCacheName(name: String) = if (name == null) "<default>" else name
-
var res: VisorQueryResult = fullRes
if (res.rows.isEmpty) {
- println("Cache: " + escapeCacheName(cacheName) + " is empty")
+ println("Cache: " + escapeName(cacheName) + " is empty")
return
}
def render() {
- println("Entries in cache: " + escapeCacheName(cacheName))
+ println("Entries in cache: " + escapeName(cacheName))
val t = VisorTextTable()
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b81c6a25/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index a2ab512..788ef19 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -21,6 +21,7 @@ import org.apache.ignite._
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.internal.util.{IgniteUtils => U}
import org.apache.ignite.internal.visor.node.VisorNodeConfigurationCollectorTask
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.apache.ignite.lang.IgniteBiTuple
import java.lang.System._
@@ -199,7 +200,7 @@ class VisorConfigurationCommand {
val basic = cfg.basic()
- cmnT += ("Grid name", safe(basic.gridName(), "<default>"))
+ cmnT += ("Grid name", escapeName(basic.gridName()))
cmnT += ("Ignite home", safe(basic.ggHome()))
cmnT += ("Localhost", safe(basic.localHost()))
cmnT += ("Node ID", safe(basic.nodeId()))
@@ -407,7 +408,7 @@ class VisorConfigurationCommand {
println("\nNo system properties defined.")
cfg.caches().foreach(cacheCfg => {
- VisorCacheCommand.showCacheConfiguration("\nCache '" + safe(cacheCfg.name()) + "':", cacheCfg)
+ VisorCacheCommand.showCacheConfiguration("\nCache '" + escapeName(cacheCfg.name()) + "':", cacheCfg)
})
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b81c6a25/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
index 79625e2..eeb2a6c 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.IgniteNodeAttributes._
import org.apache.ignite.internal.util.lang.{GridFunc => F}
import org.apache.ignite.internal.util.typedef.X
import org.apache.ignite.internal.util.{IgniteUtils => U}
-
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.jetbrains.annotations._
import java.util.UUID
@@ -190,7 +190,7 @@ class VisorNodeCommand {
t += ("JRE information", node.attribute(ATTR_JIT_NAME))
t += ("Non-loopback IPs", node.attribute(ATTR_IPS))
t += ("Enabled MACs", node.attribute(ATTR_MACS))
- t += ("Grid name", safe(gridName, "<default>"))
+ t += ("Grid name", escapeName(gridName))
t += ("JVM start time", formatDateTime(m.getStartTime))
t += ("Node start time", formatDateTime(m.getNodeStartTime))
t += ("Up time", X.timeSpan2HMSM(m.getUpTime))
@@ -245,7 +245,7 @@ class VisorNodeCommand {
t += ("Language runtime", node.attribute(ATTR_LANG_RUNTIME))
t += ("Ignite version", verStr)
t += ("JRE information", node.attribute(ATTR_JIT_NAME))
- t += ("Grid name", safe(gridName, "<default>"))
+ t += ("Grid name", escapeName(gridName))
t += ("JVM start time", formatDateTime(m.getStartTime))
t += ("Node start time", formatDateTime(m.getNodeStartTime))
t += ("Up time", X.timeSpan2HMSM(m.getUpTime))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b81c6a25/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index b9b5dbc..964de1d 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -17,36 +17,39 @@
package org.apache.ignite.visor
-import java.io._
-import java.net._
-import java.text._
-import java.util.concurrent._
-import java.util.{HashSet => JHashSet, _}
-
import org.apache.ignite.IgniteSystemProperties._
+import org.apache.ignite._
import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode}
import org.apache.ignite.configuration.IgniteConfiguration
import org.apache.ignite.events.EventType._
import org.apache.ignite.events.{DiscoveryEvent, Event}
import org.apache.ignite.internal.IgniteComponentType._
import org.apache.ignite.internal.IgniteNodeAttributes._
+import org.apache.ignite.internal.IgniteVersionUtils._
import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
import org.apache.ignite.internal.processors.spring.IgniteSpringProcessor
-import org.apache.ignite.internal.{IgniteVersionUtils, IgniteEx}
-import IgniteVersionUtils._
import org.apache.ignite.internal.util.lang.{GridFunc => F}
import org.apache.ignite.internal.util.typedef._
-import org.apache.ignite.internal.util.{IgniteUtils => U, GridConfigurationFinder}
+import org.apache.ignite.internal.util.{GridConfigurationFinder, IgniteUtils => U}
import org.apache.ignite.internal.visor.VisorTaskArgument
import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask
import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask.VisorNodeEventsCollectorTaskArg
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
+import org.apache.ignite.internal.IgniteEx
import org.apache.ignite.lang.{IgniteNotPeerDeployable, IgnitePredicate}
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi
import org.apache.ignite.thread.IgniteThreadPoolExecutor
-import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}
-import org.apache.ignite._
+
import org.jetbrains.annotations.Nullable
+import java.io._
+import java.net._
+import java.text._
+import java.util.concurrent._
+import java.util.{HashSet => JHashSet, _}
+
+import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}
+
import scala.collection.JavaConversions._
import scala.collection.immutable
import scala.io.StdIn
@@ -1317,7 +1320,7 @@ object visor extends VisorTag {
else {
val n = ignite.name
- if (n == null) "<default>" else n
+ escapeName(n)
}
)
t += ("Config path", safe(cfgPath))
[36/50] [abbrv] incubator-ignite git commit: # IGNITE-298 Show
"UNLIMITED" if off-heap size configuration == 0.
Posted by yz...@apache.org.
# IGNITE-298 Show "UNLIMITED" if off-heap size configuration == 0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/656ee473
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/656ee473
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/656ee473
Branch: refs/heads/ignite-313
Commit: 656ee473e2299c16a0f59dc1aa37bbed04ee656e
Parents: be3c24c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 16:31:49 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 16:31:49 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/visor/commands/cache/VisorCacheCommand.scala | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/656ee473/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 69da6f5..1c52676 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -856,7 +856,11 @@ object VisorCacheCommand {
cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
cacheT += ("Memory Mode", cfg.memoryMode())
cacheT += ("Keep Values Bytes", cfg.valueBytes())
- cacheT += ("Off-Heap Size", if (cfg.offsetHeapMaxMemory() >= 0) cfg.offsetHeapMaxMemory() else NA)
+ cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory() match {
+ case 0 => "UNLIMITED"
+ case size if size < 0 => NA
+ case size => size
+ })
cacheT += ("Loader Factory Class Name", safe(cfg.loaderFactory()))
cacheT += ("Writer Factory Class Name", safe(cfg.writerFactory()))
[32/50] [abbrv] incubator-ignite git commit: # sprint-2 - removing
gridgain.com.
Posted by yz...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
index b6a4155..9b9f2aa 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
@@ -140,7 +140,7 @@ import java.util.concurrent.atomic.*;
* ...
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
index 717c5df..b8ad9e0 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
@@ -56,7 +56,7 @@
<br>
<center>
<a class="img_link" href="https://incubator.apache.org/projects/ignite.html" title="Apache Software Foundation">
- <img src="http://gridgain.com/wp-content/uploads/2014/09/gridgain-red-logo-standard.png" alt="Ignite - In-Memory Data Fabric">
+ <img src="http://ignite.incubator.apache.org/images/logo3.png" alt="Ignite - In-Memory Data Fabric">
</a>
<p>
<div style="width: 650px; text-align: justify; padding-top: 20px">
@@ -74,23 +74,6 @@
different parameters, some of which may be mandatory and some optional. The commands parameters may be
passed either via HTTP GET or POST, whichever one is preferred.
</div>
- <br>
- <br>
- <a target=facebook class='img_link' href='http://www.facebook.com/profile.php?id=6458239494'>
- <img border=0 align=absmiddle src='http://www.gridgain.com/images/facebook_small.png'>
- </a>
-
- <a class='img_link' target=meetup href='http://www.meetup.com/GridGain-Bay-Area-Meetup-Group/'>
- <img border=0 align=absmiddle src='http://www.gridgain.com/images/meetup_logo_small.png' alt='Join Ignite Meetup'/>
- </a>
-
- <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
- <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter.gif' alt='Follow Ignite on Twitter'/>
- </a>
-
- <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
- <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo.png' alt='Follow Ignite on Vimeo'/>
- </a>
</center>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
index 32b3282..da9b42e 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
@@ -301,7 +301,7 @@ import java.util.Map.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.deployment.DeploymentSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
index 62f590e..164b307 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
@@ -17,16 +17,16 @@
package org.apache.ignite.visor.commands
-import org.apache.ignite.internal.IgniteVersionUtils._
-import org.apache.ignite.internal.util.scala.impl
-import org.apache.ignite.internal.util.{IgniteUtils => U}
-import org.apache.ignite.startup.cmdline.AboutDialog
-
-import javax.swing.ImageIcon
import java.awt.Image
import java.io.File
import java.text.SimpleDateFormat
import java.util
+import javax.swing.ImageIcon
+
+import org.apache.ignite.internal.IgniteVersionUtils._
+import org.apache.ignite.internal.util.scala.impl
+import org.apache.ignite.internal.util.{IgniteUtils => U}
+import org.apache.ignite.startup.cmdline.AboutDialog
// Built-in commands.
// Note the importing of implicit conversions.
@@ -194,11 +194,11 @@ object VisorConsole extends App {
val osxApp = appCls.getDeclaredMethod("getApplication").invoke(null)
- val dockIco = new ImageIcon(urlIcon("ggcube_node_128x128.png"))
+ val dockIco = new ImageIcon(urlIcon("logo_ignite_128x128.png"))
appCls.getDeclaredMethod("setDockIconImage", classOf[Image]).invoke(osxApp, dockIco.getImage)
- val bannerIconUrl = urlIcon("ggcube_node_48x48.png")
+ val bannerIconUrl = urlIcon("logo_ignite_48x48.png")
val aboutHndProxy = java.lang.reflect.Proxy.newProxyInstance(
appCls.getClassLoader,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_128x128.png
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_128x128.png b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_128x128.png
deleted file mode 100644
index ba8f954..0000000
Binary files a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_128x128.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_48x48.png
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_48x48.png b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_48x48.png
deleted file mode 100644
index ab3ede2..0000000
Binary files a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ggcube_48x48.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_128x128.png
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_128x128.png b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_128x128.png
new file mode 100644
index 0000000..046e381
Binary files /dev/null and b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_128x128.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_48x48.png
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_48x48.png b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_48x48.png
new file mode 100644
index 0000000..d4836ef
Binary files /dev/null and b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/logo_ignite_48x48.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0ebc44..b176b10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -535,7 +535,6 @@
<exclude>src/main/java/org/pcollections/**</exclude><!--own license-->
<exclude>src/main/java/org/jdk8/backport/*.java</exclude><!--own license-->
<exclude>src/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test depends on file content-->
- <exclude>src/test/resources/log/ignite.log.tst</exclude><!--test resource-->
<exclude>src/test/config/start-nodes.ini</exclude><!---->
<exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs</exclude><!--test resource-->
<exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.empty</exclude><!--should be empty-->
[47/50] [abbrv] incubator-ignite git commit: futures: api cleanup
Posted by yz...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index eed273d..c09e51b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -420,7 +420,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
}
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
// Register per-routine notifications listener if ordered messaging is used.
@@ -459,7 +459,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
// Stop with exception if projection is empty.
if (nodes.isEmpty() && !locIncluded) {
- return new GridFinishedFuture<>(ctx,
+ return new GridFinishedFuture<>(
new ClusterTopologyCheckedException("Failed to register remote continuous listener (projection is empty)."));
}
@@ -553,7 +553,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
hnd.onListenerRegistered(routineId, ctx);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx,
+ return new GridFinishedFuture<>(
new IgniteCheckedException("Failed to register handler locally: " + hnd, e));
}
}
@@ -1617,6 +1617,9 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private GridKernalContext ctx;
+
/** Consume ID. */
private UUID routineId;
@@ -1641,7 +1644,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
* @param routineId Consume ID.
*/
StartFuture(GridKernalContext ctx, UUID routineId) {
- super(ctx);
+ this.ctx = ctx;
this.routineId = routineId;
}
@@ -1701,18 +1704,15 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
/** Timeout object. */
private volatile GridTimeoutObject timeoutObj;
- /**
- * Required by {@link Externalizable}.
- */
- public StopFuture() {
- // No-op.
- }
+ /** */
+ private GridKernalContext ctx;
/**
* @param ctx Kernal context.
*/
StopFuture(GridKernalContext ctx) {
- super(ctx);
+ super();
+ this.ctx = ctx;
}
/**
@@ -1762,7 +1762,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
* @param nodeId Master node ID.
*/
SyncMessageAckFuture(GridKernalContext ctx, UUID nodeId) {
- super(ctx);
+ super();
this.nodeId = nodeId;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
index 5efcfe9..ae7052a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
@@ -48,7 +48,7 @@ class GridDataLoaderFuture extends GridFutureAdapter<Object> {
* @param dataLdr Data loader.
*/
GridDataLoaderFuture(GridKernalContext ctx, IgniteDataLoaderImpl dataLdr) {
- super(ctx);
+ super();
assert dataLdr != null;
@@ -57,8 +57,6 @@ class GridDataLoaderFuture extends GridFutureAdapter<Object> {
/** {@inheritDoc} */
@Override public boolean cancel() throws IgniteCheckedException {
- checkValid();
-
if (onCancelled()) {
dataLdr.closeEx(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index ed3bbcb..1e20486 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -377,7 +377,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
enterBusy();
try {
- GridFutureAdapter<Object> resFut = new GridFutureAdapter<>(ctx);
+ GridFutureAdapter<Object> resFut = new GridFutureAdapter<>();
resFut.listenAsync(rmvActiveFut);
@@ -397,7 +397,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
return new IgniteFutureImpl<>(resFut);
}
catch (IgniteException e) {
- return new IgniteFinishedFutureImpl<>(ctx, e);
+ return new IgniteFinishedFutureImpl<>(e);
}
finally {
leaveBusy();
@@ -849,7 +849,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
isLocNode = node.equals(ctx.discovery().localNode());
entries = newEntries();
- curFut = new GridFutureAdapter<>(ctx);
+ curFut = new GridFutureAdapter<>();
curFut.listenAsync(signalC);
sem = new Semaphore(parallelOps);
@@ -878,7 +878,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
entries0 = entries;
entries = newEntries();
- curFut = new GridFutureAdapter<>(ctx);
+ curFut = new GridFutureAdapter<>();
curFut.listenAsync(signalC);
}
}
@@ -915,7 +915,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
curFut0 = curFut;
entries = newEntries();
- curFut = new GridFutureAdapter<>(ctx);
+ curFut = new GridFutureAdapter<>();
curFut.listenAsync(signalC);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index e61deee..52f762a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -303,7 +303,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
locVal += l;
- return new GridFinishedFuture<>(ctx.kernalContext(), updated ? locVal : curVal);
+ return new GridFinishedFuture<>(updated ? locVal : curVal);
}
}
finally {
@@ -347,7 +347,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
locVal += l;
- return new GridFinishedFuture<>(ctx.kernalContext(), updated ? locVal : curVal);
+ return new GridFinishedFuture<>(updated ? locVal : curVal);
}
}
finally {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
index d0ef4ce..7dc9567 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
@@ -49,7 +49,7 @@ public class IgniteHadoopNoopProcessor extends IgniteHadoopProcessorAdapter {
/** {@inheritDoc} */
@Override public IgniteInternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) {
- return new GridFinishedFutureEx<>(new IgniteCheckedException("Hadoop is not available."));
+ return new GridFinishedFuture<>(new IgniteCheckedException("Hadoop is not available."));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index e960422..c5ac658 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -406,7 +406,7 @@ public class IgfsDataManager extends IgfsManager {
byte[] res = fut.get();
if (res == null) {
- GridFutureAdapter<byte[]> rmtReadFut = new GridFutureAdapter<>(igfsCtx.kernalContext());
+ GridFutureAdapter<byte[]> rmtReadFut = new GridFutureAdapter<>();
IgniteInternalFuture<byte[]> oldRmtReadFut = rmtReadFuts.putIfAbsent(key, rmtReadFut);
@@ -599,7 +599,7 @@ public class IgfsDataManager extends IgfsManager {
if (log.isDebugEnabled())
log.debug("Cannot delete content of not-data file: " + fileInfo);
- return new GridFinishedFuture<>(igfsCtx.kernalContext());
+ return new GridFinishedFuture<>();
}
else
return delWorker.deleteAsync(fileInfo);
@@ -1256,14 +1256,14 @@ public class IgfsDataManager extends IgfsManager {
// Additional size check.
if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.igfsDataSpaceMax())
- return new GridFinishedFuture<Object>(igfsCtx.kernalContext(),
+ return new GridFinishedFuture<Object>(
new IgfsOutOfSpaceException("Failed to write data block (IGFS maximum data size " +
"exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() +
", allowed=" + dataCachePrj.igfsDataSpaceMax() + ']'));
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(igfsCtx.kernalContext(), new IgniteCheckedException("Failed to store data " +
+ return new GridFinishedFuture<>(new IgniteCheckedException("Failed to store data " +
"block due to unexpected exception.", e));
}
}
@@ -1674,7 +1674,7 @@ public class IgfsDataManager extends IgfsManager {
* Gracefully stops worker by adding STOP_INFO to queue.
*/
private void stop() {
- delReqs.offer(F.t(new GridFutureAdapter<>(igfsCtx.kernalContext()), stopInfo));
+ delReqs.offer(F.t(new GridFutureAdapter<>(), stopInfo));
}
/**
@@ -1682,7 +1682,7 @@ public class IgfsDataManager extends IgfsManager {
* @return Future which completes when entry is actually removed.
*/
private IgniteInternalFuture<Object> deleteAsync(IgfsFileInfo info) {
- GridFutureAdapter<Object> fut = new GridFutureAdapter<>(igfsCtx.kernalContext());
+ GridFutureAdapter<Object> fut = new GridFutureAdapter<>();
delReqs.offer(F.t(fut, info));
@@ -1795,7 +1795,7 @@ public class IgfsDataManager extends IgfsManager {
* @param fileId File id.
*/
private WriteCompletionFuture(GridKernalContext ctx, IgniteUuid fileId) {
- super(ctx);
+ super();
assert fileId != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index eff987e..4fd5f87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -1604,9 +1604,9 @@ public final class IgfsImpl implements IgfsEx {
IgniteUuid id = meta.softDelete(null, null, ROOT_ID);
if (id == null)
- return new GridFinishedFuture<Object>(igfsCtx.kernalContext());
+ return new GridFinishedFuture<Object>();
else {
- GridFutureAdapter<Object> fut = new GridFutureAdapter<>(igfsCtx.kernalContext());
+ GridFutureAdapter<Object> fut = new GridFutureAdapter<>();
GridFutureAdapter<Object> oldFut = delFuts.putIfAbsent(id, fut);
@@ -1625,7 +1625,7 @@ public final class IgfsImpl implements IgfsEx {
}
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<Object>(igfsCtx.kernalContext(), e);
+ return new GridFinishedFuture<Object>(e);
}
}
@@ -1640,7 +1640,7 @@ public final class IgfsImpl implements IgfsEx {
GridCompoundFuture<Object, Object> resFut = new GridCompoundFuture<>(igfsCtx.kernalContext());
for (IgniteUuid id : ids) {
- GridFutureAdapter<Object> fut = new GridFutureAdapter<>(igfsCtx.kernalContext());
+ GridFutureAdapter<Object> fut = new GridFutureAdapter<>();
IgniteInternalFuture<Object> oldFut = delFuts.putIfAbsent(id, fut);
@@ -1662,7 +1662,7 @@ public final class IgfsImpl implements IgfsEx {
return resFut;
}
else
- return new GridFinishedFuture<>(igfsCtx.kernalContext());
+ return new GridFinishedFuture<>();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
index 1d5ba1a..8a8b858 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
@@ -118,7 +118,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
case LIST_PATHS: {
IgfsMessage res = execute(ses, cmd, msg, in);
- fut = res == null ? null : new GridFinishedFuture<>(ctx, res);
+ fut = res == null ? null : new GridFinishedFuture<>(res);
break;
}
@@ -138,7 +138,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
return fut;
}
catch (Exception e) {
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index f503161..92b39f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -193,10 +193,10 @@ public class GridQueryProcessor extends GridProcessorAdapter {
*/
private IgniteInternalFuture<?> rebuildIndexes(@Nullable final String space, @Nullable final TypeDescriptor desc) {
if (idx == null)
- return new GridFinishedFuture<>(ctx, new IgniteCheckedException("Indexing is disabled."));
+ return new GridFinishedFuture<>(new IgniteCheckedException("Indexing is disabled."));
if (desc == null || !desc.registered())
- return new GridFinishedFuture<Void>(ctx);
+ return new GridFinishedFuture<Void>();
final GridWorkerFuture<?> fut = new GridWorkerFuture<Void>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index 8c9ef1d..6c1cedb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -90,7 +90,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
*/
private IgniteInternalFuture<GridRestResponse> handleAsync0(final GridRestRequest req) {
if (!busyLock.tryReadLock())
- return new GridFinishedFuture<>(ctx,
+ return new GridFinishedFuture<>(
new IgniteCheckedException("Failed to handle request (received request while stopping grid)."));
try {
@@ -156,7 +156,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
startLatch.await();
}
catch (InterruptedException e) {
- return new GridFinishedFuture<>(ctx, new IgniteCheckedException("Failed to handle request " +
+ return new GridFinishedFuture<>(new IgniteCheckedException("Failed to handle request " +
"(protocol handler was interrupted when awaiting grid start).", e));
}
}
@@ -185,10 +185,10 @@ public class GridRestProcessor extends GridProcessorAdapter {
U.warn(log, "Cannot update response session token: " + e1.getMessage());
}
- return new GridFinishedFuture<>(ctx, res);
+ return new GridFinishedFuture<>(res);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx, new GridRestResponse(STATUS_AUTH_FAILED, e.getMessage()));
+ return new GridFinishedFuture<>(new GridRestResponse(STATUS_AUTH_FAILED, e.getMessage()));
}
}
@@ -199,7 +199,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
IgniteInternalFuture<GridRestResponse> res = hnd == null ? null : hnd.handleAsync(req);
if (res == null)
- return new GridFinishedFuture<>(ctx,
+ return new GridFinishedFuture<>(
new IgniteCheckedException("Failed to find registered handler for command: " + req.command()));
final SecurityContext subjCtx0 = subjCtx;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 983dd55..c63e414 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -297,12 +297,12 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
catch (IgniteException e) {
U.error(log, "Failed to execute cache command: " + req, e);
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to execute cache command: " + req, e);
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
finally {
if (log.isDebugEnabled())
@@ -1043,7 +1043,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
assert metrics != null;
- return new GridFinishedFuture<Object>(ctx, new GridCacheRestMetrics(
+ return new GridFinishedFuture<Object>(new GridCacheRestMetrics(
(int)metrics.getCacheGets(),
(int)(metrics.getCacheRemovals() + metrics.getCachePuts()),
(int)metrics.getCacheHits(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
index 50d82e6..5ee6418 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
@@ -92,7 +92,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
}
default:
- return new GridFinishedFutureEx<>(new IgniteCheckedException("Unsupported query command: " + req.command()));
+ return new GridFinishedFuture<>(new IgniteCheckedException("Unsupported query command: " + req.command()));
}
}
@@ -124,7 +124,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
return ctx.closure().callLocalSafe(c, false);
else {
if (ctx.discovery().node(destId) == null)
- return new GridFinishedFutureEx<>(new IgniteCheckedException("Destination node ID has left the grid " +
+ return new GridFinishedFuture<>(new IgniteCheckedException("Destination node ID has left the grid " +
"(retry the query): " + destId));
ctx.task().setThreadContext(TC_NO_FAILOVER, true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
index c45f2c7..5abbb77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
@@ -83,13 +83,13 @@ public class DataStructuresCommandHandler extends GridRestCommandHandlerAdapter
IgniteCheckedException err =
new IgniteCheckedException(GridRestCommandHandlerAdapter.missingParameter("key"));
- return new GridFinishedFuture(ctx, err);
+ return new GridFinishedFuture(err);
}
else if (req.delta() == null) {
IgniteCheckedException err =
new IgniteCheckedException(GridRestCommandHandlerAdapter.missingParameter("delta"));
- return new GridFinishedFuture(ctx, err);
+ return new GridFinishedFuture(err);
}
return ctx.closure().callLocalSafe(new Callable<Object>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
index 78b6bd1..87f0fc3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -136,7 +136,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
catch (IgniteCheckedException e) {
U.error(log, "Failed to execute task command: " + req, e);
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
finally {
if (log.isDebugEnabled())
@@ -159,7 +159,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
GridRestTaskRequest req0 = (GridRestTaskRequest) req;
- final GridFutureAdapter<GridRestResponse> fut = new GridFutureAdapter<>(ctx);
+ final GridFutureAdapter<GridRestResponse> fut = new GridFutureAdapter<>();
final GridRestResponse res = new GridRestResponse();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
index 7c2a15b..d563f9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -94,7 +94,7 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter {
final String ip = req0.nodeIp();
if (id == null && ip == null)
- return new GridFinishedFuture<>(ctx, new IgniteCheckedException(
+ return new GridFinishedFuture<>(new IgniteCheckedException(
"Failed to handle request (either id or ip should be specified)."));
ClusterNode node;
@@ -131,7 +131,7 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter {
if (log.isDebugEnabled())
log.debug("Handled topology REST request [res=" + res + ", req=" + req + ']');
- return new GridFinishedFuture<>(ctx, res);
+ return new GridFinishedFuture<>(res);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
index c66de86..2bfb704 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
@@ -54,6 +54,6 @@ public class GridVersionCommandHandler extends GridRestCommandHandlerAdapter {
assert SUPPORTED_COMMANDS.contains(req.command());
- return new GridFinishedFuture<>(ctx, new GridRestResponse(VER_STR));
+ return new GridFinishedFuture<>(new GridRestResponse(VER_STR));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 43e47cd..aa1abd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -135,8 +135,8 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
@Override public IgniteInternalFuture<GridRestResponse> apply(GridRestResponse res, Exception e) {
return handleRequest0(ses, req, cmd);
}
- },
- ctx);
+ }
+ );
}
if (f != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
index da4733b..f05fdf6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
@@ -37,7 +37,7 @@ public class GridServiceDeploymentFuture extends GridFutureAdapter<Object> {
* @param cfg Configuration.
*/
public GridServiceDeploymentFuture(GridKernalContext ctx, ServiceConfiguration cfg) {
- super(ctx);
+ super();
this.cfg = cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 1793beb..aac9d90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -386,7 +386,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
U.error(log, "Failed to deploy service: " + cfg.getName(), e);
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
}
}
@@ -398,7 +398,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
public IgniteInternalFuture<?> cancel(String name) {
while (true) {
try {
- GridFutureAdapter<?> fut = new GridFutureAdapter<>(ctx);
+ GridFutureAdapter<?> fut = new GridFutureAdapter<>();
GridFutureAdapter<?> old;
@@ -424,7 +424,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
catch (IgniteCheckedException e) {
log.error("Failed to undeploy service: " + name, e);
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
}
}
@@ -446,7 +446,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
futs.add(cancel(dep.configuration().getName()));
}
- return futs.isEmpty() ? new GridFinishedFuture<>(ctx) : new GridCompoundFuture(ctx, null, futs);
+ return futs.isEmpty() ? new GridFinishedFuture<>() : new GridCompoundFuture(ctx, null, futs);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerStageExecutionFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerStageExecutionFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerStageExecutionFuture.java
index 31c4c0e..beb2820 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerStageExecutionFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerStageExecutionFuture.java
@@ -114,8 +114,6 @@ public class GridStreamerStageExecutionFuture extends GridFutureAdapter<Object>
String stageName,
Collection<?> evts
) {
- super(streamer.kernalContext());
-
assert streamer != null;
assert stageName != null;
assert evts != null;
@@ -226,7 +224,7 @@ public class GridStreamerStageExecutionFuture extends GridFutureAdapter<Object>
}
}
catch (IgniteCheckedException e) {
- onFailed(ctx.localNodeId(), e);
+ onFailed(streamer.kernalContext().localNodeId(), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index 0750259..7139564 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -78,7 +78,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
* @param ctx Context.
*/
public GridCompoundFuture(GridKernalContext ctx) {
- super(ctx);
+ super();
}
/**
@@ -86,7 +86,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
* @param rdc Reducer.
*/
public GridCompoundFuture(GridKernalContext ctx, @Nullable IgniteReducer<T, R> rdc) {
- super(ctx);
+ super();
this.rdc = rdc;
}
@@ -98,7 +98,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
*/
public GridCompoundFuture(GridKernalContext ctx, @Nullable IgniteReducer<T, R> rdc,
@Nullable Iterable<IgniteInternalFuture<T>> futs) {
- super(ctx);
+ super();
this.rdc = rdc;
@@ -248,14 +248,14 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
res.compareAndSet(null, rdc.reduce(), false, true);
}
catch (RuntimeException e) {
- U.error(log, "Failed to execute compound future reducer: " + this, e);
+ U.error(null, "Failed to execute compound future reducer: " + this, e);
onDone(e);
return;
}
catch (AssertionError e) {
- U.error(log, "Failed to execute compound future reducer: " + this, e);
+ U.error(null, "Failed to execute compound future reducer: " + this, e);
onDone(e);
@@ -320,13 +320,13 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
res.compareAndSet(null, rdc.reduce(), false, true);
}
catch (RuntimeException e) {
- U.error(log, "Failed to execute compound future reducer: " + this, e);
+ U.error(null, "Failed to execute compound future reducer: " + this, e);
// Exception in reducer is a bug, so we bypass checkComplete here.
onDone(e);
}
catch (AssertionError e) {
- U.error(log, "Failed to execute compound future reducer: " + this, e);
+ U.error(null, "Failed to execute compound future reducer: " + this, e);
// Bypass checkComplete because need to rethrow.
onDone(e);
@@ -335,36 +335,36 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
}
}
catch (IgniteTxOptimisticCheckedException e) {
- if (log.isDebugEnabled())
- log.debug("Optimistic failure [fut=" + GridCompoundFuture.this + ", err=" + e + ']');
+// if (log.isDebugEnabled())
+// log.debug("Optimistic failure [fut=" + GridCompoundFuture.this + ", err=" + e + ']');
err.compareAndSet(null, e);
}
catch (ClusterTopologyCheckedException e) {
- if (log.isDebugEnabled())
- log.debug("Topology exception [fut=" + GridCompoundFuture.this + ", err=" + e + ']');
+// if (log.isDebugEnabled())
+// log.debug("Topology exception [fut=" + GridCompoundFuture.this + ", err=" + e + ']');
err.compareAndSet(null, e);
}
catch (IgniteFutureCancelledCheckedException e) {
- if (log.isDebugEnabled())
- log.debug("Failed to execute compound future reducer [lsnr=" + this + ", e=" + e + ']');
+// if (log.isDebugEnabled())
+// log.debug("Failed to execute compound future reducer [lsnr=" + this + ", e=" + e + ']');
err.compareAndSet(null, e);
}
catch (IgniteCheckedException e) {
- if (!ignoreFailure(e))
- U.error(log, "Failed to execute compound future reducer: " + this, e);
+// if (!ignoreFailure(e))
+// U.error(log, "Failed to execute compound future reducer: " + this, e);
err.compareAndSet(null, e);
}
catch (RuntimeException e) {
- U.error(log, "Failed to execute compound future reducer: " + this, e);
+ U.error(null, "Failed to execute compound future reducer: " + this, e);
err.compareAndSet(null, e);
}
catch (AssertionError e) {
- U.error(log, "Failed to execute compound future reducer: " + this, e);
+ U.error(null, "Failed to execute compound future reducer: " + this, e);
// Bypass checkComplete because need to rethrow.
onDone(e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
index 41f0ba4..b3ec22d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
@@ -45,13 +45,14 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
}
/**
- * @param ctx Context.
* @param embedded Embedded future.
* @param c Closure to execute upon completion of embedded future.
*/
- public GridEmbeddedFuture(GridKernalContext ctx, IgniteInternalFuture<B> embedded, final IgniteBiClosure<B, Exception, A> c) {
- super(ctx);
-
+ public GridEmbeddedFuture(
+ IgniteInternalFuture<B> embedded,
+ final IgniteBiClosure<B, Exception, A> c,
+ boolean fake
+ ) {
assert embedded != null;
assert c != null;
@@ -77,30 +78,11 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
/**
* Embeds futures. Specific change order of arguments to avoid conflicts.
- *
- * @param syncNotify Synchronous notify flag.
- * @param embedded Closure.
- * @param c Closure which runs upon completion of embedded closure and which returns another future.
- * @param ctx Context.
- */
- public GridEmbeddedFuture(boolean syncNotify, IgniteInternalFuture<B> embedded, IgniteBiClosure<B, Exception, IgniteInternalFuture<A>> c,
- GridKernalContext ctx) {
- this(embedded, c, ctx);
-
- syncNotify(syncNotify);
- }
-
- /**
- * Embeds futures. Specific change order of arguments to avoid conflicts.
- *
- * @param ctx Context.
- * @param embedded Closure.
+ * @param embedded Closure.
* @param c Closure which runs upon completion of embedded closure and which returns another future.
*/
- public GridEmbeddedFuture(IgniteInternalFuture<B> embedded, final IgniteBiClosure<B, Exception, IgniteInternalFuture<A>> c,
- GridKernalContext ctx) {
- super(ctx);
-
+ public GridEmbeddedFuture(
+ IgniteInternalFuture<B> embedded, final IgniteBiClosure<B, Exception, IgniteInternalFuture<A>> c) {
assert embedded != null;
assert c != null;
@@ -158,15 +140,15 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
/**
* Embeds futures.
*
- * @param ctx Context.
* @param embedded Future.
* @param c1 Closure which runs upon completion of embedded future and which returns another future.
* @param c2 Closure will runs upon completion of future returned by {@code c1} closure.
*/
- public GridEmbeddedFuture(GridKernalContext ctx, IgniteInternalFuture<B> embedded, final IgniteBiClosure<B, Exception,
- IgniteInternalFuture<A>> c1, final IgniteBiClosure<A, Exception, A> c2) {
- super(ctx);
-
+ public GridEmbeddedFuture(
+ IgniteInternalFuture<B> embedded, final IgniteBiClosure<B, Exception,
+ IgniteInternalFuture<A>> c1,
+ final IgniteBiClosure<A, Exception, A> c2
+ ) {
assert embedded != null;
assert c1 != null;
assert c2 != null;
@@ -268,7 +250,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
applyx(f);
}
catch (IgniteIllegalStateException ignore) {
- U.warn(log, "Will not execute future listener (grid is stopping): " + ctx.gridName());
+ U.warn(null, "Will not execute future listener (grid is stopping): " + this);
}
catch (Exception e) {
onDone(e);
@@ -300,7 +282,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
applyx(f);
}
catch (IgniteIllegalStateException ignore) {
- U.warn(log, "Will not execute future listener (grid is stopping): " + ctx.gridName());
+ U.warn(null, "Will not execute future listener (grid is stopping): " + this);
}
catch (Exception e) {
onDone(e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
index c2f1b89..31f6734 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
@@ -21,40 +21,24 @@ import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import java.io.*;
import java.util.concurrent.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-
/**
* Future that is completed at creation time.
*/
-public class GridFinishedFuture<T> implements IgniteInternalFuture<T>, Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Synchronous notification flag. */
- private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(IGNITE_FUT_SYNC_NOTIFICATION, true);
-
+public class GridFinishedFuture<T> implements IgniteInternalFuture<T> {
/** Complete value. */
private T t;
/** Error. */
private Throwable err;
- /** Context. */
- protected GridKernalContext ctx;
-
/** Start time. */
private final long startTime = U.currentTimeMillis();
- /** Synchronous notification flag. */
- private volatile boolean syncNotify = SYNC_NOTIFY;
-
/**
- * Empty constructor required for {@link Externalizable}.
+ * Creates finished future with complete value.
*/
public GridFinishedFuture() {
// No-op.
@@ -63,43 +47,31 @@ public class GridFinishedFuture<T> implements IgniteInternalFuture<T>, Externali
/**
* Creates finished future with complete value.
*
- * @param ctx Context.
- */
- public GridFinishedFuture(GridKernalContext ctx) {
- assert ctx != null;
-
- this.ctx = ctx;
-
- t = null;
- err = null;
- }
-
- /**
- * Creates finished future with complete value.
- *
- * @param ctx Context.
* @param t Finished value.
*/
- public GridFinishedFuture(GridKernalContext ctx, T t) {
- assert ctx != null;
-
- this.ctx = ctx;
+ public GridFinishedFuture(T t) {
this.t = t;
-
- err = null;
}
/**
- * @param ctx Context.
* @param err Future error.
*/
- public GridFinishedFuture(GridKernalContext ctx, Throwable err) {
- assert ctx != null;
-
- this.ctx = ctx;
+ public GridFinishedFuture(Throwable err) {
this.err = err;
+ }
- t = null;
+ /**
+ * @return Value of error.
+ */
+ protected Throwable error() {
+ return err;
+ }
+
+ /**
+ * @return Value of result.
+ */
+ protected T result() {
+ return t;
}
/** {@inheritDoc} */
@@ -113,26 +85,6 @@ public class GridFinishedFuture<T> implements IgniteInternalFuture<T>, Externali
}
/** {@inheritDoc} */
- @Override public boolean concurrentNotify() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public void concurrentNotify(boolean concurNotify) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void syncNotify(boolean syncNotify) {
- this.syncNotify = syncNotify;
- }
-
- /** {@inheritDoc} */
- @Override public boolean syncNotify() {
- return syncNotify;
- }
-
- /** {@inheritDoc} */
@Override public boolean cancel() {
return false;
}
@@ -167,52 +119,24 @@ public class GridFinishedFuture<T> implements IgniteInternalFuture<T>, Externali
/** {@inheritDoc} */
@Override public void listenAsync(final IgniteInClosure<? super IgniteInternalFuture<T>> lsnr) {
- if (ctx == null)
- throw new IllegalStateException("Cannot attach listener to deserialized future (context is null): " + this);
-
- if (lsnr != null) {
- if (syncNotify)
- lsnr.apply(this);
- else
- ctx.closure().runLocalSafe(new GPR() {
- @Override public void run() {
- lsnr.apply(GridFinishedFuture.this);
- }
- }, true);
- }
+ if (lsnr != null)
+ lsnr.apply(this);
}
/** {@inheritDoc} */
@Override public <R> IgniteInternalFuture<R> chain(final IgniteClosure<? super IgniteInternalFuture<T>, R> doneCb) {
- GridFutureAdapter<R> fut = new GridFutureAdapter<R>(ctx, syncNotify) {
+ GridFutureAdapter<R> fut = new GridFutureAdapter<R>() {
@Override public String toString() {
return "ChainFuture[orig=" + GridFinishedFuture.this + ", doneCb=" + doneCb + ']';
}
};
- listenAsync(new GridFutureChainListener<>(ctx, fut, doneCb));
+ listenAsync(new GridFutureChainListener<>(fut, doneCb));
return fut;
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(t);
- out.writeObject(err);
- out.writeObject(ctx);
- out.writeBoolean(syncNotify);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked"})
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- t = (T)in.readObject();
- err = (Throwable)in.readObject();
- ctx = (GridKernalContext)in.readObject();
- syncNotify = in.readBoolean();
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridFinishedFuture.class, this);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
deleted file mode 100644
index 84323be..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.future;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-
-/**
- * Future that is completed at creation time. This future is different from
- * {@link GridFinishedFuture} as it does not take context as a parameter and
- * performs notifications in the same thread.
- */
-public class GridFinishedFutureEx<T> implements IgniteInternalFuture<T>, Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Complete value. */
- private T t;
-
- /** Error. */
- private Throwable err;
-
- /** Start time. */
- private final long startTime = U.currentTimeMillis();
-
- /**
- * Created finished future with {@code null} value.
- */
- public GridFinishedFutureEx() {
- this(null, null);
- }
-
- /**
- * Creates finished future with complete value.
- *
- * @param t Finished value.
- */
- public GridFinishedFutureEx(T t) {
- this(t, null);
- }
-
- /**
- * @param err Future error.
- */
- public GridFinishedFutureEx(Throwable err) {
- this(null, err);
- }
-
- /**
- * Creates finished future with complete value and error.
- *
- * @param t Finished value.
- * @param err Future error.
- */
- public GridFinishedFutureEx(T t, Throwable err) {
- this.err = err;
-
- this.t = t;
- }
-
- /** {@inheritDoc} */
- @Override public long startTime() {
- return startTime;
- }
-
- /** {@inheritDoc} */
- @Override public long duration() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean concurrentNotify() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public void concurrentNotify(boolean concurNotify) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void syncNotify(boolean syncNotify) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public boolean syncNotify() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cancel() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public boolean isCancelled() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public boolean isDone() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public T get() throws IgniteCheckedException {
- if (err != null)
- throw U.cast(err);
-
- return t;
- }
-
- /** {@inheritDoc} */
- @Override public T get(long timeout) throws IgniteCheckedException {
- return get();
- }
-
- /** {@inheritDoc} */
- @Override public T get(long timeout, TimeUnit unit) throws IgniteCheckedException {
- return get();
- }
-
- /** {@inheritDoc} */
- @Override public <R> IgniteInternalFuture<R> chain(IgniteClosure<? super IgniteInternalFuture<T>, R> doneCb) {
- try {
- return new GridFinishedFutureEx<>(doneCb.apply(this));
- }
- catch (GridClosureException e) {
- return new GridFinishedFutureEx<>(U.unwrap(e));
- }
- catch (RuntimeException | Error e) {
- U.warn(null, "Failed to notify chained future [doneCb=" + doneCb + ", err=" + e.getMessage() + ']');
-
- throw e;
- }
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked"})
- @Override public void listenAsync(IgniteInClosure<? super IgniteInternalFuture<T>> lsnr) {
- if (lsnr != null)
- lsnr.apply(this);
- }
-
- /**
- * @return {@code True} if future failed.
- */
- protected boolean failed() {
- return err != null;
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(t);
- out.writeObject(err);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked"})
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- t = (T)in.readObject();
- err = (Throwable)in.readObject();
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridFinishedFutureEx.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
index 4beb89a..b107c15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -24,35 +24,17 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
-import java.io.*;
import java.util.*;
import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-
/**
* Future adapter.
*/
-public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements IgniteInternalFuture<R>,
- Externalizable {
+public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements IgniteInternalFuture<R> {
/** */
private static final long serialVersionUID = 0L;
- /** Logger reference. */
- private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
-
- /** Logger. */
- protected static IgniteLogger log;
-
- /** Synchronous notification flag. */
- private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(IGNITE_FUT_SYNC_NOTIFICATION, true);
-
- /** Concurrent notification flag. */
- private static final boolean CONCUR_NOTIFY =
- IgniteSystemProperties.getBoolean(IGNITE_FUT_CONCURRENT_NOTIFICATION, false);
-
/** Initial state. */
private static final int INIT = 0;
@@ -75,52 +57,12 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
/** Future end time. */
private volatile long endTime;
- /** Set to {@code false} on deserialization whenever incomplete future is serialized. */
- private boolean valid = true;
-
/** Asynchronous listeners. */
private Collection<IgniteInClosure<? super IgniteInternalFuture<R>>> lsnrs;
- /** Context. */
- protected GridKernalContext ctx;
-
- /** Synchronous notification flag. */
- private volatile boolean syncNotify = SYNC_NOTIFY;
-
- /** Concurrent notification flag. */
- private volatile boolean concurNotify = CONCUR_NOTIFY;
-
/** */
private final Object mux = new Object();
- /**
- * Empty constructor required for {@link Externalizable}.
- */
- public GridFutureAdapter() {
- // No-op.
- }
-
- /**
- * @param ctx Kernal context.
- */
- public GridFutureAdapter(GridKernalContext ctx) {
- this(ctx, SYNC_NOTIFY);
- }
-
- /**
- * @param syncNotify Synchronous notify flag.
- * @param ctx Kernal context.
- */
- public GridFutureAdapter(GridKernalContext ctx, boolean syncNotify) {
- assert ctx != null;
-
- this.syncNotify = syncNotify;
-
- this.ctx = ctx;
-
- log = U.logger(ctx, logRef, GridFutureAdapter.class);
- }
-
/** {@inheritDoc} */
@Override public long startTime() {
return startTime;
@@ -140,48 +82,10 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
return endTime;
}
- /** {@inheritDoc} */
- @Override public boolean concurrentNotify() {
- return concurNotify;
- }
-
- /** {@inheritDoc} */
- @Override public void concurrentNotify(boolean concurNotify) {
- this.concurNotify = concurNotify;
- }
-
- /** {@inheritDoc} */
- @Override public boolean syncNotify() {
- return syncNotify;
- }
-
- /** {@inheritDoc} */
- @Override public void syncNotify(boolean syncNotify) {
- this.syncNotify = syncNotify;
- }
-
- /**
- * Checks that future is in usable state.
- */
- protected void checkValid() {
- if (!valid)
- throw new IllegalStateException("Incomplete future was serialized and cannot " +
- "be used after deserialization.");
- }
-
- /**
- * @return Valid flag.
- */
- protected boolean isValid() {
- return valid;
- }
-
/**
* @return Value of error.
*/
protected Throwable error() {
- checkValid();
-
return err;
}
@@ -189,15 +93,11 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
* @return Value of result.
*/
protected R result() {
- checkValid();
-
return res;
}
/** {@inheritDoc} */
@Override public R get() throws IgniteCheckedException {
- checkValid();
-
try {
if (endTime == 0)
acquireSharedInterruptibly(0);
@@ -228,8 +128,6 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
A.ensure(timeout >= 0, "timeout cannot be negative: " + timeout);
A.notNull(unit, "unit");
- checkValid();
-
try {
return get0(unit.toNanos(timeout));
}
@@ -263,8 +161,6 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
/** {@inheritDoc} */
@Override public void listenAsync(@Nullable final IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
if (lsnr != null) {
- checkValid();
-
boolean done = isDone();
if (!done) {
@@ -281,27 +177,14 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
}
if (done) {
- try {
- if (syncNotify)
- notifyListener(lsnr);
- else {
- ctx.closure().runLocalSafe(new GPR() {
- @Override public void run() {
- notifyListener(lsnr);
- }
- }, true);
- }
- }
- catch (IllegalStateException ignore) {
- U.warn(null, "Future notification will not proceed because grid is stopped: " + ctx.gridName());
- }
+ notifyListener(lsnr);
}
}
}
/** {@inheritDoc} */
@Override public <T> IgniteInternalFuture<T> chain(final IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb) {
- return new ChainFuture<>(ctx, syncNotify, this, doneCb);
+ return new ChainFuture<>(this, doneCb);
}
/**
@@ -321,30 +204,8 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
assert !lsnrs0.isEmpty();
- if (concurNotify) {
- for (final IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : lsnrs0)
- ctx.closure().runLocalSafe(new GPR() {
- @Override public void run() {
- notifyListener(lsnr);
- }
- }, true);
- }
- else {
- // Always notify in the thread different from start thread.
- if (!syncNotify) {
- ctx.closure().runLocalSafe(new GPR() {
- @Override public void run() {
- // Since concurrent notifications are off, we notify
- // all listeners in one thread.
- for (IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : lsnrs0)
- notifyListener(lsnr);
- }
- }, true);
- }
- else
- for (IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : lsnrs0)
- notifyListener(lsnr);
- }
+ for (IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : lsnrs0)
+ notifyListener(lsnr);
}
/**
@@ -359,11 +220,11 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
lsnr.apply(this);
}
catch (IllegalStateException e) {
- U.warn(null, "Failed to notify listener (is grid stopped?) [grid=" + ctx.gridName() +
+ U.warn(null, "Failed to notify listener (is grid stopped?) [fut=" + this +
", lsnr=" + lsnr + ", err=" + e.getMessage() + ']');
}
catch (RuntimeException | Error e) {
- U.error(log, "Failed to notify listener: " + lsnr, e);
+ U.error(null, "Failed to notify listener: " + lsnr, e);
throw e;
}
@@ -376,8 +237,6 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
* indeed did happen.
*/
@Override public boolean cancel() throws IgniteCheckedException {
- checkValid();
-
return false;
}
@@ -398,8 +257,6 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
/** {@inheritDoc} */
@Override public boolean isCancelled() {
- checkValid();
-
return getState() == CANCELLED;
}
@@ -454,8 +311,6 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
* @return {@code True} if result was set by this call.
*/
private boolean onDone(@Nullable R res, @Nullable Throwable err, boolean cancel) {
- checkValid();
-
boolean notify = false;
try {
@@ -510,54 +365,6 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- int state0 = getState();
-
- out.writeByte(state0);
- out.writeBoolean(syncNotify);
- out.writeBoolean(concurNotify);
-
- // Don't write any further if not done, as deserialized future
- // will be invalid anyways.
- if (state0 != INIT) {
- try {
- acquireSharedInterruptibly(0);
- }
- catch (InterruptedException e) {
- Thread.currentThread().interrupt();
-
- throw new IOException("Thread has been interrupted.", e);
- }
-
- out.writeObject(res);
- out.writeObject(err);
- out.writeObject(ctx);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- int state0 = in.readByte();
-
- setState(state0);
-
- syncNotify = in.readBoolean();
- concurNotify = in.readBoolean();
-
- if (state0 == INIT)
- valid = false;
- else {
- res = (R)in.readObject();
- err = (Throwable)in.readObject();
- ctx = (GridKernalContext)in.readObject();
-
- // Prevent any thread from being locked on deserialized future.
- // This will also set 'endTime'.
- releaseShared(0);
- }
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridFutureAdapter.class, this, "state", state());
}
@@ -583,19 +390,19 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
}
/**
- * @param ctx Context.
- * @param syncNotify Sync notify flag.
* @param fut Future.
* @param doneCb Closure.
*/
- ChainFuture(GridKernalContext ctx, boolean syncNotify,
- GridFutureAdapter<R> fut, IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb) {
- super(ctx, syncNotify);
+ ChainFuture(
+ GridFutureAdapter<R> fut,
+ IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb
+ ) {
+ super();
this.fut = fut;
this.doneCb = doneCb;
- fut.listenAsync(new GridFutureChainListener<>(ctx, this, doneCb));
+ fut.listenAsync(new GridFutureChainListener<>(this, doneCb));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
deleted file mode 100644
index ccce6e7..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.future;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Future adapter without kernal context.
- */
-public class GridFutureAdapterEx<R> extends AbstractQueuedSynchronizer implements IgniteInternalFuture<R>,
- Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Initial state. */
- private static final int INIT = 0;
-
- /** Cancelled state. */
- private static final int CANCELLED = 1;
-
- /** Done state. */
- private static final int DONE = 2;
-
- /** Result. */
- @GridToStringInclude
- private R res;
-
- /** Error. */
- private Throwable err;
-
- /** Future start time. */
- private final long startTime = U.currentTimeMillis();
-
- /** Future end time. */
- private volatile long endTime;
-
- /** Set to {@code false} on deserialization whenever incomplete future is serialized. */
- private boolean valid = true;
-
- /** Asynchronous listener. */
- private final ConcurrentLinkedDeque8<IgniteInClosure<? super IgniteInternalFuture<R>>>
- lsnrs = new ConcurrentLinkedDeque8<>();
-
- /**
- * Empty constructor required for {@link Externalizable}.
- */
- @SuppressWarnings("RedundantNoArgConstructor")
- public GridFutureAdapterEx() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public long startTime() {
- return startTime;
- }
-
- /** {@inheritDoc} */
- @Override public long duration() {
- long endTime = this.endTime;
-
- return endTime == 0 ? U.currentTimeMillis() - startTime : endTime - startTime;
- }
-
- /** {@inheritDoc} */
- @Override public boolean concurrentNotify() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public void concurrentNotify(boolean concurNotify) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public boolean syncNotify() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public void syncNotify(boolean syncNotify) {
- // No-op
- }
-
- /**
- * Checks that future is in usable state.
- */
- protected void checkValid() {
- if (!valid)
- throw new IllegalStateException("Incomplete future was serialized and cannot " +
- "be used after deserialization.");
- }
-
- /**
- * @return Valid flag.
- */
- protected boolean isValid() {
- return valid;
- }
-
- /**
- * @return Value of error.
- */
- protected Throwable error() {
- checkValid();
-
- return err;
- }
-
- /**
- * @return Value of result.
- */
- protected R result() {
- checkValid();
-
- return res;
- }
-
- /** {@inheritDoc} */
- @Override public R get() throws IgniteCheckedException {
- checkValid();
-
- try {
- if (endTime == 0)
- acquireSharedInterruptibly(0);
-
- if (getState() == CANCELLED)
- throw new IgniteFutureCancelledCheckedException("Future was cancelled: " + this);
-
- if (err != null)
- throw U.cast(err);
-
- return res;
- }
- catch (InterruptedException e) {
- Thread.currentThread().interrupt();
-
- throw new IgniteInterruptedCheckedException(e);
- }
- }
-
- /** {@inheritDoc} */
- @Override public R get(long timeout) throws IgniteCheckedException {
- // Do not replace with static import, as it may not compile.
- return get(timeout, TimeUnit.MILLISECONDS);
- }
-
- /** {@inheritDoc} */
- @Override public R get(long timeout, TimeUnit unit) throws IgniteCheckedException {
- A.ensure(timeout >= 0, "timeout cannot be negative: " + timeout);
- A.notNull(unit, "unit");
-
- checkValid();
-
- try {
- return get0(unit.toNanos(timeout));
- }
- catch (InterruptedException e) {
- Thread.currentThread().interrupt();
-
- throw new IgniteInterruptedCheckedException("Got interrupted while waiting for future to complete.", e);
- }
- }
-
- /**
- * @param nanosTimeout Timeout (nanoseconds).
- * @return Result.
- * @throws InterruptedException If interrupted.
- * @throws org.apache.ignite.internal.IgniteFutureTimeoutCheckedException If timeout reached before computation completed.
- * @throws IgniteCheckedException If error occurred.
- */
- @Nullable protected R get0(long nanosTimeout) throws InterruptedException, IgniteCheckedException {
- if (endTime == 0 && !tryAcquireSharedNanos(0, nanosTimeout))
- throw new IgniteFutureTimeoutCheckedException("Timeout was reached before computation completed.");
-
- if (getState() == CANCELLED)
- throw new IgniteFutureCancelledCheckedException("Future was cancelled: " + this);
-
- if (err != null)
- throw U.cast(err);
-
- return res;
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked", "TooBroadScope"})
- @Override public void listenAsync(@Nullable final IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
- if (lsnr != null) {
- checkValid();
-
- boolean done;
-
- IgniteInClosure<? super IgniteInternalFuture<R>> lsnr0 = lsnr;
-
- done = isDone();
-
- if (!done) {
- lsnr0 = new IgniteInClosure<IgniteInternalFuture<R>>() {
- private final AtomicBoolean called = new AtomicBoolean();
-
- @Override public void apply(IgniteInternalFuture<R> t) {
- if (called.compareAndSet(false, true))
- lsnr.apply(t);
- }
-
- @Override public boolean equals(Object o) {
- return o != null && (o == this || o == lsnr || o.equals(lsnr));
- }
-
- @Override public String toString() {
- return lsnr.toString();
- }
- };
-
- lsnrs.add(lsnr0);
-
- done = isDone(); // Double check.
- }
-
- if (done)
- notifyListener(lsnr0);
- }
- }
-
- /** {@inheritDoc} */
- @Override public <T> IgniteInternalFuture<T> chain(final IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb) {
- final GridFutureAdapterEx<T> fut = new GridFutureAdapterEx<T>() {
- @Override public String toString() {
- return "ChainFuture[orig=" + GridFutureAdapterEx.this + ", doneCb=" + doneCb + ']';
- }
- };
-
- listenAsync(new IgniteInClosure<IgniteInternalFuture<R>>() {
- @Override public void apply(IgniteInternalFuture<R> t) {
- try {
- fut.onDone(doneCb.apply(t));
- }
- catch (GridClosureException e) {
- fut.onDone(e.unwrap());
- }
- catch (RuntimeException e) {
- U.warn(null, "Failed to notify chained future (is grid stopped?) [, doneCb=" + doneCb +
- ", err=" + e.getMessage() + ']');
-
- fut.onDone(e);
-
- throw e;
- }
- catch (Error e) {
- U.warn(null, "Failed to notify chained future (is grid stopped?) [doneCb=" + doneCb +
- ", err=" + e.getMessage() + ']');
-
- fut.onDone(e);
-
- throw e;
- }
- }
- });
-
- return fut;
- }
-
- /**
- * Notifies all registered listeners.
- */
- private void notifyListeners() {
- if (lsnrs.isEmptyx())
- return;
-
- for (IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : lsnrs)
- notifyListener(lsnr);
- }
-
- /**
- * Notifies single listener.
- *
- * @param lsnr Listener.
- */
- private void notifyListener(IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
- assert lsnr != null;
-
- try {
- lsnr.apply(this);
- }
- catch (IllegalStateException e) {
- U.warn(null, "Failed to notify listener (is grid stopped?) [lsnr=" + lsnr +
- ", err=" + e.getMessage() + ']');
- }
- catch (RuntimeException | Error e) {
- U.error(null, "Failed to notify listener: " + lsnr, e);
-
- throw e;
- }
- }
-
- /**
- * Default no-op implementation that always returns {@code false}.
- * Futures that do support cancellation should override this method
- * and call {@link #onCancelled()} callback explicitly if cancellation
- * indeed did happen.
- */
- @Override public boolean cancel() throws IgniteCheckedException {
- checkValid();
-
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public boolean isDone() {
- // Don't check for "valid" here, as "done" flag can be read
- // even in invalid state.
- return endTime != 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean isCancelled() {
- checkValid();
-
- return getState() == CANCELLED;
- }
-
- /**
- * Callback to notify that future is finished with {@code null} result.
- * This method must delegate to {@link #onDone(Object, Throwable)} method.
- *
- * @return {@code True} if result was set by this call.
- */
- public final boolean onDone() {
- return onDone(null, null);
- }
-
- /**
- * Callback to notify that future is finished.
- * This method must delegate to {@link #onDone(Object, Throwable)} method.
- *
- * @param res Result.
- * @return {@code True} if result was set by this call.
- */
- public final boolean onDone(@Nullable R res) {
- return onDone(res, null);
- }
-
- /**
- * Callback to notify that future is finished.
- * This method must delegate to {@link #onDone(Object, Throwable)} method.
- *
- * @param err Error.
- * @return {@code True} if result was set by this call.
- */
- public final boolean onDone(@Nullable Throwable err) {
- return onDone(null, err);
- }
-
- /**
- * Callback to notify that future is finished. Note that if non-{@code null} exception is passed in
- * the result value will be ignored.
- *
- * @param res Optional result.
- * @param err Optional error.
- * @return {@code True} if result was set by this call.
- */
- public boolean onDone(@Nullable R res, @Nullable Throwable err) {
- return onDone(res, err, false);
- }
-
- /**
- * @param res Result.
- * @param err Error.
- * @param cancel {@code True} if future is being cancelled.
- * @return {@code True} if result was set by this call.
- */
- private boolean onDone(@Nullable R res, @Nullable Throwable err, boolean cancel) {
- checkValid();
-
- boolean notify = false;
-
- try {
- if (compareAndSetState(INIT, cancel ? CANCELLED : DONE)) {
- this.res = res;
- this.err = err;
-
- notify = true;
-
- releaseShared(0);
-
- return true;
- }
-
- return false;
- }
- finally {
- if (notify)
- notifyListeners();
- }
- }
-
- /**
- * Callback to notify that future is cancelled.
- *
- * @return {@code True} if cancel flag was set by this call.
- */
- public boolean onCancelled() {
- return onDone(null, null, true);
- }
-
- /** {@inheritDoc} */
- @Override protected final int tryAcquireShared(int ignore) {
- return endTime != 0 ? 1 : -1;
- }
-
- /** {@inheritDoc} */
- @Override protected final boolean tryReleaseShared(int ignore) {
- endTime = U.currentTimeMillis();
-
- // Always signal after setting final done status.
- return true;
- }
-
- /**
- * @return String representation of state.
- */
- private String state() {
- int s = getState();
-
- return s == INIT ? "INIT" : s == CANCELLED ? "CANCELLED" : "DONE";
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- int state0 = getState();
-
- out.writeByte(state0);
-
- // Don't write any further if not done, as deserialized future
- // will be invalid anyways.
- if (state0 != INIT) {
- try {
- acquireSharedInterruptibly(0);
- }
- catch (InterruptedException e) {
- Thread.currentThread().interrupt();
-
- throw new IOException("Thread has been interrupted.", e);
- }
-
- out.writeObject(res);
- out.writeObject(err);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- int state0 = in.readByte();
-
- setState(state0);
-
- if (state0 == INIT)
- valid = false;
- else {
- res = (R)in.readObject();
- err = (Throwable)in.readObject();
-
- // Prevent any thread from being locked on deserialized future.
- // This will also set 'endTime'.
- releaseShared(0);
- }
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridFutureAdapterEx.class, this, "state", state());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
index 0599053..d98538e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
@@ -29,9 +29,6 @@ public class GridFutureChainListener<T, R> implements IgniteInClosure<IgniteInte
/** */
private static final long serialVersionUID = 0L;
- /** Context. */
- private final GridKernalContext ctx;
-
/** Target future. */
private final GridFutureAdapter<R> fut;
@@ -40,14 +37,13 @@ public class GridFutureChainListener<T, R> implements IgniteInClosure<IgniteInte
/**
* Constructs chain listener.
- *
- * @param ctx Kernal context.
- * @param fut Target future.
+ * @param fut Target future.
* @param doneCb Done callback.
*/
- public GridFutureChainListener(GridKernalContext ctx, GridFutureAdapter<R> fut,
- IgniteClosure<? super IgniteInternalFuture<T>, R> doneCb) {
- this.ctx = ctx;
+ public GridFutureChainListener(
+ GridFutureAdapter<R> fut,
+ IgniteClosure<? super IgniteInternalFuture<T>, R> doneCb
+ ) {
this.fut = fut;
this.doneCb = doneCb;
}
@@ -61,8 +57,8 @@ public class GridFutureChainListener<T, R> implements IgniteInClosure<IgniteInte
fut.onDone(e.unwrap());
}
catch (RuntimeException | Error e) {
- U.warn(null, "Failed to notify chained future (is grid stopped?) [grid=" + ctx.gridName() +
- ", doneCb=" + doneCb + ", err=" + e.getMessage() + ']');
+ U.warn(null, "Failed to notify chained future (is grid stopped?) [doneCb=" + doneCb +
+ ", err=" + e.getMessage() + ']');
fut.onDone(e);
[15/50] [abbrv] incubator-ignite git commit: ignite-352 review
Posted by yz...@apache.org.
ignite-352 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0e6ab17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0e6ab17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0e6ab17
Branch: refs/heads/ignite-313
Commit: b0e6ab17c284850190012e7c120a95c34316b982
Parents: 403d60f
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 17:28:39 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 17:28:39 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheMetricsImpl.java | 4 ++
.../dht/atomic/GridDhtAtomicCache.java | 2 +-
.../dht/colocated/GridDhtColocatedCache.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 7 +++-
.../cache/GridCacheAbstractMetricsSelfTest.java | 42 ++++++++++++++++++++
5 files changed, 53 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0e6ab17/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 0de039b..446070e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -460,6 +460,8 @@ public class CacheMetricsImpl implements CacheMetrics {
/**
* Transaction commit callback.
+ *
+ * @param duration the time taken in nanoseconds.
*/
public void onTxCommit(long duration) {
txCommits.incrementAndGet();
@@ -472,6 +474,8 @@ public class CacheMetricsImpl implements CacheMetrics {
/**
* Transaction rollback callback.
+ *
+ * @param duration the time taken in nanoseconds.
*/
public void onTxRollback(long duration) {
txRollbacks.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0e6ab17/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git 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
index 9f9af31..add51bd 100644
--- 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
@@ -990,7 +990,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (!success)
break;
- else if (!skipVals)
+ else if (!skipVals && ctx.config().isStatisticsEnabled())
metrics0().onRead(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0e6ab17/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index a59b6aa..cdb1759 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -318,7 +318,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
if (!success)
break;
- else if (!skipVals)
+ else if (!skipVals && ctx.config().isStatisticsEnabled())
ctx.cache().metrics0().onRead(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0e6ab17/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index cf32dcc..af57ce4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1243,7 +1243,8 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> {
GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
if (cacheCtx.cache().configuration().isStatisticsEnabled())
- cacheCtx.cache().metrics0().onTxCommit(System.nanoTime() - tx.startTime());
+ // Convert start time from ms to ns.
+ cacheCtx.cache().metrics0().onTxCommit((U.currentTimeMillis() - tx.startTime()) * 1000);
}
}
@@ -1316,7 +1317,9 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> {
for (int cacheId : tx.activeCacheIds()) {
GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
- cacheCtx.cache().metrics0().onTxRollback(System.nanoTime() - tx.startTime());
+ if (cacheCtx.cache().configuration().isStatisticsEnabled())
+ // Convert start time from ms to ns.
+ cacheCtx.cache().metrics0().onTxRollback((U.currentTimeMillis() - tx.startTime()) * 1000);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0e6ab17/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index d1c5e12..a7fb34a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -103,6 +103,48 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
/**
* @throws Exception If failed.
*/
+ public void testGetMetricsDisable() throws Exception {
+ // Disable statistics.
+ for (int i = 0; i < gridCount(); i++) {
+ Ignite g = grid(i);
+
+ g.jcache(null).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(false);
+ }
+
+ IgniteCache<Object, Object> jcache = grid(0).jcache(null);
+
+ // Write to cache.
+ for (int i = 0; i < KEY_CNT; i++)
+ jcache.put(i, i);
+
+ // Get from cache.
+ for (int i = 0; i < KEY_CNT; i++)
+ jcache.get(i);
+
+ // Remove from cache.
+ for (int i = 0; i < KEY_CNT; i++)
+ jcache.remove(i);
+
+ // Assert that statistics is clear.
+ for (int i = 0; i < gridCount(); i++) {
+ CacheMetrics m = grid(i).jcache(null).metrics();
+
+ assertEquals(m.getCacheGets(), 0);
+ assertEquals(m.getCachePuts(), 0);
+ assertEquals(m.getCacheRemovals(), 0);
+ assertEquals(m.getCacheHits(), 0);
+ assertEquals(m.getCacheMisses(), 0);
+ assertEquals(m.getAverageGetTime(), 0f);
+ assertEquals(m.getAverageRemoveTime(), 0f);
+ assertEquals(m.getAveragePutTime(), 0f);
+ assertEquals(m.getAverageTxCommitTime(), 0f);
+ assertEquals(m.getAverageTxRollbackTime(), 0f);
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testGetMetricsSnapshot() throws Exception {
IgniteCache<Object, Object> cache = grid(0).jcache(null);
[23/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/sprint-2' into ignite-334
Posted by yz...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-334
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5776850
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5776850
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5776850
Branch: refs/heads/ignite-313
Commit: c577685022f9b59342acd2335efeb9149e81049d
Parents: 4df7c85 b2675bc
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 18:12:06 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 18:12:06 2015 +0300
----------------------------------------------------------------------
examples/pom-standalone.xml | 2 +-
.../java/org/apache/ignite/IgniteCluster.java | 8 +-
.../configuration/IgniteConfiguration.java | 5 +-
.../ignite/internal/GridKernalContext.java | 10 +-
.../ignite/internal/GridKernalContextImpl.java | 14 +-
.../apache/ignite/internal/IgniteKernal.java | 23 +-
.../org/apache/ignite/internal/IgnitionEx.java | 592 +++++++++----------
.../affinity/GridAffinityAssignmentCache.java | 13 +-
.../processors/cache/CacheMetricsImpl.java | 4 +
.../processors/cache/GridCacheContext.java | 19 +
.../processors/cache/GridCacheMapEntry.java | 9 +
.../processors/cache/GridCacheProcessor.java | 15 +
.../processors/cache/GridCacheStoreManager.java | 12 +-
.../GridDistributedCacheAdapter.java | 2 +
.../distributed/dht/GridDhtCacheEntry.java | 3 +
.../distributed/dht/GridDhtLocalPartition.java | 5 +
.../dht/atomic/GridDhtAtomicCache.java | 2 +-
.../dht/colocated/GridDhtColocatedCache.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 7 +-
.../processors/cluster/ClusterProcessor.java | 46 ++
.../dataload/IgniteDataLoaderImpl.java | 29 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 440 ++++++++++++++
.../cache/GridCacheAbstractMetricsSelfTest.java | 42 ++
...acheAbstractUsersAffinityMapperSelfTest.java | 207 +++++++
...dCacheAtomicUsersAffinityMapperSelfTest.java | 45 ++
.../GridCachePartitionedLocalStoreSelfTest.java | 51 ++
...chePartitionedOffHeapLocalStoreSelfTest.java | 56 ++
.../GridCacheReplicatedLocalStoreSelfTest.java | 51 ++
...heReplicatedUsersAffinityMapperSelfTest.java | 45 ++
...ridCacheTxPartitionedLocalStoreSelfTest.java | 51 ++
.../GridCacheTxUsersAffinityMapperSelfTest.java | 45 ++
.../GridCacheQueueCleanupSelfTest.java | 1 -
.../IgniteCacheExpiryPolicyAbstractTest.java | 38 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
modules/scalar/pom.xml | 6 +
pom.xml | 4 +-
37 files changed, 1503 insertions(+), 407 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5776850/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
[14/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/403d60fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/403d60fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/403d60fe
Branch: refs/heads/ignite-313
Commit: 403d60feed477a4598509b619b2f63de307b9b5b
Parents: 8baca04 9671471
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 17:16:40 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 17:16:40 2015 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 592 +++++++++----------
.../GridCacheQueueCleanupSelfTest.java | 1 -
3 files changed, 267 insertions(+), 331 deletions(-)
----------------------------------------------------------------------
[13/50] [abbrv] incubator-ignite git commit: ignite-342 review
Posted by yz...@apache.org.
ignite-342 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8baca046
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8baca046
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8baca046
Branch: refs/heads/ignite-313
Commit: 8baca046e02e703b5ce5c0a2f1a34ba279392a3e
Parents: 11efb91
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 17:16:26 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 17:16:26 2015 +0300
----------------------------------------------------------------------
.../affinity/GridAffinityAssignmentCache.java | 13 +-
.../processors/cache/GridCacheContext.java | 19 ++
.../processors/cache/GridCacheProcessor.java | 15 ++
...acheAbstractUsersAffinityMapperSelfTest.java | 207 +++++++++++++++++++
...dCacheAtomicUsersAffinityMapperSelfTest.java | 45 ++++
...heReplicatedUsersAffinityMapperSelfTest.java | 45 ++++
.../GridCacheTxUsersAffinityMapperSelfTest.java | 45 ++++
7 files changed, 388 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8baca046/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 9c12a17..69795b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -305,7 +305,18 @@ public class GridAffinityAssignmentCache {
}
}
- return aff.partition(affMapper.affinityKey(key));
+ return aff.partition(affinityKey(key));
+ }
+
+ /**
+ * If Key is {@link GridCacheInternal GridCacheInternal} entry when won't passed into user's mapper and
+ * will use {@link GridCacheDefaultAffinityKeyMapper default}.
+ *
+ * @param key Key.
+ * @return Affinity key.
+ */
+ private Object affinityKey(Object key) {
+ return (key instanceof GridCacheInternal ? ctx.defaultAffMapper() : affMapper).affinityKey(key);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8baca046/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 3ec013c..44f8e69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
@@ -164,6 +165,9 @@ public class GridCacheContext<K, V> implements Externalizable {
/** Cached local rich node. */
private ClusterNode locNode;
+ /** Default cache affinity mapper. */
+ private CacheAffinityKeyMapper affMapper;
+
/**
* Thread local projection. If it's set it means that method call was initiated
* by child projection of initial cache.
@@ -1016,6 +1020,20 @@ public class GridCacheContext<K, V> implements Externalizable {
}
/**
+ * @return Default affinity key mapper.
+ */
+ public CacheAffinityKeyMapper defaultAffMapper() {
+ return affMapper;
+ }
+
+ /**
+ * Sets default affinity key mapper.
+ */
+ public void defaultAffMapper(CacheAffinityKeyMapper dfltAffMapper) {
+ this.affMapper = dfltAffMapper;
+ }
+
+ /**
* @param p Single predicate.
* @return Array containing single predicate.
*/
@@ -1770,6 +1788,7 @@ public class GridCacheContext<K, V> implements Externalizable {
evictMgr = null;
qryMgr = null;
dataStructuresMgr = null;
+ affMapper = null;
mgrs.clear();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8baca046/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index e99c706..f74f969 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -618,6 +618,17 @@ public class GridCacheProcessor extends GridProcessorAdapter {
U.startLifecycleAware(lifecycleAwares(cfg, jta.tmLookup(), cfgStore));
+ // Init default key mapper.
+ CacheAffinityKeyMapper dfltAffMapper;
+
+ if (cfg.getAffinityMapper().getClass().equals(GridCacheDefaultAffinityKeyMapper.class))
+ dfltAffMapper = cfg.getAffinityMapper();
+ else {
+ dfltAffMapper = new GridCacheDefaultAffinityKeyMapper();
+
+ prepare(cfg, dfltAffMapper, false);
+ }
+
cfgs[i] = cfg; // Replace original configuration value.
GridCacheAffinityManager affMgr = new GridCacheAffinityManager();
@@ -655,6 +666,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
drMgr,
jta);
+ cacheCtx.defaultAffMapper(dfltAffMapper);
+
GridCacheAdapter cache = null;
switch (cfg.getCacheMode()) {
@@ -793,6 +806,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
drMgr,
jta);
+ cacheCtx.defaultAffMapper(dfltAffMapper);
+
GridDhtCacheAdapter dht = null;
switch (cfg.getAtomicityMode()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8baca046/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
new file mode 100644
index 0000000..71f28ce
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
@@ -0,0 +1,207 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+
+/**
+ * Test affinity mapper.
+ */
+public abstract class GridCacheAbstractUsersAffinityMapperSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final int KEY_CNT = 1000;
+
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ public static final CacheAffinityKeyMapper AFFINITY_MAPPER = new UsersAffinityKeyMapper();
+
+ /** */
+ public GridCacheAbstractUsersAffinityMapperSelfTest() {
+ super(false /* doesn't start grid */);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ CacheConfiguration cacheCfg = new CacheConfiguration();
+
+ cacheCfg.setName(null);
+ cacheCfg.setCacheMode(getCacheMode());
+ cacheCfg.setAtomicityMode(getAtomicMode());
+ cacheCfg.setDistributionMode(getDistributionMode());
+ cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ cacheCfg.setPreloadMode(CachePreloadMode.SYNC);
+ cacheCfg.setAffinityMapper(AFFINITY_MAPPER);
+
+ cfg.setCacheConfiguration(cacheCfg);
+
+ TcpDiscoverySpi spi = new TcpDiscoverySpi();
+
+ spi.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(spi);
+
+ return cfg;
+ }
+
+ /**
+ * @return Distribution mode.
+ */
+ protected abstract CacheDistributionMode getDistributionMode();
+
+ /**
+ * @return Cache atomicity mode.
+ */
+ protected abstract CacheAtomicityMode getAtomicMode();
+
+ /**
+ * @return Cache mode.
+ */
+ protected abstract CacheMode getCacheMode();
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testAffinityMapper() throws Exception {
+ IgniteCache<Object, Object> cache = startGrid(0).jcache(null);
+
+ for (int i = 0; i < KEY_CNT; i++) {
+ cache.put(String.valueOf(i), String.valueOf(i));
+
+ cache.put(new TestAffinityKey(i, String.valueOf(i)), i);
+ }
+
+ assertEquals(1, cache.get(new TestAffinityKey(1, "1")));
+
+ startGrid(1);
+
+ for (int i = 0; i < KEY_CNT; i++)
+ grid(i % 2).compute().affinityRun(null, new TestAffinityKey(1, "1"), new NoopClosure());
+ }
+
+ /**
+ * Test key for field annotation.
+ */
+ private static class TestAffinityKey implements Externalizable {
+ /** Key. */
+ private int key;
+
+ /** Affinity key. */
+ @CacheAffinityKeyMapped
+ private String affKey;
+
+ /**
+ * Constructor.
+ */
+ public TestAffinityKey() {
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param key Key.
+ * @param affKey Affinity key.
+ */
+ TestAffinityKey(int key, String affKey) {
+ this.key = key;
+ this.affKey = affKey;
+ }
+
+ /**
+ * @return Key.
+ */
+ public int key() {
+ return key;
+ }
+
+ /**
+ * @return Affinity key.
+ */
+ public String affinityKey() {
+ return affKey;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return o instanceof TestAffinityKey && key == ((TestAffinityKey)o).key();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return key + affKey.hashCode();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeInt(key);
+ out.writeUTF(affKey);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ key = in.readInt();
+ affKey = in.readUTF();
+ }
+ }
+
+ /**
+ * Users affinity mapper.
+ */
+ private static class UsersAffinityKeyMapper extends GridCacheDefaultAffinityKeyMapper{
+ /** {@inheritDoc} */
+ @Override public Object affinityKey(Object key) {
+ GridArgumentCheck.notNull(key, "key");
+
+ assertFalse("GridCacheInternal entry mustn't be passed in user's key mapper.",
+ key instanceof GridCacheInternal);
+
+ return super.affinityKey(key);
+ }
+ }
+
+ /**
+ * Noop closure.
+ */
+ private static class NoopClosure implements IgniteRunnable {
+ /** {@inheritDoc} */
+ @Override public void run() {
+ // No-op.
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8baca046/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java
new file mode 100644
index 0000000..8a80e35
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Test affinity mapper.
+ */
+public class GridCacheAtomicUsersAffinityMapperSelfTest extends GridCacheAbstractUsersAffinityMapperSelfTest {
+ /** */
+ public GridCacheAtomicUsersAffinityMapperSelfTest() {
+ super();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheDistributionMode getDistributionMode() {
+ return CacheDistributionMode.PARTITIONED_ONLY;
+ };
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode getAtomicMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode getCacheMode() {
+ return CacheMode.PARTITIONED;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8baca046/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedUsersAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedUsersAffinityMapperSelfTest.java
new file mode 100644
index 0000000..47e5dc7
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedUsersAffinityMapperSelfTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Test affinity mapper.
+ */
+public class GridCacheReplicatedUsersAffinityMapperSelfTest extends GridCacheAbstractUsersAffinityMapperSelfTest {
+ /** */
+ public GridCacheReplicatedUsersAffinityMapperSelfTest() {
+ super();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheDistributionMode getDistributionMode() {
+ return CacheDistributionMode.PARTITIONED_ONLY;
+ };
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode getAtomicMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode getCacheMode() {
+ return CacheMode.REPLICATED;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8baca046/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTxUsersAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTxUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTxUsersAffinityMapperSelfTest.java
new file mode 100644
index 0000000..61af04e
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTxUsersAffinityMapperSelfTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Test affinity mapper.
+ */
+public class GridCacheTxUsersAffinityMapperSelfTest extends GridCacheAbstractUsersAffinityMapperSelfTest {
+ /** */
+ public GridCacheTxUsersAffinityMapperSelfTest() {
+ super();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheDistributionMode getDistributionMode() {
+ return CacheDistributionMode.PARTITIONED_ONLY;
+ };
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode getAtomicMode() {
+ return CacheAtomicityMode.TRANSACTIONAL;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode getCacheMode() {
+ return CacheMode.PARTITIONED;
+ }
+}
[24/50] [abbrv] incubator-ignite git commit: #ignite-237: change
client test.
Posted by yz...@apache.org.
#ignite-237: change client test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f144a892
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f144a892
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f144a892
Branch: refs/heads/ignite-313
Commit: f144a892e9747b297610f7d9d19c44f362dd4b1f
Parents: 9efcd80
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 19:29:55 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 19:29:55 2015 +0300
----------------------------------------------------------------------
.../client/integration/ClientAbstractMultiNodeSelfTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f144a892/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index e73f06d..9257b71 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -403,8 +403,6 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
if (affinity(cache).isPrimaryOrBackup(g.cluster().localNode(), key))
assertEquals("zzz", cache.localPeek(key, CachePeekMode.ONHEAP));
- else
- assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
}
}
[03/50] [abbrv] incubator-ignite git commit: # ignite-382 Changed
version.
Posted by yz...@apache.org.
# ignite-382 Changed version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f252ee41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f252ee41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f252ee41
Branch: refs/heads/ignite-313
Commit: f252ee4177c3f1cf4b8eb47014e930da696600c2
Parents: 13e2d1f
Author: anovikov <an...@gridgain.com>
Authored: Mon Mar 2 16:36:11 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Mon Mar 2 16:36:11 2015 +0700
----------------------------------------------------------------------
examples/pom-standalone.xml | 2 +-
modules/core/src/main/resources/ignite.properties | 2 +-
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f252ee41/examples/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml
index 47df6bd..5de7433 100644
--- a/examples/pom-standalone.xml
+++ b/examples/pom-standalone.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <ignite.version>1.0.1-RC1-SNAPSHOT</ignite.version>
+ <ignite.version>1.0.0-RC2-SNAPSHOT</ignite.version>
</properties>
<groupId>org.apache.ignite</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f252ee41/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index caa7553..4295dce 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-ignite.version=1.0.1-rc1
+ignite.version=1.0.0-rc2
ignite.build=0
ignite.revision=DEV
ignite.rel.date=01011970
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f252ee41/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 98f649d..b0ebc44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
</parent>
<properties>
- <ignite.version>1.0.1-RC1-SNAPSHOT</ignite.version>
+ <ignite.version>1.0.0-RC2-SNAPSHOT</ignite.version>
<ignite.edition>fabric</ignite.edition>
<hadoop.version>2.4.1</hadoop.version>
<spring.version>4.1.0.RELEASE</spring.version>
@@ -574,7 +574,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>test</id>
<build>
[25/50] [abbrv] incubator-ignite git commit: # IGNITE-380 Added
snippet generation.
Posted by yz...@apache.org.
# IGNITE-380 Added snippet generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7488eddd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7488eddd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7488eddd
Branch: refs/heads/ignite-313
Commit: 7488eddd6e0224d18ecdd9b7fb51566e926ead5d
Parents: b2675bc
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Mar 3 14:49:27 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Mar 3 14:49:27 2015 +0700
----------------------------------------------------------------------
.../ignite/cache/CacheTypeFieldMetadata.java | 2 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 18 +--
.../ignite/schema/generator/PojoGenerator.java | 3 +-
.../schema/generator/SnippetGenerator.java | 138 +++++++++++++++++++
.../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +
5 files changed, 151 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
index 0041f10..625873b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
@@ -50,7 +50,7 @@ public class CacheTypeFieldMetadata {
* @param javaName Field name in java object.
* @param javaType Field java type.
*/
- public CacheTypeFieldMetadata(String javaName, Class<?> javaType, String dbName, int dbType) {
+ public CacheTypeFieldMetadata(String dbName, int dbType, String javaName, Class<?> javaType) {
this.dbName = dbName;
this.dbType = dbType;
this.javaName = javaName;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
index 1e502c9..f25d9f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
@@ -230,6 +230,15 @@ public class CacheTypeMetadata {
}
/**
+ * Sets value fields.
+ *
+ * @param valFields New value fields.
+ */
+ public void setValueFields(Collection<CacheTypeFieldMetadata> valFields) {
+ this.valFields = valFields;
+ }
+
+ /**
* Gets query-enabled fields.
*
* @return Collection of fields available for query.
@@ -318,13 +327,4 @@ public class CacheTypeMetadata {
public void setGroups(Map<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>> grps) {
this.grps = grps;
}
-
- /**
- * Sets value fields.
- *
- * @param valFields New value fields.
- */
- public void setValueFields(Collection<CacheTypeFieldMetadata> valFields) {
- this.valFields = valFields;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
index 7d12e2c..500aa9a 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
@@ -401,8 +401,7 @@ public class PojoGenerator {
* @throws IOException If failed to write generated code into file.
*/
public static void generate(PojoDescriptor pojo, String outFolder, String pkg, boolean constructor,
- boolean includeKeys, ConfirmCallable askOverwrite)
- throws IOException {
+ boolean includeKeys, ConfirmCallable askOverwrite) throws IOException {
File pkgFolder = new File(outFolder, pkg.replace('.', File.separatorChar));
if (!pkgFolder.exists() && !pkgFolder.mkdirs())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
new file mode 100644
index 0000000..e54c019
--- /dev/null
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.schema.generator;
+
+import org.apache.ignite.schema.model.*;
+import org.apache.ignite.schema.ui.*;
+
+import java.io.*;
+import java.util.*;
+
+import static org.apache.ignite.schema.ui.MessageBox.Result.*;
+
+/**
+ * Cache configuration snippet generator.
+ */
+public class SnippetGenerator {
+ /**
+ * Add type fields.
+ *
+ * @param src Source code lines.
+ * @param owner Fields owner collection.
+ * @param fields Fields metadata.
+ */
+ private static void addFields(Collection<String> src, String owner, Collection<PojoField> fields) {
+ for (PojoField field : fields) {
+ String javaTypeName = field.javaTypeName();
+
+ if (javaTypeName.startsWith("java.lang."))
+ javaTypeName = javaTypeName.substring(10);
+
+ src.add(owner + ".add(new CacheTypeFieldMetadata(\"" + field.dbName() + "\", " +
+ "java.sql.Types." + field.dbTypeName() + ",\"" +
+ field.javaName() + "\", " + javaTypeName + ".class));");
+ }
+ }
+
+ /**
+ * Generate java snippet for cache configuration with JDBC store.
+ *
+ * @param pojos POJO descriptors.
+ * @param pkg Types package.
+ * @param includeKeys {@code true} if key fields should be included into value class.
+ * @param out File to output snippet.
+ * @param askOverwrite Callback to ask user to confirm file overwrite.
+ * @throws IOException If generation failed.
+ */
+ public static void generate(Collection<PojoDescriptor> pojos, String pkg, boolean includeKeys, File out,
+ ConfirmCallable askOverwrite) throws IOException {
+ if (out.exists()) {
+ MessageBox.Result choice = askOverwrite.confirm(out.getName());
+
+ if (CANCEL == choice)
+ throw new IllegalStateException("Java configuration snippet generation was canceled!");
+
+ if (NO == choice || NO_TO_ALL == choice)
+ return;
+ }
+
+ Collection<String> src = new ArrayList<>(256);
+
+ src.add("// Code snippet for cache configuration.");
+ src.add("");
+ src.add("IgniteConfiguration cfg = new IgniteConfiguration();");
+ src.add("");
+ src.add("CacheConfiguration ccfg = new CacheConfiguration<>();");
+ src.add("");
+ src.add("DataSource dataSource = null; // TODO: Create data source for your database.");
+ src.add("");
+ src.add("// Create store. ");
+ src.add("CacheJdbcPojoStore store = new CacheJdbcPojoStore();");
+ src.add("store.setDataSource(dataSource);");
+ src.add("");
+ src.add("// Create store factory. ");
+ src.add("ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory<>(store));");
+ src.add("");
+ src.add("// Configure cache to use store. ");
+ src.add("ccfg.setReadThrough(true);");
+ src.add("ccfg.setWriteThrough(true);");
+ src.add("");
+ src.add("cfg.setCacheConfiguration(ccfg);");
+ src.add("");
+ src.add("// Configure cache types. ");
+ src.add("Collection<CacheTypeMetadata> meta = new ArrayList<>();");
+ src.add("");
+
+ boolean first = true;
+
+ for (PojoDescriptor pojo : pojos) {
+ String tbl = pojo.table();
+
+ src.add("// " + tbl + ".");
+ src.add((first ? "CacheTypeMetadata " : "") + "type = new CacheTypeMetadata();");
+ src.add("type.setDatabaseSchema(\"" + pojo.schema() + "\");");
+ src.add("type.setDatabaseTable(\"" + tbl + "\");");
+ src.add("type.setKeyType(\"" + pkg + "." + pojo.keyClassName() + "\");");
+ src.add("type.setValueType(\"" + pkg + "." + pojo.valueClassName() + "\");");
+ src.add("");
+
+ src.add("// Key fields for " + tbl + ".");
+ src.add((first ? "Collection<CacheTypeFieldMetadata> " : "") + "keys = new ArrayList<>();");
+ addFields(src, "keys", pojo.valueFields(includeKeys));
+ src.add("type.setKeyFields(keys);");
+ src.add("");
+
+ src.add("// Value fields for " + tbl + ".");
+ src.add((first ? "Collection<CacheTypeFieldMetadata> " : "") + "vals = new ArrayList<>();");
+ addFields(src, "vals", pojo.valueFields(includeKeys));
+ src.add("type.setValueFields(vals);");
+ src.add("");
+
+ first = false;
+ }
+
+ src.add("// Start Ignite node.");
+ src.add("Ignition.start(cfg);");
+
+ // Write generated code to file.
+ try (Writer writer = new BufferedWriter(new FileWriter(out))) {
+ for (String line : src)
+ writer.write(line + '\n');
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
index 9c88624..f43c5ca 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
@@ -435,6 +435,8 @@ public class SchemaLoadApp extends Application {
if (singleXml)
XmlGenerator.generate(pkg, all, includeKeys, new File(outFolder, "Ignite.xml"), askOverwrite);
+ SnippetGenerator.generate(all, pkg, includeKeys, new File(outFolder, "Ignite.snippet"), askOverwrite);
+
perceptualDelay(started);
return null;
[28/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-334' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-334' into sprint-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/e5e2a8e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5e2a8e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5e2a8e1
Branch: refs/heads/ignite-313
Commit: e5e2a8e1f1881abf80420d4bf1b64d2775f6cf29
Parents: b81c6a2 c577685
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Mar 3 11:45:03 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Mar 3 11:45:03 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/IgniteConfiguration.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[02/50] [abbrv] incubator-ignite git commit: #ignite-239: review.
Posted by yz...@apache.org.
#ignite-239: review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08df446b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08df446b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08df446b
Branch: refs/heads/ignite-313
Commit: 08df446b39f28b7a4b670650f0e39797c0cfa5c5
Parents: 0b1eccf
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 12:15:13 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 12:15:13 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/IgnitionEx.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08df446b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index c2c23f7..cb2efbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1494,6 +1494,8 @@ public class IgnitionEx {
UUID nodeId = cfg.getNodeId() != null ? cfg.getNodeId() : UUID.randomUUID();
+ myCfg.setNodeId(nodeId);
+
IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), nodeId);
assert cfgLog != null;
@@ -1563,10 +1565,8 @@ public class IgnitionEx {
}
}
- if (myCfg.getUserAttributes() == null) {
- Map<String, ?> emptyAttr = Collections.emptyMap();
- myCfg.setUserAttributes(emptyAttr);
- }
+ if (myCfg.getUserAttributes() == null)
+ myCfg.setUserAttributes(Collections.<String, Object>emptyMap());
if (myCfg.getMBeanServer() == null)
myCfg.setMBeanServer(ManagementFactory.getPlatformMBeanServer());
@@ -1606,8 +1606,6 @@ public class IgnitionEx {
if (myCfg.getPeerClassLoadingLocalClassPathExclude() == null)
myCfg.setPeerClassLoadingLocalClassPathExclude(EMPTY_STR_ARR);
- myCfg.setNodeId(nodeId);
-
IgfsConfiguration[] igfsCfgs = myCfg.getIgfsConfiguration();
if (igfsCfgs != null) {
[42/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/9af25666
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9af25666
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9af25666
Branch: refs/heads/ignite-313
Commit: 9af256661cebeb78710d87d273663be39c72a1d8
Parents: 03b966f 882ded5
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Mar 4 17:52:05 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Mar 4 17:52:05 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/schema/generator/SnippetGenerator.java | 2 +-
.../apache/ignite/schema/parser/DatabaseMetadataParser.java | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[50/50] [abbrv] incubator-ignite git commit: futures: api cleanup
Posted by yz...@apache.org.
futures: api cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc18635a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc18635a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc18635a
Branch: refs/heads/ignite-313
Commit: bc18635a9358df5f155eba69f30d74410ae5d3e7
Parents: c1b4695
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Mar 5 11:02:08 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Mar 5 11:02:08 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheMultiTxFuture.java | 40 +-----
.../internal/util/future/GridFutureAdapter.java | 122 ++++++++++------
.../processors/schedule/ScheduleFutureImpl.java | 140 +------------------
3 files changed, 95 insertions(+), 207 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc18635a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
index c6829aa..71ba123 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -33,15 +32,9 @@ import java.util.concurrent.atomic.*;
* Future which waits for completion of one or more transactions.
*/
public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolean> {
- /** */
- private static final long serialVersionUID = 0L;
-
/** Logger reference. */
private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
- /** Transactions to wait for. */
- private final Set<IgniteInternalTx<K, V>> txs = new GridLeanSet<>();
-
/** */
private Set<IgniteInternalTx<K, V>> remainingTxs;
@@ -58,46 +51,28 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
}
/**
- * Empty constructor required for {@link Externalizable}.
- */
- public GridCacheMultiTxFuture() {
- // No-op.
- }
-
- /**
- * @return Transactions to wait for.
- */
- public Set<IgniteInternalTx<K, V>> txs() {
- return txs;
- }
-
- /**
- * @return Remaining transactions.
- */
- public Set<IgniteInternalTx<K, V>> remainingTxs() {
- return remainingTxs;
- }
-
- /**
* @param tx Transaction to add.
*/
public void addTx(IgniteInternalTx<K, V> tx) {
- txs.add(tx);
+ if (remainingTxs == null)
+ remainingTxs = new GridConcurrentHashSet<>();
+
+ remainingTxs.add(tx);
}
/**
* Initializes this future.
*/
public void init() {
- if (F.isEmpty(txs)) {
+ if (remainingTxs == null) {
remainingTxs = Collections.emptySet();
onDone(true);
}
else {
- remainingTxs = new GridConcurrentHashSet<>(txs);
+ assert !remainingTxs.isEmpty();
- for (final IgniteInternalTx<K, V> tx : txs) {
+ for (final IgniteInternalTx<K, V> tx : remainingTxs) {
if (!tx.done()) {
tx.finishFuture().listenAsync(new CI1<IgniteInternalFuture<IgniteInternalTx>>() {
@Override public void apply(IgniteInternalFuture<IgniteInternalTx> t) {
@@ -134,7 +109,6 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridCacheMultiTxFuture.class, this,
- "txs", F.viewReadOnly(txs, CU.<K, V>tx2xidVersion()),
"remaining", F.viewReadOnly(remainingTxs, CU.<K, V>tx2xidVersion()),
"super", super.toString()
);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc18635a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
index b107c15..b35d18a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -32,9 +32,6 @@ import java.util.concurrent.locks.*;
* Future adapter.
*/
public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements IgniteInternalFuture<R> {
- /** */
- private static final long serialVersionUID = 0L;
-
/** Initial state. */
private static final int INIT = 0;
@@ -44,12 +41,18 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
/** Done state. */
private static final int DONE = 2;
+ /** */
+ private static final byte ERR = 1;
+
+ /** */
+ private static final byte RES = 2;
+
+ /** */
+ private byte resFlag;
+
/** Result. */
@GridToStringInclude
- private R res;
-
- /** Error. */
- private Throwable err;
+ private Object res;
/** Future start time. */
private final long startTime = U.currentTimeMillis();
@@ -57,11 +60,8 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
/** Future end time. */
private volatile long endTime;
- /** Asynchronous listeners. */
- private Collection<IgniteInClosure<? super IgniteInternalFuture<R>>> lsnrs;
-
/** */
- private final Object mux = new Object();
+ private IgniteInClosure<? super IgniteInternalFuture<R>> lsnr;
/** {@inheritDoc} */
@Override public long startTime() {
@@ -86,14 +86,14 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
* @return Value of error.
*/
protected Throwable error() {
- return err;
+ return (resFlag == RES) ? null : (Throwable)res;
}
/**
* @return Value of result.
*/
protected R result() {
- return res;
+ return (R)res;
}
/** {@inheritDoc} */
@@ -105,10 +105,10 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
if (getState() == CANCELLED)
throw new IgniteFutureCancelledCheckedException("Future was cancelled: " + this);
- if (err != null)
- throw U.cast(err);
+ if (resFlag != ERR)
+ throw U.cast((Throwable)res);
- return res;
+ return (R)res;
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
@@ -152,33 +152,35 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
if (getState() == CANCELLED)
throw new IgniteFutureCancelledCheckedException("Future was cancelled: " + this);
- if (err != null)
- throw U.cast(err);
+ if (resFlag != ERR)
+ throw U.cast((Throwable)res);
- return res;
+ return (R)res;
}
/** {@inheritDoc} */
- @Override public void listenAsync(@Nullable final IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
- if (lsnr != null) {
+ @Override public void listenAsync(@Nullable final IgniteInClosure<? super IgniteInternalFuture<R>> lsnr0) {
+ if (lsnr0 != null) {
boolean done = isDone();
if (!done) {
- synchronized (mux) {
+ synchronized (this) {
done = isDone(); // Double check.
if (!done) {
- if (lsnrs == null)
- lsnrs = new ArrayList<>();
-
- lsnrs.add(lsnr);
+ if (lsnr == null)
+ lsnr = lsnr0;
+ else if (lsnr instanceof ArrayListener)
+ ((ArrayListener)lsnr).add(lsnr0);
+ else {
+ lsnr = (IgniteInClosure)new ArrayListener<IgniteInternalFuture>(lsnr, lsnr0);
+ }
}
}
}
- if (done) {
- notifyListener(lsnr);
- }
+ if (done)
+ notifyListener(lsnr0);
}
}
@@ -191,21 +193,20 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
* Notifies all registered listeners.
*/
private void notifyListeners() {
- final Collection<IgniteInClosure<? super IgniteInternalFuture<R>>> lsnrs0;
+ IgniteInClosure<? super IgniteInternalFuture<R>> lsnrs0;
- synchronized (mux) {
- lsnrs0 = lsnrs;
+ synchronized (this) {
+ lsnrs0 = lsnr;
- if (lsnrs0 == null || lsnrs0.isEmpty())
+ if (lsnrs0 == null)
return;
- lsnrs = null;
+ lsnr = null;
}
- assert !lsnrs0.isEmpty();
+ assert lsnr == null;
- for (IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : lsnrs0)
- notifyListener(lsnr);
+ notifyListener(lsnr);
}
/**
@@ -252,7 +253,7 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
*/
public boolean isFailed() {
// Must read endTime first.
- return endTime != 0 && err != null;
+ return endTime != 0 && resFlag == ERR;
}
/** {@inheritDoc} */
@@ -315,8 +316,14 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
try {
if (compareAndSetState(INIT, cancel ? CANCELLED : DONE)) {
- this.res = res;
- this.err = err;
+ if (err != null) {
+ resFlag = ERR;
+ this.res = err;
+ }
+ else {
+ resFlag = RES;
+ this.res = res;
+ }
notify = true;
@@ -372,6 +379,41 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
/**
*
*/
+ private static class ArrayListener<R> implements IgniteInClosure<IgniteInternalFuture<R>> {
+ /** */
+ private IgniteInClosure<? super IgniteInternalFuture<R>>[] arr;
+
+ /**
+ * @param lsnrs Listeners.
+ */
+ private ArrayListener(IgniteInClosure... lsnrs) {
+ this.arr = lsnrs;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void apply(IgniteInternalFuture<R> fut) {
+ for (int i = 0; i < arr.length; i++)
+ arr[i].apply(fut);
+ }
+
+ /**
+ * @param lsnr Listener.
+ */
+ void add(IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
+ arr = Arrays.copyOf(arr, arr.length + 1);
+
+ arr[arr.length - 1] = lsnr;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(ArrayListener.class, this, "arr", Arrays.toString(arr));
+ }
+ }
+
+ /**
+ *
+ */
private static class ChainFuture<R, T> extends GridFutureAdapter<T> {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc18635a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
index 7f76873..b677770 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
@@ -41,10 +41,7 @@ import static java.util.concurrent.TimeUnit.*;
/**
* Implementation of {@link org.apache.ignite.scheduler.SchedulerFuture} interface.
*/
-class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
+class ScheduleFutureImpl<R> implements SchedulerFuture<R> {
/** Empty time array. */
private static final long[] EMPTY_TIMES = new long[] {};
@@ -109,12 +106,6 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
/** Listener call count. */
private int lastLsnrExecCnt;
- /** Synchronous notification flag. */
- private volatile boolean syncNotify = IgniteSystemProperties.getBoolean(IGNITE_FUT_SYNC_NOTIFICATION, true);
-
- /** Concurrent notification flag. */
- private volatile boolean concurNotify = IgniteSystemProperties.getBoolean(IGNITE_FUT_CONCURRENT_NOTIFICATION, false);
-
/** Mutex. */
private final Object mux = new Object();
@@ -274,26 +265,6 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
}
- /** {@inheritDoc} */
- @Override public boolean concurrentNotify() {
- return concurNotify;
- }
-
- /** {@inheritDoc} */
- @Override public void concurrentNotify(boolean concurNotify) {
- this.concurNotify = concurNotify;
- }
-
- /** {@inheritDoc} */
- @Override public boolean syncNotify() {
- return syncNotify;
- }
-
- /** {@inheritDoc} */
- @Override public void syncNotify(boolean syncNotify) {
- this.syncNotify = syncNotify;
- }
-
/**
* Sets execution task.
*
@@ -606,7 +577,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
// Avoid race condition in case if listener was added after
// first execution completed.
if (notifyLsnr)
- notifyListener(lsnr, res, err, syncNotify);
+ notifyListener(lsnr, res, err);
}
}
@@ -648,30 +619,13 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
* @param lsnr Listener to notify.
* @param res Last execution result.
* @param err Last execution error.
- * @param syncNotify Synchronous notification flag.
*/
- private void notifyListener(final IgniteInClosure<? super IgniteFuture<R>> lsnr, R res, Throwable err,
- boolean syncNotify) {
+ private void notifyListener(final IgniteInClosure<? super IgniteFuture<R>> lsnr, R res, Throwable err) {
assert lsnr != null;
assert !Thread.holdsLock(mux);
assert ctx != null;
- final SchedulerFuture<R> snapshot = snapshot(res, err);
-
- if (syncNotify)
- lsnr.apply(snapshot);
- else {
- try {
- ctx.closure().runLocalSafe(new Runnable() {
- @Override public void run() {
- lsnr.apply(snapshot);
- }
- }, true);
- }
- catch (Throwable e) {
- U.error(log, "Failed to notify listener: " + this, e);
- }
- }
+ lsnr.apply(snapshot(res, err));
}
/**
@@ -687,22 +641,8 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
final SchedulerFuture<R> snapshot = snapshot(res, err);
- if (concurNotify) {
- for (final IgniteInClosure<? super IgniteFuture<R>> lsnr : tmp)
- ctx.closure().runLocalSafe(new GPR() {
- @Override public void run() {
- lsnr.apply(snapshot);
- }
- }, true);
- }
- else {
- ctx.closure().runLocalSafe(new GPR() {
- @Override public void run() {
- for (IgniteInClosure<? super IgniteFuture<R>> lsnr : tmp)
- lsnr.apply(snapshot);
- }
- }, true);
- }
+ for (IgniteInClosure<? super IgniteFuture<R>> lsnr : tmp)
+ lsnr.apply(snapshot);
}
/**
@@ -839,26 +779,6 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public boolean concurrentNotify() {
- return ref.concurrentNotify();
- }
-
- /** {@inheritDoc} */
- @Override public void concurrentNotify(boolean concurNotify) {
- ref.concurrentNotify(concurNotify);
- }
-
- /** {@inheritDoc} */
- @Override public void syncNotify(boolean syncNotify) {
- ref.syncNotify(syncNotify);
- }
-
- /** {@inheritDoc} */
- @Override public boolean syncNotify() {
- return ref.syncNotify();
- }
-
- /** {@inheritDoc} */
@Override public String id() {
return ref.id();
}
@@ -965,54 +885,6 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- boolean cancelled;
- R lastRes;
- Throwable lastErr;
- GridScheduleStatistics stats;
-
- synchronized (mux) {
- cancelled = this.cancelled;
- lastRes = this.lastRes;
- lastErr = this.lastErr;
- stats = this.stats;
- }
-
- out.writeBoolean(cancelled);
- out.writeObject(lastRes);
- out.writeObject(lastErr);
- out.writeObject(stats);
-
- out.writeBoolean(syncNotify);
- out.writeBoolean(concurNotify);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked"})
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- CountDownLatch latch = new CountDownLatch(0);
-
- boolean cancelled = in.readBoolean();
- R lastRes = (R)in.readObject();
- Throwable lastErr = (Throwable)in.readObject();
- GridScheduleStatistics stats = (GridScheduleStatistics)in.readObject();
-
- syncNotify = in.readBoolean();
- concurNotify = in.readBoolean();
-
- synchronized (mux) {
- done = true;
-
- resLatch = latch;
-
- this.cancelled = cancelled;
- this.lastRes = lastRes;
- this.lastErr = lastErr;
- this.stats = stats;
- }
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(ScheduleFutureImpl.class, this);
}
[17/50] [abbrv] incubator-ignite git commit: # MInor JavADoc change.
Posted by yz...@apache.org.
# MInor JavADoc change.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/235758cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/235758cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/235758cd
Branch: refs/heads/ignite-313
Commit: 235758cd98f4aca320a6f9c07c5d90ddb956d796
Parents: b0e6ab1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Mar 2 17:44:16 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Mar 2 17:44:16 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/IgniteCluster.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/235758cd/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index 8669559..c24ba5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -28,10 +28,10 @@ import java.util.*;
import java.util.concurrent.*;
/**
- * {@code GridCluster} also provides a handle on {@link #nodeLocalMap()} which provides map-like functionality
- * linked to current grid node. Node-local map is useful for saving shared state between job executions
- * on the grid. Additionally you can also ping, start, and restart remote nodes, map keys to caching nodes,
- * and get other useful information about topology.
+ * Represents whole cluster (all available nodes) and also provides a handle on {@link #nodeLocalMap()} which
+ * provides map-like functionality linked to current grid node. Node-local map is useful for saving shared state
+ * between job executions on the grid. Additionally you can also ping, start, and restart remote nodes, map keys to
+ * caching nodes, and get other useful information about topology.
*/
public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
/**
[37/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-344' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Posted by yz...@apache.org.
Merge branches 'ignite-344' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-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/4dd565e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4dd565e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4dd565e2
Branch: refs/heads/ignite-313
Commit: 4dd565e22911b218234d0bd703495d845b11674c
Parents: 656ee47 5b0d7db
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 16:34:37 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 16:34:37 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheClearTask.java | 3 +-
.../visor/cache/VisorCacheLoadTask.java | 3 +-
.../scala/org/apache/ignite/visor/Packet.scala | 38 ------
.../ignite/visor/commands/VisorConsole.scala | 2 -
.../ignite/visor/commands/ack/Packet.scala | 55 --------
.../visor/commands/ack/VisorAckCommand.scala | 2 +-
.../ignite/visor/commands/alert/Packet.scala | 108 ----------------
.../ignite/visor/commands/cache/Packet.scala | 127 -------------------
.../commands/cache/VisorCacheCommand.scala | 2 +-
.../ignite/visor/commands/config/Packet.scala | 55 --------
.../ignite/visor/commands/deploy/Packet.scala | 76 -----------
.../ignite/visor/commands/disco/Packet.scala | 72 -----------
.../ignite/visor/commands/events/Packet.scala | 97 --------------
.../ignite/visor/commands/gc/Packet.scala | 61 ---------
.../ignite/visor/commands/kill/Packet.scala | 78 ------------
.../visor/commands/kill/VisorKillCommand.scala | 2 +-
.../ignite/visor/commands/node/Packet.scala | 60 ---------
.../ignite/visor/commands/ping/Packet.scala | 50 --------
.../visor/commands/ping/VisorPingCommand.scala | 2 +-
.../ignite/visor/commands/start/Packet.scala | 90 -------------
.../ignite/visor/commands/tasks/Packet.scala | 116 -----------------
.../commands/tasks/VisorTasksCommand.scala | 26 +---
.../ignite/visor/commands/top/Packet.scala | 87 -------------
.../ignite/visor/commands/vvm/Packet.scala | 61 ---------
24 files changed, 15 insertions(+), 1258 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4dd565e2/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4dd565e2/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
[38/50] [abbrv] incubator-ignite git commit: # sprint-2 Fixed typo.
Posted by yz...@apache.org.
# sprint-2 Fixed typo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d2a7c6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d2a7c6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d2a7c6c
Branch: refs/heads/ignite-313
Commit: 5d2a7c6ca6dac1d64d1efd4196e5130a117c6ca3
Parents: 4dd565e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 17:16:01 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 17:16:01 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/visor/commands/cache/VisorCacheCommand.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d2a7c6c/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index c39e946..8a2f6e0 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -842,8 +842,8 @@ object VisorCacheCommand {
cacheT += ("Cache Interceptor", safe(cfg.interceptor()))
cacheT += ("Store Enabled", bool2Str(storeCfg.enabled()))
- cacheT += ("Store Сlass", safe(storeCfg.store()))
- cacheT += ("Store Factory Сlass", storeCfg.storeFactory())
+ cacheT += ("Store Class", safe(storeCfg.store()))
+ cacheT += ("Store Factory Class", storeCfg.storeFactory())
cacheT += ("Store Read Through", bool2Str(storeCfg.readThrough()))
cacheT += ("Store Write Through", bool2Str(storeCfg.writeThrough()))
[05/50] [abbrv] incubator-ignite git commit: # IGNITE-339 Review.
Posted by yz...@apache.org.
# IGNITE-339 Review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c847e885
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c847e885
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c847e885
Branch: refs/heads/ignite-313
Commit: c847e88513d47925a03e84faf8739b6e7b012755
Parents: 60e0ecb
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Mar 2 16:44:13 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Mar 2 16:44:13 2015 +0700
----------------------------------------------------------------------
.../internal/visor/cache/VisorCacheConfiguration.java | 10 ----------
.../visor/commands/cache/VisorCacheCommand.scala | 14 +++++---------
2 files changed, 5 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c847e885/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 2ad0e49..a6ec05c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -48,9 +48,6 @@ public class VisorCacheConfiguration implements Serializable {
/** Cache atomicity mode */
private CacheAtomicityMode atomicityMode;
- /** Cache atomic sequence reserve size */
- private int atomicSeqReserveSize;
-
/** Cache atomicity write ordering mode. */
private CacheAtomicWriteOrderMode atomicWriteOrderMode;
@@ -226,13 +223,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @return Cache atomic sequence reserve size
- */
- public int atomicSequenceReserveSize() {
- return atomicSeqReserveSize;
- }
-
- /**
* @return Cache atomicity write ordering mode.
*/
public CacheAtomicWriteOrderMode atomicWriteOrderMode() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c847e885/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 7232221..e2ca05b 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -783,7 +783,6 @@ object VisorCacheCommand {
cacheT += ("Mode", cfg.mode)
cacheT += ("Atomicity Mode", safe(cfg.atomicityMode))
- cacheT += ("Atomic Sequence Reserve Size", cfg.atomicSequenceReserveSize)
cacheT += ("Atomic Write Ordering Mode", safe(cfg.atomicWriteOrderMode))
cacheT += ("Statistic Enabled", bool2Str(cfg.statisticsEnabled()))
cacheT += ("Management Enabled", bool2Str(cfg.managementEnabled()))
@@ -839,11 +838,10 @@ object VisorCacheCommand {
cacheT += ("Cache Interceptor", safe(cfg.interceptor()))
cacheT += ("Store Enabled", bool2Str(storeCfg.enabled()))
- cacheT += ("Store", safe(storeCfg.store()))
- cacheT += ("Configured JDBC Store", bool2Str(storeCfg.jdbcStore()))
-
- cacheT += ("Read Through", bool2Str(storeCfg.readThrough()))
- cacheT += ("Write Through", bool2Str(storeCfg.writeThrough()))
+ cacheT += ("Store Сlass", safe(storeCfg.store()))
+ cacheT += ("Store Factory Сlass", storeCfg.storeFactory())
+ cacheT += ("Store Read Through", bool2Str(storeCfg.readThrough()))
+ cacheT += ("Store Write Through", bool2Str(storeCfg.writeThrough()))
cacheT += ("Write-Behind Enabled", bool2Str(storeCfg.enabled()))
cacheT += ("Write-Behind Flush Size", storeCfg.flushSize())
@@ -853,9 +851,7 @@ object VisorCacheCommand {
cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
cacheT += ("Memory Mode", cfg.memoryMode())
-
- cacheT += ("Store Values Bytes", cfg.valueBytes())
-
+ cacheT += ("Keep Values Bytes", cfg.valueBytes())
cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
cacheT += ("Loader Factory Class Name", safe(cfg.loaderFactory()))
[46/50] [abbrv] incubator-ignite git commit: futures: api cleanup
Posted by yz...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
index 6af2d2d..7c57978 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
@@ -17,24 +17,35 @@
package org.apache.ignite.internal.util.future;
-import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
/**
*
*/
public class IgniteFinishedFutureImpl<V> extends IgniteFutureImpl<V> {
/**
- * @param ctx Context.
- * @param err Error.
+ *
+ */
+ public IgniteFinishedFutureImpl() {
+ super(new GridFinishedFuture<>((V)null));
+ }
+
+ /**
+ * @param res Result.
*/
- public IgniteFinishedFutureImpl(GridKernalContext ctx, Throwable err) {
- super(new GridFinishedFuture<V>(ctx, err));
+ public IgniteFinishedFutureImpl(V res) {
+ super(new GridFinishedFuture<>(res));
}
/**
- * @param ctx Context.
+ * @param err Error.
*/
- public IgniteFinishedFutureImpl(GridKernalContext ctx) {
- super(new GridFinishedFuture<>(ctx, (V)null));
+ public IgniteFinishedFutureImpl(Throwable err) {
+ super(new GridFinishedFuture<V>(err));
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(IgniteFinishedFutureImpl.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java
deleted file mode 100644
index 6d633f5..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.future;
-
-/**
- *
- */
-public class IgniteFinishedFutureImplEx<V> extends IgniteFutureImpl<V> {
- /**
- * @param res Object res.
- */
- public IgniteFinishedFutureImplEx(V res) {
- super(new GridFinishedFutureEx<>(res));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
index 028616e..d6301b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
@@ -61,26 +61,6 @@ public class IgniteFutureImpl<V> implements IgniteFuture<V> {
}
/** {@inheritDoc} */
- @Override public void syncNotify(boolean syncNotify) {
- fut.syncNotify(syncNotify);
- }
-
- /** {@inheritDoc} */
- @Override public boolean syncNotify() {
- return fut.syncNotify();
- }
-
- /** {@inheritDoc} */
- @Override public void concurrentNotify(boolean concurNotify) {
- fut.concurrentNotify(concurNotify);
- }
-
- /** {@inheritDoc} */
- @Override public boolean concurrentNotify() {
- return fut.concurrentNotify();
- }
-
- /** {@inheritDoc} */
@Override public boolean isCancelled() {
return fut.isCancelled();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 5b99f58..9ab10cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -8553,7 +8553,7 @@ public class GridFunc {
* @return Completed future.
*/
public static <T> IgniteInternalFuture<T> awaitOne(IgniteInternalFuture<T>... futs) {
- return isEmpty(futs) ? new GridFinishedFutureEx<T>() : awaitOne(asList(futs));
+ return isEmpty(futs) ? new GridFinishedFuture<T>() : awaitOne(asList(futs));
}
/**
@@ -8565,7 +8565,7 @@ public class GridFunc {
*/
public static <T> IgniteInternalFuture<T> awaitOne(Iterable<IgniteInternalFuture<T>> futs) {
if (F.isEmpty(futs))
- return new GridFinishedFutureEx<>();
+ return new GridFinishedFuture<>();
final CountDownLatch latch = new CountDownLatch(1);
@@ -8594,7 +8594,7 @@ public class GridFunc {
// Only NULLs have been passed in.
if (c == null)
- return new GridFinishedFutureEx<>();
+ return new GridFinishedFuture<>();
boolean interrupted = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
index 1cabee3..672fe5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
@@ -37,7 +37,7 @@ public class GridWorkerFuture<T> extends GridFutureAdapter<T> {
* @param ctx Context.
*/
public GridWorkerFuture(GridKernalContext ctx) {
- super(ctx);
+ super();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index 79b01e5..6941426 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -91,64 +91,6 @@ public interface IgniteFuture<V> extends Future<V> {
public long duration();
/**
- * Flag to turn on or off synchronous listener notification. If this flag is {@code true}, then
- * upon future completion the notification may happen in the same thread that created
- * the future. This becomes especially important when adding listener to a future that
- * is already {@code done} - if this flag is {@code true}, then listener will be
- * immediately notified within the same thread.
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
- *
- * @param syncNotify Flag to turn on or off synchronous listener notification.
- */
- public void syncNotify(boolean syncNotify);
-
- /**
- * Gets value of synchronous listener notification flag. If this flag is {@code true}, then
- * upon future completion the notification may happen in the same thread that created
- * the future. This becomes especially important when adding listener to a future that
- * is already {@code done} - if this flag is {@code true}, then listener will be
- * immediately notified within the same thread.
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
- *
- * @return Synchronous listener notification flag.
- */
- public boolean syncNotify();
-
- /**
- * Flag to turn on or off concurrent listener notification. This flag comes into play only
- * when a future has more than one listener subscribed to it. If this flag is {@code true},
- * then all listeners will be notified concurrently by different threads; otherwise,
- * listeners will be notified one after another within one thread (depending on
- * {@link #syncNotify()} flag, these notifications may happen either in the same thread which
- * started the future, or in a different thread).
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
- *
- * @param concurNotify Flag to turn on or off concurrent listener notification.
- */
- public void concurrentNotify(boolean concurNotify);
-
- /**
- * Gets value concurrent listener notification flag. This flag comes into play only
- * when a future has more than one listener subscribed to it. If this flag is {@code true},
- * then all listeners will be notified concurrently by different threads; otherwise,
- * listeners will be notified one after another within one thread (depending on
- * {@link #syncNotify()} flag, these notifications may happen either in the same thread which
- * started the future, or in a different thread).
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
- *
- * @return Concurrent listener notification flag
- */
- public boolean concurrentNotify();
-
- /**
* Registers listener closure to be asynchronously notified whenever future completes.
*
* @param lsnr Listener closure to register. If not provided - this method is no-op.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 19fe5c5..493a9dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -354,9 +354,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
}
- GridFutureAdapterEx<GridCommunicationClient> fut = new GridFutureAdapterEx<>();
+ GridFutureAdapter<GridCommunicationClient> fut = new GridFutureAdapter<>();
- GridFutureAdapterEx<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(sndId, fut);
+ GridFutureAdapter<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(sndId, fut);
assert msg instanceof HandshakeMessage : msg;
@@ -545,7 +545,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
private final HandshakeMessage msg;
/** */
- private final GridFutureAdapterEx<GridCommunicationClient> fut;
+ private final GridFutureAdapter<GridCommunicationClient> fut;
/** */
private final boolean createClient;
@@ -563,7 +563,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
ClusterNode rmtNode,
HandshakeMessage msg,
boolean createClient,
- GridFutureAdapterEx<GridCommunicationClient> fut) {
+ GridFutureAdapter<GridCommunicationClient> fut) {
this.ses = ses;
this.recoveryDesc = recoveryDesc;
this.rmtNode = rmtNode;
@@ -764,7 +764,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
};
/** Client connect futures. */
- private final ConcurrentMap<UUID, GridFutureAdapterEx<GridCommunicationClient>> clientFuts =
+ private final ConcurrentMap<UUID, GridFutureAdapter<GridCommunicationClient>> clientFuts =
GridConcurrentFactory.newMap();
/** */
@@ -1790,9 +1790,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
throw new IgniteSpiException("Grid is stopping.");
// Do not allow concurrent connects.
- GridFutureAdapterEx<GridCommunicationClient> fut = new ConnectFuture();
+ GridFutureAdapter<GridCommunicationClient> fut = new ConnectFuture();
- GridFutureAdapterEx<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(nodeId, fut);
+ GridFutureAdapter<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(nodeId, fut);
if (oldFut == null) {
try {
@@ -2862,7 +2862,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/**
*
*/
- private static class ConnectFuture extends GridFutureAdapterEx<GridCommunicationClient> {
+ private static class ConnectFuture extends GridFutureAdapter<GridCommunicationClient> {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git 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
index e52fcaa..ca34f1f 100644
--- 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
@@ -1164,7 +1164,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
if (F.contains(locNodeAddrs, addr))
return F.t(ignite.configuration().getNodeId(), false);
- GridFutureAdapterEx<IgniteBiTuple<UUID, Boolean>> fut = new GridFutureAdapterEx<>();
+ GridFutureAdapter<IgniteBiTuple<UUID, Boolean>> fut = new GridFutureAdapter<>();
IgniteInternalFuture<IgniteBiTuple<UUID, Boolean>> oldFut = pingMap.putIfAbsent(addr, fut);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
index 24cd202..7cad61a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
@@ -894,7 +894,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe
* @param partitioned Partitioned flag.
*/
EventTypeFuture(GridKernalContext ctx, int evtType, int expCnt, boolean partitioned) {
- super(ctx);
+ super();
assert expCnt > 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index bf28a59..d89468b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -79,33 +79,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testCacheGetFailsSyncNotify() throws Exception {
- GridRestCommandHandler hnd = new TestableCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync",
- true);
-
- GridRestCacheRequest req = new GridRestCacheRequest();
-
- req.command(GridRestCommand.CACHE_GET);
-
- req.key("k1");
-
- try {
- hnd.handleAsync(req).get();
-
- fail("Expected exception not thrown.");
- }
- catch (IgniteCheckedException e) {
- info("Got expected exception: " + e);
- }
- }
-
- /**
- * Tests the cache failure during the execution of the CACHE_GET command.
- *
- * @throws Exception If failed.
- */
- public void testCacheGetFailsAsyncNotify() throws Exception {
- GridRestCommandHandler hnd = new TestableCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync",
- false);
+ GridRestCommandHandler hnd = new TestableCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync");
GridRestCacheRequest req = new GridRestCacheRequest();
@@ -215,21 +189,15 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
/** */
private final String failMtd;
- /** */
- private final boolean sync;
-
/**
* Constructor.
- *
- * @param ctx Context.
+ * @param ctx Context.
* @param failMtd Method to fail.
- * @param sync Sync notification flag.
*/
- TestableCacheCommandHandler(final GridKernalContext ctx, final String failMtd, final boolean sync) {
+ TestableCacheCommandHandler(final GridKernalContext ctx, final String failMtd) {
super(ctx);
this.failMtd = failMtd;
- this.sync = sync;
}
/**
@@ -245,11 +213,9 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
new InvocationHandler() {
@Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
if (failMtd.equals(mtd.getName())) {
- IgniteInternalFuture<Object> fut = new GridFinishedFuture<>(ctx,
+ IgniteInternalFuture<Object> fut = new GridFinishedFuture<>(
new IgniteCheckedException("Operation failed"));
- fut.syncNotify(sync);
-
return fut;
}
// Rewriting flagOn result to keep intercepting invocations after it.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
index 550e8ee..837d33d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
@@ -34,14 +34,10 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testMarkInitialized() throws Exception {
- GridTestKernalContext ctx = new GridTestKernalContext(log);
-
GridCompoundFuture<Boolean, Boolean> fut = new GridCompoundFuture<>();
for (int i = 0; i < 5; i++) {
- IgniteInternalFuture<Boolean> part = new GridFinishedFuture<>(ctx, true);
-
- part.syncNotify(true);
+ IgniteInternalFuture<Boolean> part = new GridFinishedFuture<>(true);
fut.add(part);
}
@@ -65,7 +61,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
List<GridFutureAdapter<Boolean>> futs = new ArrayList<>(5);
for (int i = 0; i < 5; i++) {
- GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+ GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
fut.add(part);
@@ -99,7 +95,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
List<GridFutureAdapter<Boolean>> futs = new ArrayList<>(5);
for (int i = 0; i < 5; i++) {
- GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+ GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
fut.add(part);
@@ -134,7 +130,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
new ConcurrentLinkedDeque8<>();
for (int i = 0; i < 1000; i++) {
- GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+ GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
fut.add(part);
@@ -169,7 +165,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
new ConcurrentLinkedDeque8<>();
for (int i = 0; i < 1000; i++) {
- GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+ GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
fut.add(part);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
index f9e2dfb..45633ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
@@ -47,7 +47,7 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testFutureChain() throws Exception {
- GridFutureAdapter<Integer> fut = new GridFutureAdapter<>(ctx);
+ GridFutureAdapter<Integer> fut = new GridFutureAdapter<>();
IgniteInternalFuture<Integer> cur = fut;
@@ -55,9 +55,9 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
cur = new GridEmbeddedFuture<>(cur,
new IgniteBiClosure<Integer, Exception, IgniteInternalFuture<Integer>>() {
@Override public IgniteInternalFuture<Integer> apply(Integer o, Exception e) {
- return new GridFinishedFuture<>(ctx, o);
+ return new GridFinishedFuture<>(o);
}
- }, ctx);
+ });
}
fut.onDone(1);
@@ -82,10 +82,10 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
for (final Throwable x : list) {
// Original future.
- final GridFutureAdapter<Integer> origFut = new GridFutureAdapter<>(ctx);
+ final GridFutureAdapter<Integer> origFut = new GridFutureAdapter<>();
// Embedded future to test.
- GridEmbeddedFuture<Double, Integer> embFut = new GridEmbeddedFuture<>(ctx, origFut,
+ GridEmbeddedFuture<Double, Integer> embFut = new GridEmbeddedFuture<>(origFut,
new C2<Integer, Exception, Double>() {
@Override public Double apply(Integer val, Exception e) {
if (x instanceof Error)
@@ -98,7 +98,8 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
return null;
}
- });
+ },
+ false);
assertFalse("Expect original future is not complete.", origFut.isDone());
assertFalse("Expect embedded future is not complete.", embFut.isDone());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java
deleted file mode 100644
index 976f72d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.future;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-
-/**
- * Tests finished future use cases.
- */
-public class GridFinishedFutureSelfTest extends GridCommonAbstractTest {
- /** Create test and start grid. */
- public GridFinishedFutureSelfTest() {
- super(true);
- }
-
- /**
- * Test finished future serialization.
- *
- * @throws Exception In case of any exception.
- */
- public void testExternalizable() throws Exception {
- Object t = "result";
- Throwable ex = new IgniteException("exception");
-
- testExternalizable(t, null, true);
- testExternalizable(t, null, false);
- testExternalizable(null, ex, true);
- testExternalizable(null, ex, false);
- }
-
- /**
- * Test finished future serialization.
- *
- * @param t Future result.
- * @param ex Future exception.
- * @param syncNotify Synchronous notifications flag.
- * @throws Exception In case of any exception.
- */
- private void testExternalizable(@Nullable Object t, @Nullable Throwable ex, boolean syncNotify) throws Exception {
- GridKernalContext ctx = ((IgniteKernal)grid()).context();
-
- Marshaller m = new OptimizedMarshaller();
- ClassLoader clsLdr = getClass().getClassLoader();
-
- IgniteInternalFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) :
- new GridFinishedFuture<>(ctx, t);
-
- orig.syncNotify(syncNotify);
-
- GridFinishedFuture<Object> fut = m.unmarshal(m.marshal(orig), clsLdr);
-
- assertEquals(t, GridTestUtils.getFieldValue(fut, "t"));
-
- if (ex == null)
- assertNull(GridTestUtils.<Throwable>getFieldValue(fut, "err"));
- else {
- assertEquals(ex.getClass(), GridTestUtils.<Throwable>getFieldValue(fut, "err").getClass());
- assertEquals(ex.getMessage(), GridTestUtils.<Throwable>getFieldValue(fut, "err").getMessage());
- }
-
- assertEquals(syncNotify, GridTestUtils.<Boolean>getFieldValue(fut, "syncNotify").booleanValue());
- assertEquals(ctx.gridName(), GridTestUtils.<GridKernalContext>getFieldValue(fut, "ctx").gridName());
-
- final CountDownLatch done = new CountDownLatch(1);
-
- fut.listenAsync(new CI1<IgniteInternalFuture<Object>>() {
- @Override public void apply(IgniteInternalFuture<Object> t) {
- done.countDown();
- }
- });
-
- if (syncNotify)
- assertEquals("Expect notification is already complete.", 0, done.getCount());
- else
- assertTrue("Wait until notification completes asynchronously.", done.await(100, MILLISECONDS));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
index 2ef9f10..6ef5549 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
@@ -115,7 +115,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testListenSyncNotify() throws Exception {
- GridFutureAdapter<String> fut = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+ GridFutureAdapter<String> fut = new GridFutureAdapter<>();
int lsnrCnt = 10;
@@ -176,7 +176,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
ctx.start();
try {
- GridFutureAdapter<String> fut = new GridFutureAdapter<>(ctx, false);
+ GridFutureAdapter<String> fut = new GridFutureAdapter<>();
int lsnrCnt = 10;
@@ -253,7 +253,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
try {
// Test result returned.
- GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ctx);
+ GridFutureAdapter<Object> fut = new GridFutureAdapter<>();
IgniteInternalFuture<Object> chain = fut.chain(passThrough);
assertFalse(fut.isDone());
@@ -274,7 +274,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
// Test exception re-thrown.
- fut = new GridFutureAdapter<>(ctx);
+ fut = new GridFutureAdapter<>();
chain = fut.chain(passThrough);
fut.onDone(new ClusterGroupEmptyCheckedException("test exception"));
@@ -290,7 +290,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
// Test error re-thrown.
- fut = new GridFutureAdapter<>(ctx);
+ fut = new GridFutureAdapter<>();
chain = fut.chain(passThrough);
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
index d782d32..4835eef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
@@ -22,7 +22,6 @@ import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.concurrent.*;
@@ -143,30 +142,10 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testListeners() throws Exception {
- GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+ GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
- fut.syncNotify(true);
-
- assertTrue(fut.syncNotify());
-
- fut.syncNotify(false);
-
- assertFalse(fut.syncNotify());
-
- fut.concurrentNotify(true);
-
- assertTrue(fut.concurrentNotify());
-
- fut.concurrentNotify(false);
-
- assertFalse(fut.concurrentNotify());
-
- fut.syncNotify(true);
-
- assertTrue(fut.syncNotify());
-
final AtomicInteger lsnr1Cnt = new AtomicInteger();
IgniteInClosure<? super IgniteFuture<String>> lsnr1 = new CI1<IgniteFuture<String>>() {
@@ -208,12 +187,10 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
*/
public void testListenersOnError() throws Exception {
{
- GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+ GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
- fut.syncNotify(true);
-
final IgniteException err0 = new IgniteException("test error");
final AtomicBoolean passed = new AtomicBoolean();
@@ -241,12 +218,10 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
{
- GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+ GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
- fut.syncNotify(true);
-
final IgniteCheckedException err0 = new IgniteCheckedException("test error");
final AtomicBoolean passed = new AtomicBoolean();
@@ -278,7 +253,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testChain() throws Exception {
- GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+ GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
@@ -332,7 +307,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
*/
public void testChainError() throws Exception {
{
- GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+ GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
@@ -359,8 +334,6 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
});
- assertTrue(chained.syncNotify());
-
final AtomicBoolean lsnrPassed = new AtomicBoolean();
IgniteInClosure<? super IgniteFuture<Integer>> lsnr1 = new CI1<IgniteFuture<Integer>>() {
@@ -406,7 +379,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
{
- GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+ GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
@@ -433,8 +406,6 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
}
});
- assertTrue(chained.syncNotify());
-
final AtomicBoolean lsnrPassed = new AtomicBoolean();
IgniteInClosure<? super IgniteFuture<Integer>> lsnr1 = new CI1<IgniteFuture<Integer>>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
index 6b7f956..4ad8ba6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
@@ -55,7 +55,6 @@ public class IgniteLangSelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridStripedLockSelfTest.class));
suite.addTest(new TestSuite(GridFutureAdapterSelfTest.class));
- suite.addTest(new TestSuite(GridFinishedFutureSelfTest.class));
suite.addTest(new TestSuite(GridCompoundFutureSelfTest.class));
suite.addTest(new TestSuite(GridEmbeddedFutureSelfTest.class));
suite.addTest(new TestSuite(GridNioFutureSelfTest.class));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
index 0beaf32..1c48c09 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
@@ -66,7 +66,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
private GridHadoopMapReducePlanner mrPlanner;
/** All the known jobs. */
- private final ConcurrentMap<GridHadoopJobId, GridFutureAdapterEx<GridHadoopJob>> jobs = new ConcurrentHashMap8<>();
+ private final ConcurrentMap<GridHadoopJobId, GridFutureAdapter<GridHadoopJob>> jobs = new ConcurrentHashMap8<>();
/** Locally active jobs. */
private final ConcurrentMap<GridHadoopJobId, JobLocalState> activeJobs = new ConcurrentHashMap8<>();
@@ -236,7 +236,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
@SuppressWarnings("unchecked")
public IgniteInternalFuture<GridHadoopJobId> submit(GridHadoopJobId jobId, GridHadoopJobInfo info) {
if (!busyLock.tryReadLock()) {
- return new GridFinishedFutureEx<>(new IgniteCheckedException("Failed to execute map-reduce job " +
+ return new GridFinishedFuture<>(new IgniteCheckedException("Failed to execute map-reduce job " +
"(grid is stopping): " + info));
}
@@ -283,7 +283,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
catch (IgniteCheckedException e) {
U.error(log, "Failed to submit job: " + jobId, e);
- return new GridFinishedFutureEx<>(e);
+ return new GridFinishedFuture<>(e);
}
finally {
busyLock.readUnlock();
@@ -358,7 +358,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
if (log.isTraceEnabled())
log.trace("Job is complete, returning finished future: " + jobId);
- return new GridFinishedFutureEx<>(jobId, meta.failCause());
+ return new GridFinishedFuture<>(jobId);
}
GridFutureAdapter<GridHadoopJobId> fut = F.addIfAbsent(activeFinishFuts, jobId,
@@ -967,9 +967,9 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
* @throws IgniteCheckedException If failed.
*/
@Nullable public GridHadoopJob job(GridHadoopJobId jobId, @Nullable GridHadoopJobInfo jobInfo) throws IgniteCheckedException {
- GridFutureAdapterEx<GridHadoopJob> fut = jobs.get(jobId);
+ GridFutureAdapter<GridHadoopJob> fut = jobs.get(jobId);
- if (fut != null || (fut = jobs.putIfAbsent(jobId, new GridFutureAdapterEx<GridHadoopJob>())) != null)
+ if (fut != null || (fut = jobs.putIfAbsent(jobId, new GridFutureAdapter<GridHadoopJob>())) != null)
return fut.get();
fut = jobs.get(jobId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
index 396124e..25f7b85 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
@@ -237,13 +237,13 @@ public class GridHadoopShuffle extends GridHadoopComponent {
GridHadoopShuffleJob job = jobs.get(jobId);
if (job == null)
- return new GridFinishedFutureEx<>();
+ return new GridFinishedFuture<>();
try {
return job.flush();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFutureEx<>(e);
+ return new GridFinishedFuture<>(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
index 545c1b8..d307740 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
@@ -74,7 +74,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
private volatile IgniteInClosure2X<T, GridHadoopShuffleMessage> io;
/** */
- protected ConcurrentMap<Long, IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>>> sentMsgs =
+ protected ConcurrentMap<Long, IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>>> sentMsgs =
new ConcurrentHashMap<>();
/** */
@@ -242,7 +242,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
*/
@SuppressWarnings("ConstantConditions")
public void onShuffleAck(GridHadoopShuffleAck ack) {
- IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>> tup = sentMsgs.get(ack.id());
+ IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>> tup = sentMsgs.get(ack.id());
if (tup != null)
tup.get2().onDone();
@@ -365,14 +365,14 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
* @param newBufMinSize Min new buffer size.
*/
private void send(final int idx, int newBufMinSize) {
- final GridFutureAdapterEx<?> fut = new GridFutureAdapterEx<>();
+ final GridFutureAdapter<?> fut = new GridFutureAdapter<>();
GridHadoopShuffleMessage msg = msgs[idx];
final long msgId = msg.id();
- IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>> old = sentMsgs.putIfAbsent(msgId,
- new IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>>(msg, fut));
+ IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>> old = sentMsgs.putIfAbsent(msgId,
+ new IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>>(msg, fut));
assert old == null;
@@ -441,7 +441,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
flushed = true;
if (maps.length() == 0)
- return new GridFinishedFutureEx<>();
+ return new GridFinishedFuture<>();
U.await(ioInitLatch);
@@ -471,7 +471,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
GridCompoundFuture fut = new GridCompoundFuture<>();
- for (IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>> tup : sentMsgs.values())
+ for (IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>> tup : sentMsgs.values())
fut.add(tup.get2());
fut.markInitialized();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
index 72185c0..2043648 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
@@ -888,7 +888,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
* @param ctx Kernal context.
*/
private GridHadoopProcessFuture(UUID childProcId, GridHadoopJobId jobId, GridKernalContext ctx) {
- super(ctx);
+ super();
this.childProcId = childProcId;
this.jobId = jobId;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
index 2d00222..c422e4e 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
@@ -66,7 +66,7 @@ public class GridHadoopChildProcessRunner {
private long startTime;
/** Init future. */
- private final GridFutureAdapterEx<?> initFut = new GridFutureAdapterEx<>();
+ private final GridFutureAdapter<?> initFut = new GridFutureAdapter<>();
/** Job instance. */
private GridHadoopJob job;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index e3da0b7..2e3e113 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -765,7 +765,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
c = connectionForSpace(space);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFutureEx<>(e);
+ return new GridFinishedFuture<>(e);
}
return queryTwoStep(space, GridSqlQuerySplitter.split(c, sqlQry, params));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 911a2a2..618c1d1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -129,7 +129,7 @@ public class GridReduceQueryExecutor {
r.conn = h2.connectionForSpace(space);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFutureEx<>(e);
+ return new GridFinishedFuture<>(e);
}
Collection<ClusterNode> nodes = ctx.grid().cluster().nodes(); // TODO filter nodes somehow?
@@ -141,7 +141,7 @@ public class GridReduceQueryExecutor {
tbl = createTable(r.conn, mapQry);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFutureEx<>(e);
+ return new GridFinishedFuture<>(e);
}
tbl.getScanIndex(null).setNumberOfSources(nodes.size());
@@ -166,12 +166,12 @@ public class GridReduceQueryExecutor {
for (GridMergeTable tbl : r.tbls)
dropTable(r.conn, tbl.getName());
- return new GridFinishedFuture(ctx, new Iter(res));
+ return new GridFinishedFuture(new Iter(res));
}
catch (IgniteCheckedException | InterruptedException | SQLException e) {
U.closeQuiet(r.conn);
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
index 409915a..7f76873 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
@@ -37,7 +37,6 @@ import java.util.concurrent.atomic.*;
import java.util.regex.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Implementation of {@link org.apache.ignite.scheduler.SchedulerFuture} interface.
@@ -614,7 +613,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
/** {@inheritDoc} */
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
@Override public <T> IgniteFuture<T> chain(final IgniteClosure<? super IgniteFuture<R>, T> doneCb) {
- final GridFutureAdapter<T> fut = new GridFutureAdapter<T>(ctx, syncNotify) {
+ final GridFutureAdapter<T> fut = new GridFutureAdapter<T>() {
@Override public String toString() {
return "ChainFuture[orig=" + ScheduleFutureImpl.this + ", doneCb=" + doneCb + ']';
}
[07/50] [abbrv] incubator-ignite git commit: #ignite-334: Change
IgniteConfiguration.pluginConfigurations to array.
Posted by yz...@apache.org.
#ignite-334: Change IgniteConfiguration.pluginConfigurations to array.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4df7c859
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4df7c859
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4df7c859
Branch: refs/heads/ignite-313
Commit: 4df7c85990391206c7e6247658267185f11f86a9
Parents: c847e88
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 13:44:40 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 13:44:40 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/IgniteConfiguration.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4df7c859/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 72ab928..54404c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -311,7 +311,7 @@ public class IgniteConfiguration {
private TransactionConfiguration txCfg = new TransactionConfiguration();
/** */
- private Collection<? extends PluginConfiguration> pluginCfgs;
+ private PluginConfiguration[] pluginCfgs;
/** Flag indicating whether cache sanity check is enabled. */
private boolean cacheSanityCheckEnabled = DFLT_CACHE_SANITY_CHECK_ENABLED;
@@ -1874,14 +1874,14 @@ public class IgniteConfiguration {
/**
* @return Plugin configurations.
*/
- public Collection<? extends PluginConfiguration> getPluginConfigurations() {
+ public PluginConfiguration[] getPluginConfigurations() {
return pluginCfgs;
}
/**
* @param pluginCfgs Plugin configurations.
*/
- public void setPluginConfigurations(Collection<? extends PluginConfiguration> pluginCfgs) {
+ public void setPluginConfigurations(PluginConfiguration... pluginCfgs) {
this.pluginCfgs = pluginCfgs;
}
[16/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-270' into sprint-2
Posted by yz...@apache.org.
Merge branch 'ignite-270' into sprint-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/2511ebe1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2511ebe1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2511ebe1
Branch: refs/heads/ignite-313
Commit: 2511ebe18c564e43e642bc879ffe44b02497c90a
Parents: b0e6ab1 18548b2
Author: anovikov <an...@gridgain.com>
Authored: Mon Mar 2 21:43:59 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Mon Mar 2 21:43:59 2015 +0700
----------------------------------------------------------------------
modules/scalar/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2511ebe1/modules/scalar/pom.xml
----------------------------------------------------------------------
[30/50] [abbrv] incubator-ignite git commit: # minor cleanup of
unused code.
Posted by yz...@apache.org.
# minor cleanup of unused code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a68e64e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a68e64e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a68e64e
Branch: refs/heads/ignite-313
Commit: 2a68e64eb50460b4709a7bc4b8e88be3db0604e8
Parents: d33abdb
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Mar 3 16:25:25 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Mar 3 16:25:25 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheAffinityConfiguration.java | 10 ----------
.../ignite/visor/commands/cache/VisorCacheCommand.scala | 1 -
2 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a68e64e/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
index 6ff2d2d..613b034 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -46,9 +46,6 @@ public class VisorCacheAffinityConfiguration implements Serializable {
/** Cache affinity partitions. */
private Integer partitions;
- /** Cache partitioned affinity default replicas. */
- private Integer dfltReplicas;
-
/** Cache partitioned affinity exclude neighbors. */
private Boolean excludeNeighbors;
@@ -107,13 +104,6 @@ public class VisorCacheAffinityConfiguration implements Serializable {
}
/**
- * @return Cache partitioned affinity default replicas.
- */
- @Nullable public Integer defaultReplicas() {
- return dfltReplicas;
- }
-
- /**
* @return Cache partitioned affinity exclude neighbors.
*/
@Nullable public Boolean excludeNeighbors() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a68e64e/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 2db43dc..69da6f5 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -805,7 +805,6 @@ object VisorCacheCommand {
cacheT += ("Affinity Function", safe(affinityCfg.function()))
cacheT += ("Affinity Backups", affinityCfg.partitionedBackups())
cacheT += ("Affinity Partitions", safe(affinityCfg.partitions()))
- cacheT += ("Affinity Default Replicas", safe(affinityCfg.defaultReplicas()))
cacheT += ("Affinity Exclude Neighbors", safe(affinityCfg.excludeNeighbors()))
cacheT += ("Affinity Mapper", safe(affinityCfg.mapper()))
[21/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Posted by yz...@apache.org.
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-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/b2675bc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b2675bc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b2675bc3
Branch: refs/heads/ignite-313
Commit: b2675bc3a6875c462e3d0aeb1478ee4d72039c44
Parents: 9a93198 3b309f2
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Mon Mar 2 17:50:47 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Mon Mar 2 17:50:47 2015 +0300
----------------------------------------------------------------------
examples/pom-standalone.xml | 2 +-
modules/core/src/main/resources/ignite.properties | 2 +-
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[12/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-239' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-239' into sprint-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/96714719
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96714719
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96714719
Branch: refs/heads/ignite-313
Commit: 96714719d98de537accd7c7c571cfdbbabfa948d
Parents: 11efb91 08df446
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 17:05:34 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 17:05:34 2015 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 592 +++++++++----------
.../GridCacheQueueCleanupSelfTest.java | 1 -
3 files changed, 267 insertions(+), 331 deletions(-)
----------------------------------------------------------------------
[34/50] [abbrv] incubator-ignite git commit: # sprint-2 - removing
gridgain.com.
Posted by yz...@apache.org.
# sprint-2 - removing gridgain.com.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c4030f92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4030f92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4030f92
Branch: refs/heads/ignite-313
Commit: c4030f926a7339cfcae14e19cec22d9d37cd94dd
Parents: 6909cc4
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Tue Mar 3 18:58:18 2015 -0800
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Tue Mar 3 18:58:18 2015 -0800
----------------------------------------------------------------------
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
modules/clients/readme.md | 4 +-
modules/clients/readme.pdf | Bin 52230 -> 47887 bytes
.../integration/ClientAbstractSelfTest.java | 3 -
.../apache/ignite/cache/store/CacheStore.java | 49 -
.../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +-
.../apache/ignite/internal/GridDiagnostic.java | 15 +-
.../ignite/internal/GridUpdateNotifier.java | 8 +-
.../apache/ignite/internal/IgniteKernal.java | 23 +-
.../apache/ignite/marshaller/Marshaller.java | 2 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 2 +-
.../optimized/OptimizedMarshaller.java | 2 +-
.../SpringApplicationContextResource.java | 2 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 2 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 2 +-
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../PriorityQueueCollisionSpi.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 16 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../memory/MemoryEventStorageSpi.java | 2 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 2 +-
.../jobstealing/JobStealingFailoverSpi.java | 2 +-
.../spi/failover/never/NeverFailoverSpi.java | 2 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 2 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 4 +-
.../startup/cmdline/ggcube_node_128x128.png | Bin 4679 -> 0 bytes
.../startup/cmdline/ggcube_node_48x48.png | Bin 2355 -> 0 bytes
.../startup/cmdline/logo_ignite_128x128.png | Bin 0 -> 18667 bytes
.../startup/cmdline/logo_ignite_48x48.png | Bin 0 -> 16572 bytes
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
.../core/src/test/resources/log/ignite.log.tst | 13706 -----------------
.../hibernate/CacheHibernateBlobStore.java | 2 +-
.../rest/protocols/http/jetty/rest.html | 19 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 16 +-
.../ignite/visor/commands/ggcube_128x128.png | Bin 11444 -> 0 bytes
.../ignite/visor/commands/ggcube_48x48.png | Bin 3365 -> 0 bytes
.../visor/commands/logo_ignite_128x128.png | Bin 0 -> 18667 bytes
.../ignite/visor/commands/logo_ignite_48x48.png | Bin 0 -> 16572 bytes
pom.xml | 1 -
45 files changed, 57 insertions(+), 13857 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 9cfbca3..b5198f6 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -94,7 +94,7 @@ import java.util.*;
* Choose another implementation of {@link org.apache.ignite.spi.checkpoint.CheckpointSpi} for local or
* home network tests.
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.checkpoint.CheckpointSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/clients/readme.md
----------------------------------------------------------------------
diff --git a/modules/clients/readme.md b/modules/clients/readme.md
index e64c123..0208c51 100644
--- a/modules/clients/readme.md
+++ b/modules/clients/readme.md
@@ -1,5 +1,5 @@
<center>
-
+
</center>
## Java Client README
@@ -13,5 +13,5 @@ could not (*or should not*) be started.
## Client vs Grid Node
Note that for performance and ease-of-use reasons, you should always prefer to start grid node in your cluster instead of remote client. Grid node will generally perform a lot faster and can easily exhibit client-only functionality by excluding it from task/job execution and from caching data.
-For example, you can prevent a grid node from participating in caching by setting `GridCacheConfiguration.setDistributionMode(...)` value to either `CLIENT_ONLY` or `NEAR_ONLY`.
+For example, you can prevent a grid node from participating in caching by setting `CacheConfiguration.setDistributionMode(...)` value to either `CLIENT_ONLY` or `NEAR_ONLY`.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/clients/readme.pdf
----------------------------------------------------------------------
diff --git a/modules/clients/readme.pdf b/modules/clients/readme.pdf
index 4334aaa..5ecb8d8 100644
Binary files a/modules/clients/readme.pdf and b/modules/clients/readme.pdf differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index 8011945..0173da6 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -74,9 +74,6 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
/** */
private static final Map<String, HashMapStore> cacheStores = new HashMap<>();
- /** Path to test log. */
- private static final String TEST_LOG_PATH = "modules/core/src/test/resources/log/ignite.log.tst";
-
/** */
public static final String ROUTER_LOG_CFG = "modules/core/src/test/config/log4j-test.xml";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index eefcfb3..c0c95c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -23,9 +23,7 @@ import org.apache.ignite.transactions.*;
import org.jetbrains.annotations.*;
import javax.cache.integration.*;
-import java.sql.*;
import java.util.*;
-import java.util.Date;
import static javax.cache.Cache.*;
@@ -65,53 +63,6 @@ import static javax.cache.Cache.*;
* tx.addMeta("some.name", conn);
* }
* </pre>
- * <h1 class="header">Working With Portable Objects</h1>
- * When portables are enabled for cache by setting {@code org.apache.ignite.configuration.CacheConfiguration#isPortableEnabled()} to
- * {@code true}), all portable keys and values are converted to instances of {@code PortableObject}.
- * Therefore, all cache store methods will take parameters in portable format. To avoid class
- * cast exceptions, store must have signature compatible with portables. E.g., if you use {@link Integer}
- * as a key and {@code Value} class as a value (which will be converted to portable format), cache store
- * signature should be the following:
- * <pre name="code" class="java">
- * public class PortableCacheStore implements GridCacheStore<Integer, GridPortableObject> {
- * public void put(@Nullable GridCacheTx tx, Integer key, GridPortableObject val) throws IgniteCheckedException {
- * ...
- * }
- *
- * ...
- * }
- * </pre>
- * This behavior can be overridden by setting {@code org.apache.ignite.configuration.CacheConfiguration#setKeepPortableInStore(boolean)}
- * flag value to {@code false}. In this case, Ignite will deserialize keys and values stored in portable
- * format before they are passed to cache store, so that you can use the following cache store signature instead:
- * <pre name="code" class="java">
- * public class ObjectsCacheStore implements GridCacheStore<Integer, Person> {
- * public void put(@Nullable GridCacheTx tx, Integer key, Person val) throws GridException {
- * ...
- * }
- *
- * ...
- * }
- * </pre>
- * Note that while this can simplify store implementation in some cases, it will cause performance degradation
- * due to additional serializations and deserializations of portable objects. You will also need to have key
- * and value classes on all nodes since portables will be deserialized when store is invoked.
- * <p>
- * Note that only portable classes are converted to {@code PortableObject} format. Following
- * types are stored in cache without changes and therefore should not affect cache store signature:
- * <ul>
- * <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li>
- * <li>Arrays of primitives (byte[], int[], ...)</li>
- * <li>{@link String} and array of {@link String}s</li>
- * <li>{@link UUID} and array of {@link UUID}s</li>
- * <li>{@link Date} and array of {@link Date}s</li>
- * <li>{@link Timestamp} and array of {@link Timestamp}s</li>
- * <li>Enums and array of enums</li>
- * <li>
- * Maps, collections and array of objects (but objects inside
- * them will still be converted if they are portable)
- * </li>
- * </ul>
*
* @see CacheStoreSession
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
index 90d62b7..08ad789 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
@@ -81,7 +81,7 @@ import java.util.concurrent.atomic.*;
* ...
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
index 2ed3e14..f8b8d64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
@@ -92,26 +92,13 @@ final class GridDiagnostic {
}
});
- exec.execute(new GridWorker(gridName, "grid-diagnostic-3", log) {
- @Override public void body() {
- String jdkStrLow = U.jdkString().toLowerCase();
-
- if (jdkStrLow.contains("jrockit") && jdkStrLow.contains("1.5.")) {
- U.warn(log, "BEA JRockit VM ver. 1.5.x has shown problems with NIO functionality in our " +
- "tests that were not reproducible in other VMs. We recommend using Sun VM. Should you " +
- "have further questions please contact us at support@gridgain.com",
- "BEA JRockit VM ver. 1.5.x is not supported.");
- }
- }
- });
-
exec.execute(new GridWorker(gridName, "grid-diagnostic-4", log) {
@Override public void body() {
// Sufficiently tested OS.
if (!U.isSufficientlyTestedOs()) {
U.warn(log, "This operating system has been tested less rigorously: " + U.osString() +
". Our team will appreciate the feedback if you experience any problems running " +
- "ignite in this environment. You can always send your feedback to support@gridgain.com",
+ "ignite in this environment.",
"This OS is tested less rigorously: " + U.osString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
index 830481f..3d491ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
@@ -33,9 +33,7 @@ import java.util.concurrent.*;
import static java.net.URLEncoder.*;
/**
- * This class is responsible for notification about new version availability. Note that this class
- * does not send any information and merely accesses the {@code www.gridgain.com} web site for the
- * latest version data.
+ * This class is responsible for notification about new version availability.
* <p>
* Note also that this connectivity is not necessary to successfully start the system as it will
* gracefully ignore any errors occurred during notification and verification process.
@@ -90,7 +88,7 @@ class GridUpdateNotifier {
* @param gw Kernal gateway.
* @throws IgniteCheckedException If failed.
*/
- GridUpdateNotifier(String gridName, String ver, String site, GridKernalGateway gw, boolean reportOnlyNew)
+ GridUpdateNotifier(String gridName, String ver, GridKernalGateway gw, boolean reportOnlyNew)
throws IgniteCheckedException {
try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -108,7 +106,7 @@ class GridUpdateNotifier {
this.ver = ver;
- url = "http://" + site + "/update_status.php";
+ url = "http://tiny.cc/updater/update_status.php";
this.gridName = gridName == null ? "null" : gridName;
this.reportOnlyNew = reportOnlyNew;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index f46d071..cc4efa6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -104,7 +104,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
private static final String COMPATIBLE_VERS = IgniteProperties.get("ignite.compatible.vers");
/** Ignite site that is shown in log messages. */
- static final String SITE = "www.gridgain.com";
+ static final String SITE = "ignite.incubator.apache.org";
/** System line separator. */
private static final String NL = U.nl();
@@ -271,7 +271,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** {@inheritDoc} */
@Override public final IgniteEvents events(ClusterGroup grp) {
- return ((ClusterGroupAdapter)grp).events();
+ return ((ClusterGroupAdapter) grp).events();
}
/** {@inheritDoc} */
@@ -452,8 +452,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public Collection<String> getUserAttributesFormatted() {
assert cfg != null;
- return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() {
- @Override public String apply(Map.Entry<String,?> e) {
+ return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
+ @Override
+ public String apply(Map.Entry<String, ?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
@@ -628,7 +629,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
if (notifyEnabled) {
try {
- verChecker = new GridUpdateNotifier(gridName, VER_STR, SITE, gw, false);
+ verChecker = new GridUpdateNotifier(gridName, VER_STR, gw, false);
verChecker.checkForNewVersion(execSvc, log);
}
@@ -997,8 +998,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
ctx.performance().logSuggestions(log, gridName);
- ackBenchmarks();
-
U.quietAndInfo(log, "To start Console Management & Monitoring run ignitevisorcmd.{sh|bat}");
ackStart(rtBean);
@@ -1511,14 +1510,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
/**
- * Acks benchmarking instructions.
- */
- private void ackBenchmarks() {
- if (!isDaemon())
- U.quietAndInfo(log, "If running benchmarks, see http://bit.ly/GridGain-Benchmarking");
- }
-
- /**
* Acks ASCII-logo. Thanks to http://patorjk.com/software/taag
*/
private void ackAsciiLogo() {
@@ -1608,7 +1599,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
">>> Local node addresses: " + U.addressesAsString(locNode) + NL +
">>> Local ports: " + sb + NL;
- str += ">>> Ignite documentation: http://" + SITE + "/documentation" + NL;
+ str += ">>> Ignite documentation: http://" + SITE + NL;
log.info(str);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
index e2956dd..1e6dc47 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
@@ -60,7 +60,7 @@ import java.io.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
index f03a4f5..a76bb5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
@@ -55,7 +55,7 @@ import java.io.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
index 57d0506..c18d545 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
@@ -72,7 +72,7 @@ import java.util.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
index 8b8f9b9..93c9a30 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
@@ -56,7 +56,7 @@ import java.lang.annotation.*;
* }
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
index 15908c6..5f76b33 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
@@ -88,7 +88,7 @@ import static org.apache.ignite.events.EventType.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.checkpoint.CheckpointSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
index 6a77caa..158d530 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
@@ -97,7 +97,7 @@ import java.text.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index 7ab8c1f..c244e49 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -93,7 +93,7 @@ import java.util.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.checkpoint.CheckpointSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
index 7e31076..ddb73a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
@@ -58,7 +58,7 @@ import static org.apache.ignite.events.EventType.*;
* when Node<sub>3</sub> becomes free, it steals Job<sub>13</sub> and Job<sub>23</sub>
* from Node<sub>1</sub> and Node<sub>2</sub> respectively.
* <p>
- * <center><img src="http://www.gridgain.com/images/job_stealing_white.gif"></center>
+ * <center><img src="http://http://ignite.incubator.apache.org/images/job_stealing_white.gif"></center>
* <p>
* <i>
* Note that this SPI must always be used in conjunction with
@@ -156,7 +156,7 @@ import static org.apache.ignite.events.EventType.*;
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
index e423665..4ad15fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
@@ -153,7 +153,7 @@ import java.util.*;
* }
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index eacd742..19fe5c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -22,14 +22,8 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.thread.*;
import org.apache.ignite.internal.managers.eventstorage.*;
+import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.ipc.*;
import org.apache.ignite.internal.util.ipc.shmem.*;
@@ -38,6 +32,12 @@ import org.apache.ignite.internal.util.nio.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.extensions.communication.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.communication.*;
+import org.apache.ignite.thread.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
@@ -136,7 +136,7 @@ import static org.apache.ignite.events.EventType.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see CommunicationSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git 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
index df39d6b..e52fcaa 100644
--- 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
@@ -133,7 +133,7 @@ import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.discovery.DiscoverySpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
index c4ae597..da65036 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
@@ -84,7 +84,7 @@ import static org.apache.ignite.events.EventType.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.eventstorage.EventStorageSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
index 0788b34..68f212e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
@@ -74,7 +74,7 @@ import java.util.*;
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.failover.FailoverSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
index f6121d8..6c7749f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
@@ -80,7 +80,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.failover.FailoverSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
index 132060b..ee31d64 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
@@ -55,7 +55,7 @@ import java.util.*;
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.failover.FailoverSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
index 43ee43b..d148fbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
@@ -54,7 +54,7 @@ import java.util.*;
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
index 3aec11a..3f4ad9d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
@@ -224,7 +224,7 @@ import static org.apache.ignite.events.EventType.*;
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
index 74cd8fc..1dfed68 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
@@ -155,7 +155,7 @@ import static org.apache.ignite.events.EventType.*;
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
index 9fab9b0..4be2add 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
@@ -153,7 +153,7 @@ import static org.apache.ignite.events.EventType.*;
* </property>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
index 122d0ed..5eec025 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
@@ -94,7 +94,7 @@ import static org.apache.ignite.events.EventType.*;
* </bean>
* </pre>
* <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <img src="http://ignite.incubator.apache.org/images/spring-small.png">
* <br>
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
* @see org.apache.ignite.spi.swapspace.SwapSpaceSpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index 5189cfd..6a0709d 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -90,7 +90,7 @@ public final class CommandLineStartup {
Object osxApp = appCls.getDeclaredMethod("getApplication").invoke(null);
- String icoPath = "ggcube_node_128x128.png";
+ String icoPath = "logo_ignite_128x128.png";
URL url = CommandLineStartup.class.getResource(icoPath);
@@ -103,7 +103,7 @@ public final class CommandLineStartup {
// Setting Up about dialog
Class<?> aboutHndCls = Class.forName("com.apple.eawt.AboutHandler");
- final URL bannerUrl = CommandLineStartup.class.getResource("ggcube_node_48x48.png");
+ final URL bannerUrl = CommandLineStartup.class.getResource("logo_ignite_48x48.png");
Object aboutHndProxy = Proxy.newProxyInstance(
appCls.getClassLoader(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png
deleted file mode 100644
index 88dcd60..0000000
Binary files a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png
deleted file mode 100644
index 7f6c967..0000000
Binary files a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png
new file mode 100644
index 0000000..046e381
Binary files /dev/null and b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png
new file mode 100644
index 0000000..d4836ef
Binary files /dev/null and b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
index 07bcf48..78a7a9c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
@@ -37,7 +37,7 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
*/
public void testNotifier() throws Exception {
GridUpdateNotifier ntf = new GridUpdateNotifier(null, IgniteProperties.get("ignite.version"),
- IgniteKernal.SITE, TEST_GATEWAY, false);
+ TEST_GATEWAY, false);
ntf.checkForNewVersion(new SelfExecutor(), log);
[43/50] [abbrv] incubator-ignite git commit: sp-2: api cleanup
Posted by yz...@apache.org.
sp-2: api cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ff5173d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ff5173d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ff5173d8
Branch: refs/heads/ignite-313
Commit: ff5173d8da38df8aaa5d83cad36f6c3d739c3164
Parents: 5d2a7c6
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Mar 4 18:17:40 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Mar 4 18:17:40 2015 +0300
----------------------------------------------------------------------
.../misc/lifecycle/LifecycleExample.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 8 +--
.../apache/ignite/lifecycle/LifecycleBean.java | 36 +++++-----
.../ignite/lifecycle/LifecycleEventType.java | 20 +++---
.../internal/GridLifecycleBeanSelfTest.java | 76 ++++++++++----------
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +-
...achePartitionedPreloadLifecycleSelfTest.java | 8 +--
...CacheReplicatedPreloadLifecycleSelfTest.java | 8 +--
.../clock/GridTimeSyncProcessorSelfTest.java | 2 +-
.../colocation/GridTestLifecycleBean.java | 2 +-
.../loadtests/dsi/GridDsiLifecycleBean.java | 8 +--
.../ignite/internal/GridFactorySelfTest.java | 10 +--
13 files changed, 91 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
index f973b18..497872a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
@@ -76,9 +76,9 @@ public final class LifecycleExample {
System.out.println(">>> Lifecycle event occurred: " + evt);
System.out.println(">>> Ignite name: " + ignite.name());
- if (evt == AFTER_GRID_START)
+ if (evt == AFTER_NODE_START)
isStarted = true;
- else if (evt == AFTER_GRID_STOP)
+ else if (evt == AFTER_NODE_STOP)
isStarted = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index cc4efa6..b9abdb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -699,7 +699,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
// Lifecycle notification.
- notifyLifecycleBeans(BEFORE_GRID_START);
+ notifyLifecycleBeans(BEFORE_NODE_START);
// Starts lifecycle aware components.
U.startLifecycleAware(lifecycleAwares(cfg));
@@ -814,7 +814,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
registerExecutorMBeans(execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, restExecSvc);
// Lifecycle bean notifications.
- notifyLifecycleBeans(AFTER_GRID_START);
+ notifyLifecycleBeans(AFTER_NODE_START);
}
catch (Throwable e) {
IgniteSpiVersionCheckException verCheckErr = X.cause(e, IgniteSpiVersionCheckException.class);
@@ -1720,7 +1720,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
if (log.isDebugEnabled())
log.debug("Notifying lifecycle beans.");
- notifyLifecycleBeansEx(LifecycleEventType.BEFORE_GRID_STOP);
+ notifyLifecycleBeansEx(LifecycleEventType.BEFORE_NODE_STOP);
}
GridCacheProcessor cacheProcessor = ctx.cache();
@@ -1823,7 +1823,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
U.stopLifecycleAware(log, lifecycleAwares(cfg));
// Lifecycle notification.
- notifyLifecycleBeansEx(LifecycleEventType.AFTER_GRID_STOP);
+ notifyLifecycleBeansEx(LifecycleEventType.AFTER_NODE_STOP);
// Clean internal class/classloader caches to avoid stopped contexts held in memory.
OptimizedMarshaller.clearCache();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
index effa1b9..4132500 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
@@ -20,34 +20,34 @@ package org.apache.ignite.lifecycle;
import org.apache.ignite.*;
/**
- * A bean that reacts to grid lifecycle events defined in {@link LifecycleEventType}.
+ * A bean that reacts to node lifecycle events defined in {@link LifecycleEventType}.
* Use this bean whenever you need to plug some custom logic before or after
- * grid startup and stopping routines.
+ * node startup and stopping routines.
* <p>
* There are four events you can react to:
* <ul>
* <li>
- * {@link LifecycleEventType#BEFORE_GRID_START} invoked before grid startup
- * routine is initiated. Note that grid is not available during this event,
+ * {@link LifecycleEventType#BEFORE_NODE_START} invoked before node startup
+ * routine is initiated. Note that node is not available during this event,
* therefore if you injected a ignite instance via {@link org.apache.ignite.resources.IgniteInstanceResource}
* annotation, you cannot use it yet.
* </li>
* <li>
- * {@link LifecycleEventType#AFTER_GRID_START} invoked right after grid
- * has started. At this point, if you injected a grid instance via
+ * {@link LifecycleEventType#AFTER_NODE_START} invoked right after node
+ * has started. At this point, if you injected a node instance via
* {@link org.apache.ignite.resources.IgniteInstanceResource} annotation, you can start using it. Note that
- * you should not be using {@link org.apache.ignite.Ignition} to get grid instance from
+ * you should not be using {@link org.apache.ignite.Ignition} to get node instance from
* lifecycle bean.
* </li>
* <li>
- * {@link LifecycleEventType#BEFORE_GRID_STOP} invoked right before grid
- * stop routine is initiated. Grid is still available at this stage, so
+ * {@link LifecycleEventType#BEFORE_NODE_STOP} invoked right before node
+ * stop routine is initiated. Node is still available at this stage, so
* if you injected a ignite instance via {@link org.apache.ignite.resources.IgniteInstanceResource} annotation,
* you can use it.
* </li>
* <li>
- * {@link LifecycleEventType#AFTER_GRID_STOP} invoked right after grid
- * has stopped. Note that grid is not available during this event.
+ * {@link LifecycleEventType#AFTER_NODE_STOP} invoked right after node
+ * has stopped. Note that node is not available during this event.
* </li>
* </ul>
* <h1 class="header">Resource Injection</h1>
@@ -64,23 +64,19 @@ import org.apache.ignite.*;
* <p>
* <h1 class="header">Usage</h1>
* If you need to tie your application logic into Ignition lifecycle,
- * you can configure lifecycle beans via standard grid configuration, add your
+ * you can configure lifecycle beans via standard node configuration, add your
* application library dependencies into {@code IGNITE_HOME/libs} folder, and
* simply start {@code IGNITE_HOME/ignite.{sh|bat}} scripts.
* <p>
* <h1 class="header">Configuration</h1>
- * Grid lifecycle beans can be configured programmatically as follows:
+ * Node lifecycle beans can be configured programmatically as follows:
* <pre name="code" class="java">
- * Collection<GridLifecycleBean> lifecycleBeans = new ArrayList<GridLifecycleBean>();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
*
- * Collections.addAll(lifecycleBeans, new FooBarLifecycleBean1(), new FooBarLifecycleBean2());
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * cfg.setLifecycleBeans(lifecycleBeans);
+ * cfg.setLifecycleBeans(new FooBarLifecycleBean1(), new FooBarLifecycleBean2());
*
* // Start grid with given configuration.
- * G.start(cfg);
+ * Ignition.start(cfg);
* </pre>
* or from Spring XML configuration file as follows:
* <pre name="code" class="xml">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
index d7b7478..3bf8379 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
@@ -20,36 +20,36 @@ package org.apache.ignite.lifecycle;
import org.jetbrains.annotations.*;
/**
- * Grid lifecycle event types. These events are used to notify lifecycle beans
- * about changes in grid lifecycle state.
+ * Node lifecycle event types. These events are used to notify lifecycle beans
+ * about changes in node lifecycle state.
* <p>
* For more information and detailed examples refer to {@link org.apache.ignite.lifecycle.LifecycleBean}
* documentation.
*/
public enum LifecycleEventType {
/**
- * Invoked before grid startup routine. Grid is not
+ * Invoked before node startup routine. Node is not
* initialized and cannot be used.
*/
- BEFORE_GRID_START,
+ BEFORE_NODE_START,
/**
- * Invoked after grid startup is complete. Grid is fully
+ * Invoked after node startup is complete. Node is fully
* initialized and fully functional.
*/
- AFTER_GRID_START,
+ AFTER_NODE_START,
/**
- * Invoked before grid stopping routine. Grid is fully functional
+ * Invoked before node stopping routine. Node is fully functional
* at this point.
*/
- BEFORE_GRID_STOP,
+ BEFORE_NODE_STOP,
/**
- * Invoked after grid had stopped. Grid is stopped and
+ * Invoked after node had stopped. Node is stopped and
* cannot be used.
*/
- AFTER_GRID_STOP;
+ AFTER_NODE_STOP;
/** Enumerated values. */
private static final LifecycleEventType[] VALS = values();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
index 5cbdc66..5821ef6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
@@ -57,10 +57,10 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
try {
assertEquals(IgniteState.STARTED, G.state(getTestGridName()));
- assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_GRID_START));
- assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(0, bean.count(AFTER_GRID_STOP));
+ assertEquals(1, bean.count(BEFORE_NODE_START));
+ assertEquals(1, bean.count(AFTER_NODE_START));
+ assertEquals(0, bean.count(BEFORE_NODE_STOP));
+ assertEquals(0, bean.count(AFTER_NODE_STOP));
}
finally {
stopAllGrids();
@@ -69,10 +69,10 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
- assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_GRID_START));
- assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_GRID_STOP));
+ assertEquals(1, bean.count(BEFORE_NODE_START));
+ assertEquals(1, bean.count(AFTER_NODE_START));
+ assertEquals(1, bean.count(BEFORE_NODE_STOP));
+ assertEquals(1, bean.count(AFTER_NODE_STOP));
}
/**
@@ -108,7 +108,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkBeforeStart(boolean gridErr) throws Exception {
- bean = new LifeCycleExceptionBean(BEFORE_GRID_START, gridErr);
+ bean = new LifeCycleExceptionBean(BEFORE_NODE_START, gridErr);
try {
startGrid();
@@ -124,10 +124,10 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
stopAllGrids();
}
- assertEquals(0, bean.count(BEFORE_GRID_START));
- assertEquals(0, bean.count(AFTER_GRID_START));
- assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_GRID_STOP));
+ assertEquals(0, bean.count(BEFORE_NODE_START));
+ assertEquals(0, bean.count(AFTER_NODE_START));
+ assertEquals(0, bean.count(BEFORE_NODE_STOP));
+ assertEquals(1, bean.count(AFTER_NODE_STOP));
}
/**
@@ -135,7 +135,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkAfterStart(boolean gridErr) throws Exception {
- bean = new LifeCycleExceptionBean(AFTER_GRID_START, gridErr);
+ bean = new LifeCycleExceptionBean(AFTER_NODE_START, gridErr);
try {
startGrid();
@@ -151,58 +151,58 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
stopAllGrids();
}
- assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(0, bean.count(AFTER_GRID_START));
- assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_GRID_STOP));
+ assertEquals(1, bean.count(BEFORE_NODE_START));
+ assertEquals(0, bean.count(AFTER_NODE_START));
+ assertEquals(1, bean.count(BEFORE_NODE_STOP));
+ assertEquals(1, bean.count(AFTER_NODE_STOP));
}
/**
* @throws Exception If failed.
*/
public void testGridErrorBeforeStop() throws Exception {
- checkOnStop(BEFORE_GRID_STOP, true);
+ checkOnStop(BEFORE_NODE_STOP, true);
- assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_GRID_START));
- assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_GRID_STOP));
+ assertEquals(1, bean.count(BEFORE_NODE_START));
+ assertEquals(1, bean.count(AFTER_NODE_START));
+ assertEquals(0, bean.count(BEFORE_NODE_STOP));
+ assertEquals(1, bean.count(AFTER_NODE_STOP));
}
/**
* @throws Exception If failed.
*/
public void testOtherErrorBeforeStop() throws Exception {
- checkOnStop(BEFORE_GRID_STOP, false);
+ checkOnStop(BEFORE_NODE_STOP, false);
- assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_GRID_START));
- assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_GRID_STOP));
+ assertEquals(1, bean.count(BEFORE_NODE_START));
+ assertEquals(1, bean.count(AFTER_NODE_START));
+ assertEquals(0, bean.count(BEFORE_NODE_STOP));
+ assertEquals(1, bean.count(AFTER_NODE_STOP));
}
/**
* @throws Exception If failed.
*/
public void testGridErrorAfterStop() throws Exception {
- checkOnStop(AFTER_GRID_STOP, true);
+ checkOnStop(AFTER_NODE_STOP, true);
- assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_GRID_START));
- assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(0, bean.count(AFTER_GRID_STOP));
+ assertEquals(1, bean.count(BEFORE_NODE_START));
+ assertEquals(1, bean.count(AFTER_NODE_START));
+ assertEquals(1, bean.count(BEFORE_NODE_STOP));
+ assertEquals(0, bean.count(AFTER_NODE_STOP));
}
/**
* @throws Exception If failed.
*/
public void testOtherErrorAfterStop() throws Exception {
- checkOnStop(AFTER_GRID_STOP, false);
+ checkOnStop(AFTER_NODE_STOP, false);
- assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_GRID_START));
- assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(0, bean.count(AFTER_GRID_STOP));
+ assertEquals(1, bean.count(BEFORE_NODE_START));
+ assertEquals(1, bean.count(AFTER_NODE_START));
+ assertEquals(1, bean.count(BEFORE_NODE_STOP));
+ assertEquals(0, bean.count(AFTER_NODE_STOP));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
index 587dff1..3769f8d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
@@ -166,7 +166,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
private Ignite ignite;
@Override public void onLifecycleEvent(LifecycleEventType evt) {
- if (evt == LifecycleEventType.AFTER_GRID_START) {
+ if (evt == LifecycleEventType.AFTER_NODE_START) {
IgniteCache<Integer, byte[]> c = ignite.jcache(null);
if (c.putIfAbsent(-1, new byte[1])) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index 9f6e1a4..d454845 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@ -264,7 +264,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
private Ignite ignite;
@Override public void onLifecycleEvent(LifecycleEventType evt) {
- if (evt == LifecycleEventType.AFTER_GRID_START) {
+ if (evt == LifecycleEventType.AFTER_NODE_START) {
IgniteCache<Integer, String> c = ignite.jcache(null);
if (c.putIfAbsent(-1, "true")) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
index 2c510c5..1699ed3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
@@ -85,7 +85,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
@Override public void onLifecycleEvent(LifecycleEventType evt) {
switch (evt) {
- case AFTER_GRID_START: {
+ case AFTER_NODE_START: {
IgniteCache<Object, MyValue> c1 = ignite.jcache("one");
IgniteCache<Object, MyValue> c2 = ignite.jcache("two");
@@ -118,9 +118,9 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
break;
}
- case BEFORE_GRID_START:
- case BEFORE_GRID_STOP:
- case AFTER_GRID_STOP: {
+ case BEFORE_NODE_START:
+ case BEFORE_NODE_STOP:
+ case AFTER_NODE_STOP: {
info("Lifecycle event: " + evt);
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 6c417d3..063103b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -86,7 +86,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
@Override public void onLifecycleEvent(LifecycleEventType evt) {
switch (evt) {
- case AFTER_GRID_START: {
+ case AFTER_NODE_START: {
IgniteCache<Object, MyValue> c1 = ignite.jcache("one");
IgniteCache<Object, MyValue> c2 = ignite.jcache("two");
@@ -121,9 +121,9 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
break;
}
- case BEFORE_GRID_START:
- case BEFORE_GRID_STOP:
- case AFTER_GRID_STOP: {
+ case BEFORE_NODE_START:
+ case BEFORE_NODE_STOP:
+ case AFTER_NODE_STOP: {
info("Lifecycle event: " + evt);
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
index b625492..9b81717 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
@@ -196,7 +196,7 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public void onLifecycleEvent(LifecycleEventType evt) {
- if (evt == LifecycleEventType.BEFORE_GRID_START)
+ if (evt == LifecycleEventType.BEFORE_NODE_START)
((GridKernalContextImpl)((IgniteKernal)g).context()).timeSource(new TimeShiftClockSource(delta));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
index 20f086f..a3ebc32 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
@@ -31,7 +31,7 @@ public class GridTestLifecycleBean implements LifecycleBean {
/** {@inheritDoc} */
@Override public void onLifecycleEvent(LifecycleEventType type) {
- if (type == LifecycleEventType.AFTER_GRID_START) {
+ if (type == LifecycleEventType.AFTER_NODE_START) {
IgniteCache<GridTestKey, Long> cache = g.jcache("partitioned");
assert cache != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
index c0f5443..a70833b 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
@@ -43,18 +43,18 @@ public class GridDsiLifecycleBean implements LifecycleBean {
@Override public void onLifecycleEvent(LifecycleEventType evt) {
try {
switch (evt) {
- case BEFORE_GRID_START:
+ case BEFORE_NODE_START:
break;
- case AFTER_GRID_START:
+ case AFTER_NODE_START:
ignite.atomicSequence("ID", 0, true);
break;
- case BEFORE_GRID_STOP:
+ case BEFORE_NODE_STOP:
break;
- case AFTER_GRID_STOP:
+ case AFTER_NODE_STOP:
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff5173d8/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index 3b09940..ab3d699 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -177,10 +177,10 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
List<String> gridNames = bean.getGridNames();
- assert evts.get(0) == LifecycleEventType.BEFORE_GRID_START : "Invalid lifecycle event: " + evts.get(0);
- assert evts.get(1) == LifecycleEventType.AFTER_GRID_START : "Invalid lifecycle event: " + evts.get(1);
- assert evts.get(2) == LifecycleEventType.BEFORE_GRID_STOP : "Invalid lifecycle event: " + evts.get(2);
- assert evts.get(3) == LifecycleEventType.AFTER_GRID_STOP : "Invalid lifecycle event: " + evts.get(3);
+ assert evts.get(0) == LifecycleEventType.BEFORE_NODE_START : "Invalid lifecycle event: " + evts.get(0);
+ assert evts.get(1) == LifecycleEventType.AFTER_NODE_START : "Invalid lifecycle event: " + evts.get(1);
+ assert evts.get(2) == LifecycleEventType.BEFORE_NODE_STOP : "Invalid lifecycle event: " + evts.get(2);
+ assert evts.get(3) == LifecycleEventType.AFTER_NODE_STOP : "Invalid lifecycle event: " + evts.get(3);
checkGridNameEquals(gridNames.get(0), gridName);
checkGridNameEquals(gridNames.get(1), gridName);
@@ -645,7 +645,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
try {
checkState(ignite.name(),
- evt == LifecycleEventType.AFTER_GRID_START || evt == LifecycleEventType.BEFORE_GRID_STOP);
+ evt == LifecycleEventType.AFTER_NODE_START || evt == LifecycleEventType.BEFORE_NODE_STOP);
}
catch (Throwable e) {
log.error("Lifecycle bean failed state check: " + this, e);
[48/50] [abbrv] incubator-ignite git commit: futures: api cleanup
Posted by yz...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git 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
index add51bd..cd3eb59 100644
--- 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
@@ -598,7 +598,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
@Override public IgniteInternalFuture<T> apply(T t, Exception e) {
return op.apply();
}
- }, ctx.kernalContext());
+ });
saveFuture(holder, f);
@@ -796,7 +796,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
conflictRmvMap != null ? conflictRmvMap.values() : null,
retval,
rawRetval,
- cached,
prj != null ? prj.expiry() : null,
filter,
subjId,
@@ -859,7 +858,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
keys != null ? null : conflictMap.values(),
retval,
rawRetval,
- cached,
(filter != null && prj != null) ? prj.expiry() : null,
filter,
subjId,
@@ -901,7 +899,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
if (keyCheck)
validateCacheKeys(keys);
@@ -980,7 +978,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
break; // While.
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
finally {
if (entry != null)
@@ -997,7 +995,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (success) {
sendTtlUpdateRequest(expiry);
- return ctx.wrapCloneMap(new GridFinishedFuture<>(ctx.kernalContext(), locVals));
+ return ctx.wrapCloneMap(new GridFinishedFuture<>(locVals));
}
}
@@ -2320,7 +2318,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
drRmvVals,
req.returnValue(),
false,
- null,
req.expiry(),
req.filter(),
req.subjectId(),
@@ -2787,7 +2784,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/**
*
*/
- private static class FinishedLockFuture extends GridFinishedFutureEx<Boolean> implements GridDhtFuture<Boolean> {
+ private static class FinishedLockFuture extends GridFinishedFuture<Boolean> implements GridDhtFuture<Boolean> {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 92fe74b..b284b79 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -33,7 +33,6 @@ import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
import javax.cache.processor.*;
-import java.io.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -90,13 +89,6 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
private volatile long mapTime;
/**
- * Empty constructor required by {@link Externalizable}.
- */
- public GridDhtAtomicUpdateFuture() {
- // No-op.
- }
-
- /**
* @param cctx Cache context.
* @param completionCb Callback to invoke when future is completed.
* @param writeVer Write version.
@@ -110,7 +102,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
GridNearAtomicUpdateRequest<K, V> updateReq,
GridNearAtomicUpdateResponse<K, V> updateRes
) {
- super(cctx.kernalContext());
+ super();
this.cctx = cctx;
this.writeVer = writeVer;
@@ -122,7 +114,8 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
forceTransformBackups = updateReq.forceTransformBackups();
- log = U.logger(ctx, logRef, GridDhtAtomicUpdateFuture.class);
+ if (log == null)
+ log = U.logger(cctx.kernalContext(), logRef, GridDhtAtomicUpdateFuture.class);
keys = new ArrayList<>(updateReq.keys().size());
}
@@ -234,7 +227,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
for (ClusterNode node : dhtNodes) {
UUID nodeId = node.id();
- if (!nodeId.equals(ctx.localNodeId())) {
+ if (!nodeId.equals(cctx.localNodeId())) {
GridDhtAtomicUpdateRequest<K, V> updateReq = mappings.get(nodeId);
if (updateReq == null) {
@@ -291,7 +284,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
GridDhtAtomicUpdateRequest<K, V> updateReq = mappings.get(nodeId);
if (updateReq == null) {
- ClusterNode node = ctx.discovery().node(nodeId);
+ ClusterNode node = cctx.discovery().node(nodeId);
// Node left the grid.
if (node == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index c3cc50a..bf3ec95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -38,8 +38,8 @@ import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
+import javax.cache.Cache.*;
import javax.cache.expiry.*;
-import java.io.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -106,9 +106,6 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
/** Return value require flag. */
private final boolean retval;
- /** Cached entry if keys size is 1. */
- private GridCacheEntryEx<K, V> cached;
-
/** Expiry policy. */
private final ExpiryPolicy expiryPlc;
@@ -149,28 +146,10 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
private volatile long mapTime;
/**
- * Empty constructor required by {@link Externalizable}.
- */
- public GridNearAtomicUpdateFuture() {
- cctx = null;
- mappings = null;
- futVer = null;
- retval = false;
- fastMap = false;
- expiryPlc = null;
- filter = null;
- syncMode = null;
- op = null;
- nearEnabled = false;
- subjId = null;
- taskNameHash = 0;
- }
-
- /**
* @param cctx Cache context.
* @param cache Cache instance.
- * @param op Update operation.
* @param syncMode Write synchronization mode.
+ * @param op Update operation.
* @param keys Keys to update.
* @param vals Values or transform closure.
* @param invokeArgs Optional arguments for entry processor.
@@ -178,7 +157,6 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
* @param conflictRmvVals Conflict remove values (optional).
* @param retval Return value require flag.
* @param rawRetval {@code True} if should return {@code GridCacheReturn} as future result.
- * @param cached Cached entry if keys size is 1.
* @param expiryPlc Expiry policy explicitly specified for cache operation.
* @param filter Entry filter.
* @param subjId Subject ID.
@@ -196,20 +174,18 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
@Nullable Collection<GridCacheVersion> conflictRmvVals,
final boolean retval,
final boolean rawRetval,
- @Nullable GridCacheEntryEx<K, V> cached,
@Nullable ExpiryPolicy expiryPlc,
- final IgnitePredicate<Cache.Entry<K, V>>[] filter,
+ final IgnitePredicate<Entry<K, V>>[] filter,
UUID subjId,
int taskNameHash
) {
- super(cctx.kernalContext());
+ super();
this.rawRetval = rawRetval;
assert vals == null || vals.size() == keys.size();
assert conflictPutVals == null || conflictPutVals.size() == keys.size();
assert conflictRmvVals == null || conflictRmvVals.size() == keys.size();
- assert cached == null || keys.size() == 1;
assert subjId != null;
this.cctx = cctx;
@@ -222,13 +198,13 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
this.conflictPutVals = conflictPutVals;
this.conflictRmvVals = conflictRmvVals;
this.retval = retval;
- this.cached = cached;
this.expiryPlc = expiryPlc;
this.filter = filter;
this.subjId = subjId;
this.taskNameHash = taskNameHash;
- log = U.logger(ctx, logRef, GridFutureAdapter.class);
+ if (log == null)
+ log = U.logger(cctx.kernalContext(), logRef, GridFutureAdapter.class);
mappings = new ConcurrentHashMap8<>(keys.size(), 1.0f);
@@ -781,7 +757,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
singleNodeId = nodeId;
singleReq = req;
- if (ctx.localNodeId().equals(nodeId)) {
+ if (cctx.localNodeId().equals(nodeId)) {
cache.updateAllAsyncInternal(nodeId, req,
new CI2<GridNearAtomicUpdateRequest<K, V>, GridNearAtomicUpdateResponse<K, V>>() {
@Override public void apply(GridNearAtomicUpdateRequest<K, V> req,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index cdb1759..f15c66e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -167,7 +167,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
@@ -232,7 +232,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
boolean skipVals
) {
if (keys == null || keys.isEmpty())
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
if (keyCheck)
validateCacheKeys(keys);
@@ -308,7 +308,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
break; // While.
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
finally {
if (entry != null)
@@ -325,7 +325,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
if (success) {
sendTtlUpdateRequest(expiryPlc);
- return ctx.wrapCloneMap(new GridFinishedFuture<>(ctx.kernalContext(), locVals));
+ return ctx.wrapCloneMap(new GridFinishedFuture<>(locVals));
}
}
@@ -625,11 +625,11 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
filter);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
else {
- return new GridEmbeddedFuture<>(true, keyFut,
+ return new GridEmbeddedFuture<>(keyFut,
new C2<Object, Exception, IgniteInternalFuture<Exception>>() {
@Override public IgniteInternalFuture<Exception> apply(Object o, Exception exx) {
if (exx != null)
@@ -646,8 +646,8 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
accessTtl,
filter);
}
- },
- ctx.kernalContext());
+ }
+ );
}
}
@@ -731,7 +731,6 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
fut.map();
return new GridDhtEmbeddedFuture<>(
- ctx.kernalContext(),
fut,
new C2<Boolean, Exception, Exception>() {
@Override public Exception apply(Boolean b, Exception e) {
@@ -742,7 +741,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
return e;
}
- });
+ }, false);
}
else {
// Handle implicit locks for pessimistic transactions.
@@ -758,7 +757,6 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
accessTtl);
return new GridDhtEmbeddedFuture<>(
- ctx.kernalContext(),
txFut,
new C2<GridCacheReturn<V>, Exception, Exception>() {
@Override public Exception apply(GridCacheReturn<V> ret,
@@ -770,7 +768,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
return e;
}
- });
+ }, false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 21f6364..88c7f63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -159,7 +159,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
futId = IgniteUuid.randomUuid();
- log = U.logger(ctx, logRef, GridDhtColocatedLockFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridDhtColocatedLockFuture.class);
if (timeout > 0) {
timeoutObj = new LockTimeoutObject();
@@ -888,7 +888,6 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
// Add new future.
add(new GridEmbeddedFuture<>(
- cctx.kernalContext(),
fut,
new C2<Exception, Exception, Boolean>() {
@Override public Boolean apply(Exception resEx, Exception e) {
@@ -934,7 +933,8 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
return true;
}
- }
+ },
+ false
));
}
@@ -1120,7 +1120,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
*/
MiniFuture(ClusterNode node, Collection<K> keys,
Deque<GridNearLockMapping<K, V>> mappings) {
- super(cctx.kernalContext());
+ super();
this.node = node;
this.keys = keys;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 170a0c0..7f655df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -52,6 +52,9 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
/** Logger reference. */
private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
+ /** Logger. */
+ private static IgniteLogger log;
+
/** Wait for 1 second for topology to change. */
private static final long REMAP_PAUSE = 1000;
@@ -61,9 +64,6 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
/** Topology. */
private GridDhtPartitionTopology<K, V> top;
- /** Logger. */
- private IgniteLogger log;
-
/** Keys to request. */
private Collection<? extends K> keys;
@@ -91,8 +91,11 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
* @param keys Keys.
* @param preloader Preloader.
*/
- public GridDhtForceKeysFuture(GridCacheContext<K, V> cctx, long topVer, Collection<? extends K> keys,
- GridDhtPreloader<K, V> preloader) {
+ public GridDhtForceKeysFuture(
+ GridCacheContext<K, V> cctx,
+ long topVer, Collection<? extends K> keys,
+ GridDhtPreloader<K, V> preloader
+ ) {
super(cctx.kernalContext());
assert topVer != 0 : topVer;
@@ -105,9 +108,8 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
top = cctx.dht().topology();
- log = U.logger(ctx, logRef, GridDhtForceKeysFuture.class);
-
- syncNotify(true);
+ if (log == null)
+ log = U.logger(cctx.kernalContext(), logRef, GridDhtForceKeysFuture.class);
}
/**
@@ -405,7 +407,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
* @param exc Exclude node list.
*/
MiniFuture(ClusterNode node, Collection<K> keys, int curTopVer, Collection<ClusterNode> exc) {
- super(cctx.kernalContext());
+ super();
assert node != null;
assert curTopVer > 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index 6a1f7a1..941ffb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -1051,7 +1051,7 @@ public class GridDhtPartitionDemandPool<K, V> {
* @param workers List of workers.
*/
private SyncFuture(Collection<DemandWorker> workers) {
- super(cctx.kernalContext());
+ super();
assert workers.size() == poolSize();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index db9bd08..ef77cce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -150,9 +150,13 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
* @param discoEvt Discovery event.
* @param exchId Exchange id.
*/
- public GridDhtPartitionsExchangeFuture(GridCacheSharedContext<K, V> cctx, boolean reassign, DiscoveryEvent discoEvt,
- GridDhtPartitionExchangeId exchId) {
- super(cctx.kernalContext());
+ public GridDhtPartitionsExchangeFuture(
+ GridCacheSharedContext<K, V> cctx,
+ boolean reassign,
+ DiscoveryEvent discoEvt,
+ GridDhtPartitionExchangeId exchId
+ ) {
+ super();
dummy = true;
forcePreload = false;
@@ -161,8 +165,6 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
this.discoEvt = discoEvt;
this.cctx = cctx;
- syncNotify(true);
-
onDone(exchId.topologyVersion());
}
@@ -176,7 +178,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
*/
public GridDhtPartitionsExchangeFuture(GridCacheSharedContext<K, V> cctx, DiscoveryEvent discoEvt,
GridDhtPartitionExchangeId exchId) {
- super(cctx.kernalContext());
+ super();
dummy = false;
forcePreload = true;
@@ -186,8 +188,6 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
reassign = true;
- syncNotify(true);
-
onDone(exchId.topologyVersion());
}
@@ -198,9 +198,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
*/
public GridDhtPartitionsExchangeFuture(GridCacheSharedContext<K, V> cctx, ReadWriteLock busyLock,
GridDhtPartitionExchangeId exchId) {
- super(cctx.kernalContext());
-
- syncNotify(true);
+ super();
assert busyLock != null;
assert exchId != null;
@@ -220,7 +218,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
assert oldestNode.get() != null;
- initFut = new GridFutureAdapter<>(ctx, true);
+ initFut = new GridFutureAdapter<>();
if (log.isDebugEnabled())
log.debug("Creating exchange future [localNode=" + cctx.localNodeId() +
@@ -805,7 +803,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
log.debug("Received full partition map from unexpected node [oldest=" + curOldest.id() +
", unexpectedNodeId=" + nodeId + ']');
- ClusterNode sender = ctx.discovery().node(nodeId);
+ ClusterNode sender = cctx.discovery().node(nodeId);
if (sender == null) {
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 0821431..ae28dba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -120,7 +120,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
top = cctx.dht().topology();
- startFut = new GridFutureAdapter<>(cctx.kernalContext(), false);
+ startFut = new GridFutureAdapter<>();
}
/** {@inheritDoc} */
@@ -499,7 +499,12 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
if (topReadyFut == null)
startFut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
@Override public void apply(IgniteInternalFuture<?> syncFut) {
- fut.init();
+ cctx.kernalContext().closure().runLocalSafe(
+ new Runnable() {
+ @Override public void run() {
+ fut.init();
+ }
+ });
}
});
else {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 22403ef..9b738fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -374,7 +374,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 94d2e96..6555865 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -277,7 +277,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
boolean skipVal
) {
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
if (keyCheck)
validateCacheKeys(keys);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 9628f3b..ca07dec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -161,7 +161,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
ver = tx == null ? cctx.versions().next() : tx.xidVersion();
- log = U.logger(ctx, logRef, GridNearGetFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridNearGetFuture.class);
}
/**
@@ -347,7 +347,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
remapKeys.add(key);
}
- long updTopVer = ctx.discovery().topologyVersion();
+ long updTopVer = cctx.discovery().topologyVersion();
assert updTopVer > topVer : "Got invalid partitions for local node but topology version did " +
"not change [topVer=" + topVer + ", updTopVer=" + updTopVer +
@@ -511,7 +511,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
key0 = (K)cctx.unwrapPortableIfNeeded(key, !deserializePortable);
}
- add(new GridFinishedFuture<>(cctx.kernalContext(), Collections.singletonMap(key0, v)));
+ add(new GridFinishedFuture<>(Collections.singletonMap(key0, v)));
}
else {
if (primary == null)
@@ -704,8 +704,6 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
* @param topVer Topology version.
*/
MiniFuture(ClusterNode node, LinkedHashMap<K, Boolean> keys, Map<K, GridCacheVersion> savedVers, long topVer) {
- super(cctx.kernalContext());
-
this.node = node;
this.keys = keys;
this.savedVers = savedVers;
@@ -751,7 +749,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
if (log.isDebugEnabled())
log.debug("Remote node left grid while sending or waiting for reply (will retry): " + this);
- long updTopVer = ctx.discovery().topologyVersion();
+ long updTopVer = cctx.discovery().topologyVersion();
if (updTopVer > topVer) {
// Remap.
@@ -760,12 +758,13 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
onDone(Collections.<K, V>emptyMap());
}
else {
- final RemapTimeoutObject timeout = new RemapTimeoutObject(ctx.config().getNetworkTimeout(), topVer, e);
+ final RemapTimeoutObject timeout = new RemapTimeoutObject(
+ cctx.kernalContext().config().getNetworkTimeout(), topVer, e);
- ctx.discovery().topologyFuture(topVer + 1).listenAsync(new CI1<IgniteInternalFuture<Long>>() {
+ cctx.discovery().topologyFuture(topVer + 1).listenAsync(new CI1<IgniteInternalFuture<Long>>() {
@Override public void apply(IgniteInternalFuture<Long> longIgniteFuture) {
if (timeout.finish()) {
- ctx.timeout().removeTimeoutObject(timeout);
+ cctx.kernalContext().timeout().removeTimeoutObject(timeout);
// Remap.
map(keys.keySet(), F.t(node, keys), cctx.affinity().affinityTopologyVersion());
@@ -775,7 +774,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
}
});
- ctx.timeout().addTimeoutObject(timeout);
+ cctx.kernalContext().timeout().addTimeoutObject(timeout);
}
}
@@ -812,7 +811,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
log.debug("Remapping mini get future [invalidParts=" + invalidParts + ", fut=" + this + ']');
// Need to wait for next topology version to remap.
- IgniteInternalFuture<Long> topFut = ctx.discovery().topologyFuture(rmtTopVer);
+ IgniteInternalFuture<Long> topFut = cctx.discovery().topologyFuture(rmtTopVer);
topFut.listenAsync(new CIX1<IgniteInternalFuture<Long>>() {
@Override public void applyx(IgniteInternalFuture<Long> fut) throws IgniteCheckedException {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 210772d..f7f7e41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -171,7 +171,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
entries = new ArrayList<>(keys.size());
- log = U.logger(ctx, logRef, GridNearLockFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridNearLockFuture.class);
if (timeout > 0) {
timeoutObj = new LockTimeoutObject();
@@ -965,7 +965,6 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
// Add new future.
add(new GridEmbeddedFuture<>(
- cctx.kernalContext(),
fut,
new C2<GridNearLockResponse<K, V>, Exception, Boolean>() {
@Override public Boolean apply(GridNearLockResponse<K, V> res, Exception e) {
@@ -1092,7 +1091,8 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
return true;
}
- }
+ },
+ false
));
}
else {
@@ -1259,7 +1259,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
*/
MiniFuture(ClusterNode node, Collection<K> keys,
ConcurrentLinkedDeque8<GridNearLockMapping<K, V>> mappings) {
- super(cctx.kernalContext());
+ super();
this.node = node;
this.keys = keys;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index d6ec9dd..ff595c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -109,7 +109,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index f3811c6..08b6a58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -102,7 +102,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
futId = IgniteUuid.randomUuid();
- log = U.logger(ctx, logRef, GridNearTxFinishFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridNearTxFinishFuture.class);
}
/** {@inheritDoc} */
@@ -434,7 +434,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param m Mapping.
*/
MiniFuture(GridDistributedTxMapping<K, V> m) {
- super(cctx.kernalContext());
+ super();
this.m = m;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 06e4767..7cad8cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -884,12 +884,12 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
) {
if (state() != PREPARING) {
if (timedOut())
- return new GridFinishedFuture<>(cctx.kernalContext(),
+ return new GridFinishedFuture<>(
new IgniteTxTimeoutCheckedException("Transaction timed out: " + this));
setRollbackOnly();
- return new GridFinishedFuture<>(cctx.kernalContext(),
+ return new GridFinishedFuture<>(
new IgniteCheckedException("Invalid transaction state for prepare [state=" + state() + ", tx=" + this + ']'));
}
@@ -965,7 +965,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
if (prep != null)
return (IgniteInternalFuture<IgniteInternalTx>)(IgniteInternalFuture)prep;
- return new GridFinishedFuture<IgniteInternalTx>(cctx.kernalContext(), this);
+ return new GridFinishedFuture<IgniteInternalTx>(this);
}
final GridDhtTxFinishFuture<K, V> fut = new GridDhtTxFinishFuture<>(cctx, this, /*commit*/true);
@@ -1076,13 +1076,13 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
checkValid();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
final GridCacheReturn<V> ret = new GridCacheReturn<>(false);
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(cctx.kernalContext(), ret);
+ return new GridFinishedFuture<>(ret);
init();
@@ -1108,8 +1108,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
return ret;
}
- },
- cctx.kernalContext());
+ }
+ );
}
/** {@inheritDoc} */
@@ -1252,7 +1252,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
* @param tx Transaction.
*/
private PessimisticPrepareFuture(GridKernalContext ctx, IgniteInternalTx<K, V> tx) {
- super(ctx);
+ super();
this.tx = tx;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index 18fda47..ad61f13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -116,7 +116,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
futId = IgniteUuid.randomUuid();
- log = U.logger(ctx, logRef, GridNearTxPrepareFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridNearTxPrepareFuture.class);
}
/** {@inheritDoc} */
@@ -362,11 +362,13 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
}
}
else {
- topFut.syncNotify(false);
-
topFut.listenAsync(new CI1<IgniteInternalFuture<Long>>() {
@Override public void apply(IgniteInternalFuture<Long> t) {
- prepare();
+ cctx.kernalContext().closure().runLocalSafe(new Runnable() {
+ @Override public void run() {
+ prepare();
+ }
+ });
}
});
}
@@ -859,7 +861,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
*/
MiniFuture(GridDistributedTxMapping<K, V> m,
ConcurrentLinkedDeque8<GridDistributedTxMapping<K, V>> mappings) {
- super(cctx.kernalContext());
+ super();
this.m = m;
this.mappings = mappings;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
index 53b216c..5833270 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
@@ -127,7 +127,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> {
public IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout,
@Nullable IgniteTxLocalEx<K, V> tx, IgnitePredicate<Cache.Entry<K, V>>[] filter) {
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(), true);
+ return new GridFinishedFuture<>(true);
GridLocalLockFuture<K, V> fut = new GridLocalLockFuture<>(ctx, keys, tx, this, timeout, filter);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
index d4918c1..2048e5d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
@@ -112,7 +112,7 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean>
GridLocalCache<K, V> cache,
long timeout,
IgnitePredicate<Cache.Entry<K, V>>[] filter) {
- super(cctx.kernalContext());
+ super();
assert keys != null;
assert cache != null;
@@ -131,7 +131,7 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean>
entries = new ArrayList<>(keys.size());
- log = U.logger(ctx, logRef, GridLocalLockFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridLocalLockFuture.class);
if (timeout > 0) {
timeoutObj = new LockTimeoutObject();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java
index 6727f7e..da7f73b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java
@@ -111,10 +111,10 @@ class GridLocalTx<K, V> extends IgniteTxLocalAdapter<K, V> {
try {
prepare();
- return new GridFinishedFuture<IgniteInternalTx<K, V>>(cctx.kernalContext(), this);
+ return new GridFinishedFuture<IgniteInternalTx<K, V>>(this);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -153,7 +153,7 @@ class GridLocalTx<K, V> extends IgniteTxLocalAdapter<K, V> {
catch (IgniteCheckedException e) {
state(UNKNOWN);
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
GridLocalTxFuture<K, V> fut = this.fut.get();
@@ -185,10 +185,10 @@ class GridLocalTx<K, V> extends IgniteTxLocalAdapter<K, V> {
state(ROLLED_BACK);
- return new GridFinishedFuture<IgniteInternalTx>(cctx.kernalContext(), this);
+ return new GridFinishedFuture<IgniteInternalTx>(this);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java
index 66a5eb2..b9934fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java
@@ -83,7 +83,7 @@ final class GridLocalTxFuture<K, V> extends GridFutureAdapter<IgniteInternalTx<K
GridLocalTxFuture(
GridCacheSharedContext<K, V> cctx,
GridLocalTx<K, V> tx) {
- super(cctx.kernalContext());
+ super();
assert cctx != null;
assert tx != null;
@@ -91,7 +91,7 @@ final class GridLocalTxFuture<K, V> extends GridFutureAdapter<IgniteInternalTx<K
this.cctx = cctx;
this.tx = tx;
- log = U.logger(ctx, logRef, GridLocalTxFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridLocalTxFuture.class);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index c3da493..5988069 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -1554,7 +1554,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
boolean invalidate,
long accessTtl,
IgnitePredicate<Cache.Entry<K, V>>[] filter) {
- return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " +
+ return new GridFinishedFuture<>(new UnsupportedOperationException("Locks are not supported for " +
"CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)"));
}
@@ -1563,7 +1563,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
@Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys,
long timeout,
@Nullable IgnitePredicate<Cache.Entry<K, V>>... filter) {
- return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " +
+ return new GridFinishedFuture<>(new UnsupportedOperationException("Locks are not supported for " +
"CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)"));
}
@@ -1613,7 +1613,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
@Override public IgniteInternalFuture apply(Object t, Exception e) {
return ctx.closures().callLocalSafe(op);
}
- }, ctx.kernalContext());
+ });
saveFuture(holder, f);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
index 4f668e6..1093c4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
@@ -56,7 +56,7 @@ public class GridCacheDistributedFieldsQueryFuture
GridCacheQueryBean qry, Iterable<ClusterNode> nodes) {
super((GridCacheContext<Object, Object>)ctx, reqId, qry, nodes);
- metaFut = new GridFutureAdapter<>(ctx.kernalContext());
+ metaFut = new GridFutureAdapter<>();
if (!qry.query().includeMetadata())
metaFut.onDone();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java
index 93a8fd9..222abc1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java
@@ -48,6 +48,6 @@ public class GridCacheFieldsQueryErrorFuture extends GridCacheQueryErrorFuture<L
* @return Metadata.
*/
public IgniteInternalFuture<List<GridQueryFieldMetadata>> metadata() {
- return new GridFinishedFuture<>(ctx, incMeta ? Collections.<GridQueryFieldMetadata>emptyList() : null);
+ return new GridFinishedFuture<>(incMeta ? Collections.<GridQueryFieldMetadata>emptyList() : null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
index 782d9da..70d97fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
@@ -52,7 +52,7 @@ public class GridCacheLocalFieldsQueryFuture
public GridCacheLocalFieldsQueryFuture(GridCacheContext<?, ?> ctx, GridCacheQueryBean qry) {
super((GridCacheContext<Object, Object>)ctx, qry);
- metaFut = new GridFutureAdapter<>(ctx.kernalContext());
+ metaFut = new GridFutureAdapter<>();
if (!qry.query().includeMetadata())
metaFut.onDone();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
index 3d8efbf..8831b5d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
@@ -63,7 +63,7 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap
* Executes query runnable.
*/
void execute() {
- fut = ctx.closure().runLocalSafe(run, true);
+ fut = cctx.kernalContext().closure().runLocalSafe(run, true);
}
/** {@inheritDoc} */
@@ -130,7 +130,7 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap
rdc,
qry.query(),
GridCacheLocalQueryFuture.this,
- ctx.localNodeId(),
+ cctx.localNodeId(),
cctx.io().nextIoId(),
qry.query().includeMetadata(),
true,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
index f4fcb37..627d6b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
@@ -36,7 +36,7 @@ public class GridCacheQueryErrorFuture<T> extends GridFinishedFuture<Collection<
* @param err Error.
*/
public GridCacheQueryErrorFuture(GridKernalContext ctx, Throwable err) {
- super(ctx, err);
+ super(err);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
index 0748936..9e4e3d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
@@ -101,13 +101,13 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda
* @param loc Local query or not.
*/
protected GridCacheQueryFutureAdapter(GridCacheContext<K, V> cctx, GridCacheQueryBean qry, boolean loc) {
- super(cctx.kernalContext());
+ super();
this.cctx = cctx;
this.qry = qry;
this.loc = loc;
- log = U.logger(ctx, logRef, GridCacheQueryFutureAdapter.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridCacheQueryFutureAdapter.class);
startTime = U.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 8fa48aa..b4fbef5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -1511,7 +1511,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
fut = futs.get(qryInfo.requestId());
if (fut == null) {
- futs.put(qryInfo.requestId(), fut = new GridFutureAdapter<>(cctx.kernalContext()));
+ futs.put(qryInfo.requestId(), fut = new GridFutureAdapter<>());
exec = true;
}
@@ -1642,7 +1642,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
if (fut == null) {
resMap.put(qryInfo.requestId(), fut =
- new GridFutureAdapter<>(cctx.kernalContext()));
+ new GridFutureAdapter<>());
exec = true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index abdb99c..409c381 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -959,7 +959,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter
GridFutureAdapter<IgniteInternalTx> fut = finFut.get();
if (fut == null) {
- fut = new GridFutureAdapter<IgniteInternalTx>(cctx.kernalContext()) {
+ fut = new GridFutureAdapter<IgniteInternalTx>() {
@Override public String toString() {
return S.toString(GridFutureAdapter.class, this, "tx", IgniteTxAdapter.this);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index b29f721..5115781 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -173,10 +173,9 @@ public class IgniteTxHandler<K, V> {
final IgniteInClosure<GridNearTxPrepareResponse<K, V>> completeCb
) {
- IgniteInternalFuture<Object> fut = new GridFinishedFutureEx<>(); // TODO force preload keys.
+ IgniteInternalFuture<Object> fut = new GridFinishedFuture<>(); // TODO force preload keys.
return new GridEmbeddedFuture<>(
- ctx.kernalContext(),
fut,
new C2<Object, Exception, IgniteInternalFuture<IgniteInternalTx<K, V>>>() {
@Override public IgniteInternalFuture<IgniteInternalTx<K, V>> apply(Object o, Exception ex) {
@@ -240,7 +239,7 @@ public class IgniteTxHandler<K, V> {
e.unmarshal(ctx, false, ctx.deploy().globalLoader());
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
GridDhtTxLocal<K, V> tx;
@@ -343,7 +342,7 @@ public class IgniteTxHandler<K, V> {
return fut;
}
else
- return new GridFinishedFuture<>(ctx.kernalContext(), (IgniteInternalTx<K, V>)null);
+ return new GridFinishedFuture<>((IgniteInternalTx<K, V>)null);
}
/**
@@ -443,7 +442,7 @@ public class IgniteTxHandler<K, V> {
// Transaction on local cache only.
if (locTx != null && !locTx.nearLocallyMapped() && !locTx.colocatedLocallyMapped())
- return new GridFinishedFutureEx<IgniteInternalTx>(locTx);
+ return new GridFinishedFuture<IgniteInternalTx>(locTx);
if (log.isDebugEnabled())
log.debug("Processing near tx finish request [nodeId=" + nodeId + ", req=" + req + "]");
@@ -607,7 +606,7 @@ public class IgniteTxHandler<K, V> {
return rollbackFut;
}
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -637,7 +636,7 @@ public class IgniteTxHandler<K, V> {
if (tx != null)
return tx.rollbackAsync();
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 8bc5230..67d33fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -356,14 +356,14 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
for (K key : keys)
c.apply(key, null);
- return new GridFinishedFuture<>(cctx.kernalContext(), false);
+ return new GridFinishedFuture<>(false);
}
- return new GridFinishedFuture<>(cctx.kernalContext(),
+ return new GridFinishedFuture<>(
cacheCtx.store().loadAllFromStore(this, keys, c));
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
else
@@ -1413,7 +1413,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
final Collection<K> loaded = new HashSet<>();
- return new GridEmbeddedFuture<>(cctx.kernalContext(),
+ return new GridEmbeddedFuture<>(
loadMissing(
cacheCtx,
true, false, missedMap.keySet(), deserializePortable, skipVals, new CI2<K, V>() {
@@ -1564,7 +1564,8 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
return map;
}
- });
+ },
+ false);
}
/** {@inheritDoc} */
@@ -1575,7 +1576,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
final boolean deserializePortable,
final boolean skipVals) {
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(cctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
init();
@@ -1605,7 +1606,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
skipVals);
if (single && missed.isEmpty())
- return new GridFinishedFuture<>(cctx.kernalContext(), retMap);
+ return new GridFinishedFuture<>(retMap);
// Handle locks.
if (pessimistic() && !readCommitted() && !groupLock() && !skipVals) {
@@ -1712,7 +1713,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
if (!missed.isEmpty() && (cacheCtx.isReplicated() || cacheCtx.isLocal()))
return checkMissed(cacheCtx, retMap, missed, null, deserializePortable, skipVals);
- return new GridFinishedFuture<>(cctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
}
};
@@ -1729,24 +1730,23 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
IgniteInternalFuture<Map<K, V>> fut1 = plc2.apply(fut.get(), null);
return fut1.isDone() ?
- new GridFinishedFutureEx<>(finClos.apply(fut1.get(), null)) :
- new GridEmbeddedFuture<>(cctx.kernalContext(), fut1, finClos);
+ new GridFinishedFuture<>(finClos.apply(fut1.get(), null)) :
+ new GridEmbeddedFuture<>(fut1, finClos, false);
}
catch (GridClosureException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e.unwrap());
+ return new GridFinishedFuture<>(e.unwrap());
}
catch (IgniteCheckedException e) {
try {
return plc2.apply(false, e);
}
catch (Exception e1) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e1);
+ return new GridFinishedFuture<>(e1);
}
}
}
else {
return new GridEmbeddedFuture<>(
- cctx.kernalContext(),
fut,
plc2,
finClos);
@@ -1764,17 +1764,16 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
it.remove();
if (missed.isEmpty())
- return new GridFinishedFuture<>(cctx.kernalContext(), retMap);
+ return new GridFinishedFuture<>(retMap);
return new GridEmbeddedFuture<>(
- cctx.kernalContext(),
// First future.
checkMissed(cacheCtx, retMap, missed, redos, deserializePortable, skipVals),
// Closure that returns another future, based on result from first.
new PMC<Map<K, V>>() {
@Override public IgniteInternalFuture<Map<K, V>> postMiss(Map<K, V> map) {
if (redos.isEmpty())
- return new GridFinishedFuture<>(cctx.kernalContext(),
+ return new GridFinishedFuture<>(
Collections.<K, V>emptyMap());
if (log.isDebugEnabled())
@@ -1807,13 +1806,13 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
);
}
- return new GridFinishedFuture<>(cctx.kernalContext(), retMap);
+ return new GridFinishedFuture<>(retMap);
}
}
catch (IgniteCheckedException e) {
setRollbackOnly();
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -1934,7 +1933,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
addActiveCache(cacheCtx);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
Set<K> skipped = null;
@@ -2212,7 +2211,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
}
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
if (missedForLoad != null) {
@@ -2240,7 +2239,6 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
});
return new GridEmbeddedFuture<>(
- cctx.kernalContext(),
fut,
new C2<Boolean, Exception, Set<K>>() {
@Override public Set<K> apply(Boolean b, Exception e) {
@@ -2249,11 +2247,12 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
return Collections.emptySet();
}
- }
+ },
+ false
);
}
- return new GridFinishedFuture<>(cctx.kernalContext(), skipped);
+ return new GridFinishedFuture<>(skipped);
}
/**
@@ -2495,7 +2494,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
}
}
catch (IgniteException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
else
@@ -2512,7 +2511,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
}
}
catch (IgniteException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
else
@@ -2534,7 +2533,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
checkValid();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
init();
@@ -2547,10 +2546,10 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
commit();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
- return new GridFinishedFuture<>(cctx.kernalContext(), ret.success(true));
+ return new GridFinishedFuture<>(ret.success(true));
}
try {
@@ -2632,22 +2631,22 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
return plc1.apply(fut.get(), null);
}
catch (GridClosureException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e.unwrap());
+ return new GridFinishedFuture<>(e.unwrap());
}
catch (IgniteCheckedException e) {
try {
return plc1.apply(false, e);
}
catch (Exception e1) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e1);
+ return new GridFinishedFuture<>(e1);
}
}
}
else
return new GridEmbeddedFuture<>(
fut,
- plc1,
- cctx.kernalContext());
+ plc1
+ );
}
else {
if (implicit()) {
@@ -2659,7 +2658,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
loadFut.get();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFutureEx<>(new GridCacheReturn<V>(), e);
+ return new GridFinishedFuture<>(e);
}
return commitAsync().chain(new CX1<IgniteInternalFuture<IgniteInternalTx>, GridCacheReturn<V>>() {
@@ -2683,7 +2682,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
catch (IgniteCheckedException e) {
setRollbackOnly();
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -2740,7 +2739,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
keys0 = null;
}
catch (IgniteException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
else
@@ -2757,7 +2756,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
checkValid();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
final GridCacheReturn<V> ret = new GridCacheReturn<>(false);
@@ -2768,11 +2767,11 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
commit();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
- return new GridFinishedFuture<>(cctx.kernalContext(), ret.success(true));
+ return new GridFinishedFuture<>(ret.success(true));
}
init();
@@ -2856,22 +2855,22 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
return plc1.apply(fut.get(), null);
}
catch (GridClosureException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e.unwrap());
+ return new GridFinishedFuture<>(e.unwrap());
}
catch (IgniteCheckedException e) {
try {
return plc1.apply(false, e);
}
catch (Exception e1) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e1);
+ return new GridFinishedFuture<>(e1);
}
}
}
else
return new GridEmbeddedFuture<>(
fut,
- plc1,
- cctx.kernalContext());
+ plc1
+ );
}
else {
if (implicit()) {
@@ -2900,7 +2899,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
catch (IgniteCheckedException e) {
setRollbackOnly();
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -3005,12 +3004,12 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
isInvalidate(),
-1L,
CU.<K, V>empty()) :
- new GridFinishedFuture<>(cctx.kernalContext());
+ new GridFinishedFuture<>();
}
catch (IgniteCheckedException e) {
setRollbackOnly();
- return new GridFinishedFuture<Object>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<Object>(e);
}
}
@@ -3467,7 +3466,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
rollback = false;
- return new GridFinishedFuture<>(cctx.kernalContext(), r);
+ return new GridFinishedFuture<>(r);
}
catch (final IgniteCheckedException ex) {
if (commit && commitAfterLock())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
index 95f54a1..eef7cc6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
@@ -295,7 +295,7 @@ public class TransactionProxyImpl<K, V> implements TransactionProxy, Externaliza
* @param res Result to convert to finished future.
*/
private void save(Object res) {
- asyncRes = new IgniteFinishedFutureImplEx<>(res);
+ asyncRes = new IgniteFinishedFutureImpl<>(res);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index 657539c..28b07e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -472,10 +472,10 @@ public class GridClosureProcessor extends GridProcessorAdapter {
try {
if (job == null)
- return new GridFinishedFuture<>(ctx);
+ return new GridFinishedFuture<>();
if (F.isEmpty(nodes))
- return new GridFinishedFuture<>(ctx, U.emptyTopologyException());
+ return new GridFinishedFuture<>(U.emptyTopologyException());
ctx.task().setThreadContext(TC_NO_FAILOVER, true);
ctx.task().setThreadContext(TC_SUBGRID, nodes);
@@ -504,10 +504,10 @@ public class GridClosureProcessor extends GridProcessorAdapter {
try {
if (F.isEmpty(jobs))
- return new GridFinishedFuture<>(ctx);
+ return new GridFinishedFuture<>();
if (F.isEmpty(nodes))
- return new GridFinishedFuture<>(ctx, U.emptyTopologyException());
+ return new GridFinishedFuture<>(U.emptyTopologyException());
ctx.task().setThreadContext(TC_NO_FAILOVER, true);
ctx.task().setThreadContext(TC_SUBGRID, nodes);
@@ -585,7 +585,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
try {
if (F.isEmpty(nodes))
- return new GridFinishedFuture<>(ctx, U.emptyTopologyException());
+ return new GridFinishedFuture<>(U.emptyTopologyException());
ctx.task().setThreadContext(TC_SUBGRID, nodes);
@@ -608,7 +608,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
try {
if (F.isEmpty(nodes))
- return new GridFinishedFuture<>(ctx, U.emptyTopologyException());
+ return new GridFinishedFuture<>(U.emptyTopologyException());
ctx.task().setThreadContext(TC_SUBGRID, nodes);
ctx.task().setThreadContext(TC_NO_FAILOVER, true);
@@ -731,7 +731,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
*/
private IgniteInternalFuture<?> runLocal(@Nullable final Runnable c, GridClosurePolicy plc) throws IgniteCheckedException {
if (c == null)
- return new GridFinishedFuture(ctx);
+ return new GridFinishedFuture();
enterBusy();
@@ -834,18 +834,18 @@ public class GridClosureProcessor extends GridProcessorAdapter {
try {
c.run();
- return new GridFinishedFuture(ctx);
+ return new GridFinishedFuture();
}
catch (Throwable t) {
if (t instanceof Error)
U.error(log, "Closure execution failed with error.", t);
- return new GridFinishedFuture(ctx, U.cast(t));
+ return new GridFinishedFuture(U.cast(t));
}
}
// If failed for other reasons - return error future.
else
- return new GridFinishedFuture(ctx, U.cast(e));
+ return new GridFinishedFuture(U.cast(e));
}
}
@@ -868,7 +868,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
*/
private <R> IgniteInternalFuture<R> callLocal(@Nullable final Callable<R> c, GridClosurePolicy plc) throws IgniteCheckedException {
if (c == null)
- return new GridFinishedFuture<>(ctx);
+ return new GridFinishedFuture<>();
enterBusy();
@@ -964,16 +964,16 @@ public class GridClosureProcessor extends GridProcessorAdapter {
", closure=" + c + ']');
try {
- return new GridFinishedFuture<>(ctx, c.call());
+ return new GridFinishedFuture<>(c.call());
}
// If failed again locally - return error future.
catch (Exception e2) {
- return new GridFinishedFuture<>(ctx, U.cast(e2));
+ return new GridFinishedFuture<>(U.cast(e2));
}
}
// If failed for other reasons - return error future.
else
- return new GridFinishedFuture<>(ctx, U.cast(e));
+ return new GridFinishedFuture<>(U.cast(e));
}
}
[19/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-136' into sprint-2
Posted by yz...@apache.org.
Merge branch 'ignite-136' into sprint-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/9a931983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a931983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a931983
Branch: refs/heads/ignite-313
Commit: 9a931983f51f96ad9b96551aee654874e746aa94
Parents: 028e446 2e115bf
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Mon Mar 2 17:47:24 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Mon Mar 2 17:47:24 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 9 +
.../distributed/dht/GridDhtCacheEntry.java | 3 +
.../distributed/dht/GridDhtLocalPartition.java | 5 +
.../GridCacheAbstractLocalStoreSelfTest.java | 440 +++++++++++++++++++
.../GridCachePartitionedLocalStoreSelfTest.java | 51 +++
...chePartitionedOffHeapLocalStoreSelfTest.java | 56 +++
.../GridCacheReplicatedLocalStoreSelfTest.java | 51 +++
...ridCacheTxPartitionedLocalStoreSelfTest.java | 51 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
9 files changed, 670 insertions(+)
----------------------------------------------------------------------
[49/50] [abbrv] incubator-ignite git commit: futures: api cleanup
Posted by yz...@apache.org.
futures: api cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1b46951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1b46951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1b46951
Branch: refs/heads/ignite-313
Commit: c1b46951fcb01de43a3df71b287cb69d89ab065b
Parents: 680b0ba
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Mar 4 21:15:46 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Mar 4 21:15:46 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 20 -
.../internal/ComputeTaskInternalFuture.java | 41 +-
.../ignite/internal/GridJobSessionImpl.java | 2 +-
.../ignite/internal/GridTaskSessionImpl.java | 2 +-
.../ignite/internal/IgniteInternalFuture.java | 58 ---
.../internal/cluster/IgniteClusterImpl.java | 6 +-
.../discovery/GridDiscoveryManager.java | 10 +-
.../eventstorage/GridEventStorageManager.java | 6 +-
.../affinity/GridAffinityAssignmentCache.java | 2 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 55 +-
.../cache/GridCacheAffinityManager.java | 2 +-
.../cache/GridCacheEvictionManager.java | 2 +-
.../cache/GridCacheMultiTxFuture.java | 7 +-
.../processors/cache/GridCacheMvccManager.java | 4 +-
.../GridCachePartitionExchangeManager.java | 2 +-
.../cache/GridCachePreloaderAdapter.java | 4 +-
.../cache/GridCacheProjectionImpl.java | 12 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 4 +-
.../distributed/GridCacheTxFinishSync.java | 2 +-
.../GridDistributedCacheAdapter.java | 2 +-
.../GridDistributedTxRemoteAdapter.java | 6 +-
.../dht/GridDhtAssignmentFetchFuture.java | 18 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheEntry.java | 12 +-
.../distributed/dht/GridDhtEmbeddedFuture.java | 24 +-
.../distributed/dht/GridDhtFinishedFuture.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 25 +-
.../distributed/dht/GridDhtLocalPartition.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 6 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 17 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 10 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 14 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 13 +-
.../dht/GridPartitionedGetFuture.java | 12 +-
.../dht/atomic/GridDhtAtomicCache.java | 13 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 17 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 38 +-
.../dht/colocated/GridDhtColocatedCache.java | 22 +-
.../colocated/GridDhtColocatedLockFuture.java | 8 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 20 +-
.../preloader/GridDhtPartitionDemandPool.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 24 +-
.../dht/preloader/GridDhtPreloader.java | 9 +-
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../distributed/near/GridNearCacheAdapter.java | 2 +-
.../distributed/near/GridNearGetFuture.java | 21 +-
.../distributed/near/GridNearLockFuture.java | 8 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../near/GridNearTxFinishFuture.java | 4 +-
.../cache/distributed/near/GridNearTxLocal.java | 16 +-
.../near/GridNearTxPrepareFuture.java | 12 +-
.../processors/cache/local/GridLocalCache.java | 2 +-
.../cache/local/GridLocalLockFuture.java | 4 +-
.../processors/cache/local/GridLocalTx.java | 10 +-
.../cache/local/GridLocalTxFuture.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 6 +-
.../GridCacheDistributedFieldsQueryFuture.java | 2 +-
.../query/GridCacheFieldsQueryErrorFuture.java | 2 +-
.../query/GridCacheLocalFieldsQueryFuture.java | 2 +-
.../cache/query/GridCacheLocalQueryFuture.java | 4 +-
.../cache/query/GridCacheQueryErrorFuture.java | 2 +-
.../query/GridCacheQueryFutureAdapter.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 13 +-
.../transactions/IgniteTxLocalAdapter.java | 91 ++--
.../transactions/TransactionProxyImpl.java | 2 +-
.../closure/GridClosureProcessor.java | 28 +-
.../continuous/GridContinuousProcessor.java | 24 +-
.../dataload/GridDataLoaderFuture.java | 4 +-
.../dataload/IgniteDataLoaderImpl.java | 10 +-
.../GridCacheAtomicSequenceImpl.java | 4 +-
.../hadoop/IgniteHadoopNoopProcessor.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 14 +-
.../internal/processors/igfs/IgfsImpl.java | 10 +-
.../processors/igfs/IgfsIpcHandler.java | 4 +-
.../processors/query/GridQueryProcessor.java | 4 +-
.../processors/rest/GridRestProcessor.java | 10 +-
.../handlers/cache/GridCacheCommandHandler.java | 6 +-
.../cache/GridCacheQueryCommandHandler.java | 4 +-
.../DataStructuresCommandHandler.java | 4 +-
.../handlers/task/GridTaskCommandHandler.java | 4 +-
.../top/GridTopologyCommandHandler.java | 4 +-
.../version/GridVersionCommandHandler.java | 2 +-
.../tcp/GridTcpMemcachedNioListener.java | 4 +-
.../service/GridServiceDeploymentFuture.java | 2 +-
.../service/GridServiceProcessor.java | 8 +-
.../GridStreamerStageExecutionFuture.java | 4 +-
.../util/future/GridCompoundFuture.java | 34 +-
.../util/future/GridEmbeddedFuture.java | 48 +-
.../util/future/GridFinishedFuture.java | 118 +----
.../util/future/GridFinishedFutureEx.java | 192 -------
.../internal/util/future/GridFutureAdapter.java | 219 +-------
.../util/future/GridFutureAdapterEx.java | 500 -------------------
.../util/future/GridFutureChainListener.java | 18 +-
.../util/future/IgniteFinishedFutureImpl.java | 27 +-
.../util/future/IgniteFinishedFutureImplEx.java | 30 --
.../internal/util/future/IgniteFutureImpl.java | 20 -
.../ignite/internal/util/lang/GridFunc.java | 6 +-
.../internal/util/worker/GridWorkerFuture.java | 2 +-
.../org/apache/ignite/lang/IgniteFuture.java | 58 ---
.../communication/tcp/TcpCommunicationSpi.java | 16 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 42 +-
.../util/future/GridCompoundFutureSelfTest.java | 14 +-
.../util/future/GridEmbeddedFutureSelfTest.java | 13 +-
.../util/future/GridFinishedFutureSelfTest.java | 103 ----
.../util/future/GridFutureAdapterSelfTest.java | 10 +-
.../util/future/IgniteFutureImplTest.java | 41 +-
.../testsuites/IgniteLangSelfTestSuite.java | 1 -
.../hadoop/jobtracker/GridHadoopJobTracker.java | 12 +-
.../hadoop/shuffle/GridHadoopShuffle.java | 4 +-
.../hadoop/shuffle/GridHadoopShuffleJob.java | 14 +-
.../GridHadoopExternalTaskExecutor.java | 2 +-
.../child/GridHadoopChildProcessRunner.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 8 +-
.../processors/schedule/ScheduleFutureImpl.java | 3 +-
120 files changed, 548 insertions(+), 1957 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 547cbc6..d454e76 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -150,26 +150,6 @@ public final class IgniteSystemProperties {
public static final String IGNITE_LOCAL_HOST = "IGNITE_LOCAL_HOST";
/**
- * Name of the system property or environment variable to activate synchronous
- * listener notification for future objects implemented in Ignite. I.e.
- * closure passed into method {@link org.apache.ignite.internal.IgniteInternalFuture#listenAsync(org.apache.ignite.lang.IgniteInClosure)} will
- * be evaluated in the same thread that will end the future.
- *
- * @see org.apache.ignite.internal.IgniteInternalFuture#syncNotify()
- */
- public static final String IGNITE_FUT_SYNC_NOTIFICATION = "IGNITE_FUTURE_SYNC_NOTIFICATION";
-
- /**
- * Name of the system property or environment variable to activate concurrent
- * listener notification for future objects implemented in Ignite. I.e.
- * upon future completion every listener will be notified concurrently in a
- * separate thread.
- *
- * @see org.apache.ignite.internal.IgniteInternalFuture#concurrentNotify()
- */
- public static final String IGNITE_FUT_CONCURRENT_NOTIFICATION = "IGNITE_FUTURE_CONCURRENT_NOTIFICATION";
-
- /**
* System property to override deployment mode configuration parameter.
* Valid values for property are: PRIVATE, ISOLATED, SHARED or CONTINUOUS.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
index 9c9a5e5..16ef37e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal;
import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.tostring.*;
@@ -27,7 +26,6 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.security.*;
import org.jetbrains.annotations.*;
-import java.io.*;
import java.util.*;
/**
@@ -49,18 +47,11 @@ public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> {
private ComputeFuture<R> userFut;
/**
- * Required by {@link Externalizable}.
- */
- public ComputeTaskInternalFuture() {
- // No-op.
- }
-
- /**
* @param ses Task session instance.
* @param ctx Kernal context.
*/
public ComputeTaskInternalFuture(ComputeTaskSession ses, GridKernalContext ctx) {
- super(ctx);
+ super();
assert ses != null;
assert ctx != null;
@@ -197,7 +188,7 @@ public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> {
}
@Override public IgniteFuture<?> mapFuture() {
- return new IgniteFinishedFutureImpl<Object>(ctx);
+ return new IgniteFinishedFutureImpl<Object>();
}
};
@@ -231,8 +222,6 @@ public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> {
@Override public boolean cancel() throws IgniteCheckedException {
ctx.security().authorize(ses.getTaskName(), GridSecurityPermission.TASK_CANCEL, null);
- checkValid();
-
if (onCancelled()) {
ctx.task().onCancelled(ses.getId());
@@ -242,32 +231,6 @@ public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> {
return isCancelled();
}
- /**
- * Cancel task on master leave event. Does not send cancel request to remote jobs and invokes master-leave
- * callback on local jobs.
- *
- * @return {@code True} if future was cancelled (i.e. was not finished prior to this call).
- * @throws IgniteCheckedException If failed.
- */
- public boolean cancelOnMasterLeave() throws IgniteCheckedException {
- checkValid();
-
- if (onCancelled()) {
- // Invoke master-leave callback on spawned jobs on local node and then cancel them.
- for (ClusterNode node : ctx.discovery().nodes(ses.getTopology())) {
- if (ctx.localNodeId().equals(node.id())) {
- ctx.job().masterLeaveLocal(ses.getId());
-
- ctx.job().cancelJob(ses.getId(), null, false);
- }
- }
-
- return true;
- }
-
- return isCancelled();
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(ComputeTaskInternalFuture.class, this, "super", super.toString());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
index aa9b1b5..7d32586 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
@@ -292,7 +292,7 @@ public class GridJobSessionImpl implements GridTaskSessionInternal {
/** {@inheritDoc} */
@Override public IgniteFuture<?> mapFuture() {
- return new IgniteFinishedFutureImpl<>(ctx, null);
+ return new IgniteFinishedFutureImpl<>(null);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
index 2957801..25ebb37 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
@@ -156,7 +156,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal {
this.fullSup = fullSup;
this.subjId = subjId;
- mapFut = new IgniteFutureImpl(new GridFutureAdapter(ctx));
+ mapFut = new IgniteFutureImpl(new GridFutureAdapter());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
index ed4a820..969d905 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
@@ -107,64 +107,6 @@ public interface IgniteInternalFuture<R> {
public long duration();
/**
- * Flag to turn on or off synchronous listener notification. If this flag is {@code true}, then
- * upon future completion the notification may happen in the same thread that created
- * the future. This becomes especially important when adding listener to a future that
- * is already {@code done} - if this flag is {@code true}, then listener will be
- * immediately notified within the same thread.
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
- *
- * @param syncNotify Flag to turn on or off synchronous listener notification.
- */
- public void syncNotify(boolean syncNotify);
-
- /**
- * Gets value of synchronous listener notification flag. If this flag is {@code true}, then
- * upon future completion the notification may happen in the same thread that created
- * the future. This becomes especially important when adding listener to a future that
- * is already {@code done} - if this flag is {@code true}, then listener will be
- * immediately notified within the same thread.
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
- *
- * @return Synchronous listener notification flag.
- */
- public boolean syncNotify();
-
- /**
- * Flag to turn on or off concurrent listener notification. This flag comes into play only
- * when a future has more than one listener subscribed to it. If this flag is {@code true},
- * then all listeners will be notified concurrently by different threads; otherwise,
- * listeners will be notified one after another within one thread (depending on
- * {@link #syncNotify()} flag, these notifications may happen either in the same thread which
- * started the future, or in a different thread).
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
- *
- * @param concurNotify Flag to turn on or off concurrent listener notification.
- */
- public void concurrentNotify(boolean concurNotify);
-
- /**
- * Gets value concurrent listener notification flag. This flag comes into play only
- * when a future has more than one listener subscribed to it. If this flag is {@code true},
- * then all listeners will be notified concurrently by different threads; otherwise,
- * listeners will be notified one after another within one thread (depending on
- * {@link #syncNotify()} flag, these notifications may happen either in the same thread which
- * started the future, or in a different thread).
- * <p>
- * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
- *
- * @return Concurrent listener notification flag
- */
- public boolean concurrentNotify();
-
- /**
* Registers listener closure to be asynchronously notified whenever future completes.
*
* @param lsnr Listener closure to register. If not provided - this method is no-op.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index c79fed8..e42e186 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -319,7 +319,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
return startNodesAsync(t.get1(), t.get2(), restart, timeout, maxConn);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -411,7 +411,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
// If there is nothing to start, return finished future with empty result.
if (nodeCallCnt == 0)
return new GridFinishedFuture<Collection<GridTuple3<String, Boolean, String>>>(
- ctx, Collections.<GridTuple3<String, Boolean, String>>emptyList());
+ Collections.<GridTuple3<String, Boolean, String>>emptyList());
// Exceeding max line width for readability.
GridCompoundFuture<GridTuple3<String, Boolean, String>, Collection<GridTuple3<String, Boolean, String>>>
@@ -433,7 +433,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
return fut;
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx, e);
+ return new GridFinishedFuture<>(e);
}
finally {
unguard();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 68f0a4a..5a1d822 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -149,7 +149,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
private long segChkFreq;
/** Local node join to topology event. */
- private GridFutureAdapterEx<DiscoveryEvent> locJoinEvt = new GridFutureAdapterEx<>();
+ private GridFutureAdapter<DiscoveryEvent> locJoinEvt = new GridFutureAdapter<>();
/** GC CPU load. */
private volatile double gcCpuLoad;
@@ -923,7 +923,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
long topVer = topologyVersion();
if (topVer >= awaitVer)
- return new GridFinishedFuture<>(ctx, topVer);
+ return new GridFinishedFuture<>(topVer);
DiscoTopologyFuture fut = new DiscoTopologyFuture(ctx, awaitVer);
@@ -1653,6 +1653,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private GridKernalContext ctx;
+
/** Topology await version. */
private long awaitVer;
@@ -1666,8 +1669,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @param awaitVer Await version.
*/
private DiscoTopologyFuture(GridKernalContext ctx, long awaitVer) {
- super(ctx);
-
+ this.ctx = ctx;
this.awaitVer = awaitVer;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 82af8bf..39f266c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -663,7 +663,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
*/
public <T extends Event> IgniteInternalFuture<T> waitForEvent(@Nullable final IgnitePredicate<T> p,
@Nullable int... types) {
- final GridFutureAdapter<T> fut = new GridFutureAdapter<>(ctx);
+ final GridFutureAdapter<T> fut = new GridFutureAdapter<>();
addLocalEventListener(new GridLocalEventListener() {
@Override public void onEvent(Event evt) {
@@ -691,7 +691,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
@Nullable final IgnitePredicate<? super Event> p, int... types) throws IgniteCheckedException {
assert timeout >= 0;
- final GridFutureAdapter<Event> fut = new GridFutureAdapter<>(ctx);
+ final GridFutureAdapter<Event> fut = new GridFutureAdapter<>();
addLocalEventListener(new GridLocalEventListener() {
@Override public void onEvent(Event evt) {
@@ -765,7 +765,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
assert p != null;
assert nodes != null;
- final GridFutureAdapter<List<T>> fut = new GridFutureAdapter<>(ctx);
+ final GridFutureAdapter<List<T>> fut = new GridFutureAdapter<>();
ctx.closure().runLocalSafe(new GPR() {
@Override public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 69795b1..ce7df9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -446,7 +446,7 @@ public class GridAffinityAssignmentCache {
* @param ctx Kernal context.
*/
private AffinityReadyFuture(GridKernalContext ctx, long reqTopVer) {
- super(ctx);
+ super();
this.reqTopVer = reqTopVer;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index d7d0391..50221c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -306,7 +306,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
new GridAffinityAssignment(topVer, cctx.affinity().assignments(topVer)),
cctx.portableEnabled());
- IgniteInternalFuture<AffinityInfo> old = affMap.putIfAbsent(key, new GridFinishedFuture<>(ctx, info));
+ IgniteInternalFuture<AffinityInfo> old = affMap.putIfAbsent(key, new GridFinishedFuture<>(info));
if (old != null)
info = old.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 12ea535..95cc4a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1592,7 +1592,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
});
}
else
- return new GridFinishedFuture<>(ctx.kernalContext());
+ return new GridFinishedFuture<>();
}
/** {@inheritDoc} */
@@ -1908,7 +1908,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
});
}
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
}
/**
@@ -2107,7 +2107,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
assert ctx.portableEnabled() || cached == null || F.first(keys).equals(cached.key());
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
if (keyCheck)
validateCacheKeys(keys);
@@ -2119,7 +2119,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
checkJta();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
tx = ctx.tm().threadLocalTx();
@@ -2189,7 +2189,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
if (keys.size() == 1)
// Safe to return because no locks are required in READ_COMMITTED mode.
- return new GridFinishedFuture<>(ctx.kernalContext(), map);
+ return new GridFinishedFuture<>(map);
}
break;
@@ -2218,7 +2218,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
final Collection<K> loaded = new HashSet<>();
return new GridEmbeddedFuture<>(
- ctx.kernalContext(),
ctx.closures().callLocalSafe(ctx.projectSafe(new GPC<Map<K, V>>() {
@Override public Map<K, V> call() throws Exception {
ctx.store().loadAllFromStore(null/*tx*/, loadKeys.keySet(), new CI2<K, V>() {
@@ -2297,7 +2296,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
new C2<Map<K, V>, Exception, IgniteInternalFuture<Map<K, V>>>() {
@Override public IgniteInternalFuture<Map<K, V>> apply(Map<K, V> map, Exception e) {
if (e != null)
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
if (tx0 == null || (!tx0.implicit() && tx0.isolation() == READ_COMMITTED)) {
Collection<K> notFound = new HashSet<>(loadKeys.keySet());
@@ -2314,7 +2313,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
// There were no misses.
- return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K,
+ return new GridFinishedFuture<>(Collections.<K,
V>emptyMap());
}
},
@@ -2340,10 +2339,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
}
- return new GridFinishedFuture<>(ctx.kernalContext(), map);
+ return new GridFinishedFuture<>(map);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
else {
@@ -2518,7 +2517,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
@Override public IgniteInternalFuture<?> putAllConflictAsync(final Map<? extends K, GridCacheDrInfo<V>> drMap)
throws IgniteCheckedException {
if (F.isEmpty(drMap))
- return new GridFinishedFuture<Object>(ctx.kernalContext());
+ return new GridFinishedFuture<Object>();
ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
@@ -3064,7 +3063,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.deploy().registerClass(oldVal);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -3123,7 +3122,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
@Override public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m,
@Nullable final IgnitePredicate<Cache.Entry<K, V>>... filter) {
if (F.isEmpty(m))
- return new GridFinishedFuture<Object>(ctx.kernalContext());
+ return new GridFinishedFuture<Object>();
if (keyCheck)
validateCacheKeys(m.keySet());
@@ -3280,7 +3279,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
final long start = statsEnabled ? System.nanoTime() : 0L;
if (F.isEmpty(keys))
- return new GridFinishedFuture<Object>(ctx.kernalContext());
+ return new GridFinishedFuture<Object>();
if (keyCheck)
validateCacheKeys(keys);
@@ -3438,7 +3437,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
if (F.isEmpty(drMap))
- return new GridFinishedFuture<Object>(ctx.kernalContext());
+ return new GridFinishedFuture<Object>();
ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
@@ -3494,7 +3493,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.deploy().registerClass(val);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true,
@@ -3524,7 +3523,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.deploy().registerClass(oldVal);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
return tx.putAllAsync(ctx, F.t(key, newVal), true, null, -1, ctx.equalsPeekArray(oldVal));
@@ -3603,7 +3602,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.deploy().registerClass(val);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -3616,7 +3615,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
val0 = (V)ctx.marshalToPortable(val);
}
catch (IgniteException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -3985,7 +3984,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
A.notNull(key, "key");
if (!ctx.store().configured())
- return new GridFinishedFuture<>(ctx.kernalContext());
+ return new GridFinishedFuture<>();
GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall();
@@ -4008,7 +4007,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
Collection<ClusterNode> nodes = ctx.grid().cluster().forDataNodes(name()).nodes();
if (nodes.isEmpty())
- return new GridFinishedFuture<>(ctx.kernalContext());
+ return new GridFinishedFuture<>();
return ctx.closures().callAsyncNoFailover(BROADCAST,
new LoadKeysCallable<>(ctx.name(), keys0, true, plc),
@@ -4029,7 +4028,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
Collection<ClusterNode> nodes = ctx.grid().cluster().forDataNodes(name()).nodes();
if (nodes.isEmpty())
- return new GridFinishedFuture<>(ctx.kernalContext());
+ return new GridFinishedFuture<>();
return ctx.closures().callAsyncNoFailover(BROADCAST,
new LoadKeysCallable<>(ctx.name(), keys, false, plc),
@@ -4176,7 +4175,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
Collection<ClusterNode> nodes = grp.nodes();
if (nodes.isEmpty())
- return new GridFinishedFuture<>(ctx.kernalContext(), 0);
+ return new GridFinishedFuture<>(0);
IgniteInternalFuture<Collection<Integer>> fut =
ctx.closures().broadcastNoFailover(new SizeCallable(ctx.name(), peekModes), null, nodes);
@@ -4450,7 +4449,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
@Override public IgniteInternalFuture<IgniteInternalTx> apply(Object o, Exception e) {
return tx.commitAsync();
}
- }, ctx.kernalContext());
+ });
saveFuture(holder, f);
@@ -4617,7 +4616,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
checkJta();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
if (log.isDebugEnabled())
@@ -4685,7 +4684,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
});
}
- }, ctx.kernalContext());
+ });
saveFuture(holder, f);
@@ -4771,7 +4770,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- return new GridFinishedFutureEx<>(new IgniteInterruptedCheckedException("Failed to wait for asynchronous " +
+ return new GridFinishedFuture<>(new IgniteInterruptedCheckedException("Failed to wait for asynchronous " +
"operation permit (thread got interrupted).", e));
}
}
@@ -5114,7 +5113,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
checkJta();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
return getAllAsync(Collections.singletonList(key), deserializePortable).chain(
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index d3510e4..3f7872f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -108,7 +108,7 @@ public class GridCacheAffinityManager<K, V> extends GridCacheManagerAdapter<K, V
IgniteInternalFuture<Long> fut = aff.readyFuture(topVer);
- return fut != null ? fut : new GridFinishedFutureEx<>(topVer);
+ return fut != null ? fut : new GridFinishedFuture<>(topVer);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 382eb61..8a642f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -1568,7 +1568,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
* @param ctx Context.
*/
EvictionFuture(GridKernalContext ctx) {
- super(ctx);
+ super();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
index 287a0db..c6829aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
@@ -52,12 +52,9 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
* @param cctx Cache context.
*/
public GridCacheMultiTxFuture(GridCacheContext<K, V> cctx) {
- super(cctx.kernalContext());
+ super();
- log = U.logger(ctx, logRef, GridCacheMultiTxFuture.class);
-
- // Notify listeners in different threads.
- concurrentNotify(true);
+ log = U.logger(cctx.kernalContext(), logRef, GridCacheMultiTxFuture.class);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index d125c02..5190c7e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -994,7 +994,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
assert topVer != 0;
if (topVer < 0)
- return new GridFinishedFuture(context().kernalContext());
+ return new GridFinishedFuture();
final FinishLockFuture finishFut = new FinishLockFuture(
keyFilter == null ?
@@ -1066,7 +1066,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
* @param entries Entries.
*/
FinishLockFuture(Iterable<GridDistributedCacheEntry<K, V>> entries, long topVer) {
- super(cctx.kernalContext(), true);
+ super();
assert topVer > 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git 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
index d7b1914..2b672d9 100644
--- 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
@@ -160,7 +160,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
@Override protected void start0() throws IgniteCheckedException {
super.start0();
- locExchFut = new GridFutureAdapter<>(cctx.kernalContext());
+ locExchFut = new GridFutureAdapter<>();
exchWorker = new ExchangeWorker();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
index 40e090b..c863e75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
@@ -57,7 +57,7 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V>
log = cctx.logger(getClass());
aff = cctx.config().getAffinity();
- finFut = new GridFinishedFuture(cctx.kernalContext());
+ finFut = new GridFinishedFuture();
}
/** {@inheritDoc} */
@@ -112,7 +112,7 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V>
/** {@inheritDoc} */
@Override public IgniteInternalFuture<Object> request(Collection<? extends K> keys, long topVer) {
- return new GridFinishedFuture<>(cctx.kernalContext());
+ return new GridFinishedFuture<>();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index c8187f4..20e3c3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -776,7 +776,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
// Check k-v predicate first.
if (!isAll(key, val, true))
- return new GridFinishedFuture<>(cctx.kernalContext());
+ return new GridFinishedFuture<>();
return cache.putAsync(key, val, entry, ttl, and(filter, false));
}
@@ -858,7 +858,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
// Check k-v predicate first.
if (!isAll(key, val, true))
- return new GridFinishedFuture<>(cctx.kernalContext(), false);
+ return new GridFinishedFuture<>(false);
return cache.putxAsync(key, val, entry, ttl, and(filter, false));
}
@@ -927,7 +927,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
m = isAll(m, true);
if (F.isEmpty(m))
- return new GridFinishedFuture<>(cctx.kernalContext());
+ return new GridFinishedFuture<>();
return cache.putAllAsync(m, and(filter, false));
}
@@ -1169,7 +1169,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
// Check k-v predicate first.
if (!isAll(key, newVal, true))
- return new GridFinishedFuture<>(cctx.kernalContext(), new GridCacheReturn<V>(false));
+ return new GridFinishedFuture<>(new GridCacheReturn<V>(false));
return cache.replacexAsync(key, oldVal, newVal);
}
@@ -1186,7 +1186,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
/** {@inheritDoc} */
@Override public IgniteInternalFuture<GridCacheReturn<V>> removexAsync(K key, V val) {
- return !isAll(key, val, true) ? new GridFinishedFuture<>(cctx.kernalContext(),
+ return !isAll(key, val, true) ? new GridFinishedFuture<>(
new GridCacheReturn<V>(false)) : cache.removexAsync(key, val);
}
@@ -1197,7 +1197,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
/** {@inheritDoc} */
@Override public IgniteInternalFuture<Boolean> removeAsync(K key, V val) {
- return !isAll(key, val, true) ? new GridFinishedFuture<>(cctx.kernalContext(), false) :
+ return !isAll(key, val, true) ? new GridFinishedFuture<>(false) :
cache.removeAsync(key, val);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
index 75b2683..759474c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
@@ -86,7 +86,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound
this.txNodes = txNodes;
this.failedNodeId = failedNodeId;
- log = U.logger(ctx, logRef, GridCacheOptimisticCheckPreparedTxFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridCacheOptimisticCheckPreparedTxFuture.class);
nodes = new GridLeanMap<>();
@@ -338,7 +338,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound
* @param nodeId Node ID.
*/
private MiniFuture(UUID nodeId) {
- super(cctx.kernalContext());
+ super();
this.nodeId = nodeId;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
index 93247c6..f7f91b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
@@ -239,7 +239,7 @@ public class GridCacheTxFinishSync<K, V> {
return null;
if (nodeLeft)
- return new GridFinishedFutureEx<>(new IgniteCheckedException("Failed to wait for finish synchronizer " +
+ return new GridFinishedFuture<>(new IgniteCheckedException("Failed to wait for finish synchronizer " +
"state (node left grid): " + nodeId));
if (pendingFut == null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 00190d9..10396d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -160,7 +160,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
/** {@inheritDoc} */
@Override public IgniteInternalFuture<?> removeAllAsync() {
- GridFutureAdapter<Void> opFut = new GridFutureAdapter<>(ctx.kernalContext());
+ GridFutureAdapter<Void> opFut = new GridFutureAdapter<>();
long topVer = ctx.affinity().affinityTopologyVersion();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index dbf82dd..52c50df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -723,10 +723,10 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V>
try {
commit();
- return new GridFinishedFutureEx<IgniteInternalTx>(this);
+ return new GridFinishedFuture<IgniteInternalTx>(this);
}
catch (IgniteCheckedException e) {
- return new GridFinishedFutureEx<>(e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -753,7 +753,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V>
@Override public IgniteInternalFuture<IgniteInternalTx> rollbackAsync() {
rollback();
- return new GridFinishedFutureEx<IgniteInternalTx>(this);
+ return new GridFinishedFuture<IgniteInternalTx>(this);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
index 101d657..bd4b264 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.util.*;
+import java.util.concurrent.atomic.*;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
@@ -41,9 +42,15 @@ public class GridDhtAssignmentFetchFuture<K, V> extends GridFutureAdapter<List<L
/** Nodes order comparator. */
private static final Comparator<ClusterNode> CMP = new GridNodeOrderComparator();
+ /** Logger reference. */
+ private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
+
/** Cache context. */
private final GridCacheContext<K, V> ctx;
+ /** Logger. */
+ private IgniteLogger log;
+
/** List of available nodes this future can fetch data from. */
private Queue<ClusterNode> availableNodes;
@@ -57,11 +64,14 @@ public class GridDhtAssignmentFetchFuture<K, V> extends GridFutureAdapter<List<L
* @param ctx Cache context.
* @param availableNodes Available nodes.
*/
- public GridDhtAssignmentFetchFuture(GridCacheContext<K, V> ctx, long topVer, Collection<ClusterNode> availableNodes) {
- super(ctx.kernalContext());
+ public GridDhtAssignmentFetchFuture(
+ GridCacheContext<K, V> ctx,
+ long topVer,
+ Collection<ClusterNode> availableNodes
+ ) {
+ super();
this.ctx = ctx;
-
this.topVer = topVer;
LinkedList<ClusterNode> tmp = new LinkedList<>();
@@ -69,6 +79,8 @@ public class GridDhtAssignmentFetchFuture<K, V> extends GridFutureAdapter<List<L
Collections.sort(tmp, CMP);
this.availableNodes = tmp;
+
+ log = U.logger(ctx.kernalContext(), logRef, GridDhtAssignmentFetchFuture.class);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 2ef157c..365b884 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -1095,7 +1095,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
* @param topVer Topology version.
*/
private MultiUpdateFuture(GridKernalContext ctx, long topVer) {
- super(ctx);
+ super();
this.topVer = topVer;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index c331b99..608678b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -449,10 +449,14 @@ public class GridDhtCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> {
txFut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
@Override public void apply(IgniteInternalFuture<?> f) {
- synchronized (this) {
- // Release memory.
- reader0.resetTxFuture();
- }
+ cctx.kernalContext().closure().runLocalSafe(new Runnable() {
+ @Override public void run() {
+ synchronized (this) {
+ // Release memory.
+ reader0.resetTxFuture();
+ }
+ }
+ });
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
index 81095e2..6749491 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
@@ -45,12 +45,12 @@ public class GridDhtEmbeddedFuture<A, B> extends GridEmbeddedFuture<A, B> implem
}
/**
- * @param ctx Context.
* @param embedded Embedded.
* @param c Closure.
+ * @param fake Fake.
*/
- public GridDhtEmbeddedFuture(GridKernalContext ctx, IgniteInternalFuture<B> embedded, IgniteBiClosure<B, Exception, A> c) {
- super(ctx, embedded, c);
+ public GridDhtEmbeddedFuture(IgniteInternalFuture<B> embedded, IgniteBiClosure<B, Exception, A> c, boolean fake) {
+ super(embedded, c, fake);
invalidParts = Collections.emptyList();
}
@@ -58,28 +58,14 @@ public class GridDhtEmbeddedFuture<A, B> extends GridEmbeddedFuture<A, B> implem
/**
* @param embedded Future to embed.
* @param c Embedding closure.
- * @param ctx Kernal context.
*/
public GridDhtEmbeddedFuture(IgniteInternalFuture<B> embedded,
- IgniteBiClosure<B, Exception, IgniteInternalFuture<A>> c, GridKernalContext ctx) {
- super(embedded, c, ctx);
+ IgniteBiClosure<B, Exception, IgniteInternalFuture<A>> c) {
+ super(embedded, c);
invalidParts = Collections.emptyList();
}
- /**
- * @param ctx Context.
- * @param embedded Embedded.
- * @param c Closure.
- * @param invalidParts Retries.
- */
- public GridDhtEmbeddedFuture(GridKernalContext ctx, IgniteInternalFuture<B> embedded, IgniteBiClosure<B, Exception, A> c,
- Collection<Integer> invalidParts) {
- super(ctx, embedded, c);
-
- this.invalidParts = invalidParts;
- }
-
/** {@inheritDoc} */
@Override public Collection<Integer> invalidPartitions() {
return invalidParts;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
index ed6c3b5..c66336d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
@@ -43,7 +43,7 @@ public class GridDhtFinishedFuture<T> extends GridFinishedFuture<T> implements G
* @param t Result.
*/
public GridDhtFinishedFuture(GridKernalContext ctx, T t) {
- super(ctx, t);
+ super(t);
}
/**
@@ -51,7 +51,7 @@ public class GridDhtFinishedFuture<T> extends GridFinishedFuture<T> implements G
* @param err Error.
*/
public GridDhtFinishedFuture(GridKernalContext ctx, Throwable err) {
- super(ctx, err);
+ super(err);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index 0be5b97..c594d36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -159,9 +159,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
ver = tx == null ? cctx.versions().next() : tx.xidVersion();
- log = U.logger(ctx, logRef, GridDhtGetFuture.class);
-
- syncNotify(true);
+ log = U.logger(cctx.kernalContext(), logRef, GridDhtGetFuture.class);
}
/**
@@ -221,7 +219,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
if (!F.isEmpty(fut.invalidPartitions()))
retries.addAll(fut.invalidPartitions());
- add(new GridEmbeddedFuture<>(cctx.kernalContext(), fut,
+ add(new GridEmbeddedFuture<>(fut,
new IgniteBiClosure<Object, Exception, Collection<GridCacheEntryInfo<K, V>>>() {
@Override public Collection<GridCacheEntryInfo<K, V>> apply(Object o, Exception e) {
if (e != null) { // Check error first.
@@ -251,7 +249,8 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
// Finish this one.
return Collections.emptyList();
}
- })
+ },
+ false)
);
}
@@ -289,15 +288,15 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
@SuppressWarnings( {"unchecked", "IfMayBeConditional"})
private IgniteInternalFuture<Collection<GridCacheEntryInfo<K, V>>> getAsync(final LinkedHashMap<? extends K, Boolean> keys) {
if (F.isEmpty(keys))
- return new GridFinishedFuture<Collection<GridCacheEntryInfo<K, V>>>(cctx.kernalContext(),
+ return new GridFinishedFuture<Collection<GridCacheEntryInfo<K, V>>>(
Collections.<GridCacheEntryInfo<K, V>>emptyList());
final Collection<GridCacheEntryInfo<K, V>> infos = new LinkedList<>();
- String taskName0 = ctx.job().currentTaskName();
+ String taskName0 = cctx.kernalContext().job().currentTaskName();
if (taskName0 == null)
- taskName0 = ctx.task().resolveTaskName(taskNameHash);
+ taskName0 = cctx.kernalContext().task().resolveTaskName(taskNameHash);
final String taskName = taskName0;
@@ -414,11 +413,12 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
}
}
}
- },
- cctx.kernalContext());
+ }
+ );
}
- return new GridEmbeddedFuture<>(cctx.kernalContext(), fut,
+ return new GridEmbeddedFuture<>(
+ fut,
new C2<Map<K, V>, Exception, Collection<GridCacheEntryInfo<K, V>>>() {
@Override public Collection<GridCacheEntryInfo<K, V>> apply(Map<K, V> map, Exception e) {
if (e != null) {
@@ -441,7 +441,8 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
return infos;
}
}
- });
+ },
+ false);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 29f7363..e77916e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -102,7 +102,7 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
log = U.logger(cctx.kernalContext(), logRef, this);
- rent = new GridFutureAdapter<Object>(cctx.kernalContext()) {
+ rent = new GridFutureAdapter<Object>() {
@Override public String toString() {
return "PartitionRentFuture [part=" + GridDhtLocalPartition.this + ", map=" + map + ']';
}
@@ -437,7 +437,7 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
clearDeferredDeletes();
- return new GridFinishedFuture<>(cctx.kernalContext(), true);
+ return new GridFinishedFuture<>(true);
}
return cctx.closures().callLocalSafe(new GPC<Boolean>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index dba5ed2..ad5923c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -198,7 +198,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
entries = new ArrayList<>(cnt);
- log = U.logger(ctx, logRef, GridDhtLockFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridDhtLockFuture.class);
if (timeout > 0) {
timeoutObj = new LockTimeoutObject();
@@ -797,7 +797,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
int cnt = F.size(dhtMapping);
if (cnt > 0) {
- assert !n.id().equals(ctx.localNodeId());
+ assert !n.id().equals(cctx.localNodeId());
MiniFuture fut = new MiniFuture(n, dhtMapping);
@@ -991,7 +991,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
* @param dhtMapping Mapping.
*/
MiniFuture(ClusterNode node, List<GridDhtCacheEntry<K, V>> dhtMapping) {
- super(cctx.kernalContext());
+ super();
assert node != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 753f7e9..9057319 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -684,9 +684,9 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
}
if (keyFut == null)
- keyFut = new GridFinishedFutureEx<>();
+ keyFut = new GridFinishedFuture<>();
- return new GridEmbeddedFuture<>(true, keyFut,
+ return new GridEmbeddedFuture<>(keyFut,
new C2<Object, Exception, IgniteInternalFuture<GridNearLockResponse<K,V>>>() {
@Override public IgniteInternalFuture<GridNearLockResponse<K, V>> apply(Object o, Exception exx) {
if (exx != null)
@@ -877,11 +877,11 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
else {
sendLockReply(nearNode, t, req, resp);
- return new GridFinishedFutureEx<>(resp);
+ return new GridFinishedFuture<>(resp);
}
}
- },
- ctx.kernalContext());
+ }
+ );
}
else {
assert fut != null;
@@ -892,7 +892,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
final GridCacheVersion mappedVer = fut.version();
return new GridDhtEmbeddedFuture<>(
- ctx.kernalContext(),
fut,
new C2<Boolean, Exception, GridNearLockResponse<K, V>>() {
@Override public GridNearLockResponse<K, V> apply(Boolean b, Exception e) {
@@ -912,7 +911,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
return res;
}
- });
+ }, false);
}
}
catch (IgniteCheckedException e) {
@@ -933,8 +932,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
new IgniteCheckedException(err, e));
}
}
- },
- ctx.kernalContext());
+ }
+ );
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 7dac17b..41f235a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -26,11 +26,11 @@ import org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -103,7 +103,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
futId = IgniteUuid.randomUuid();
- log = U.logger(ctx, logRef, GridDhtTxFinishFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridDhtTxFinishFuture.class);
}
/** {@inheritDoc} */
@@ -441,7 +441,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
* @param nearMapping nearMapping.
*/
MiniFuture(GridDistributedTxMapping<K, V> dhtMapping, GridDistributedTxMapping<K, V> nearMapping) {
- super(cctx.kernalContext());
+ super();
assert dhtMapping == null || nearMapping == null || dhtMapping.node() == nearMapping.node();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 1c71f12..b98ca00 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -500,7 +500,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K
catch (GridDhtInvalidPartitionException ex) {
addInvalidPartition(cacheCtx, ex.partition());
- return new GridFinishedFuture<>(cctx.kernalContext(), true);
+ return new GridFinishedFuture<>(true);
}
}
@@ -526,13 +526,13 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K
checkValid();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
final GridCacheReturn<V> ret = new GridCacheReturn<>(false);
if (F.isEmpty(entries))
- return new GridFinishedFuture<>(cctx.kernalContext(), ret);
+ return new GridFinishedFuture<>(ret);
init();
@@ -606,7 +606,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K
catch (IgniteCheckedException e) {
setRollbackOnly();
- return new GridFinishedFuture<>(cctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
}
@@ -633,7 +633,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K
skipped + ']');
if (passedKeys.isEmpty())
- return new GridFinishedFuture<>(cctx.kernalContext(), ret);
+ return new GridFinishedFuture<>(ret);
GridDhtTransactionalCacheAdapter<K, V> dhtCache = cacheCtx.isNear() ? cacheCtx.nearTx().dht() : cacheCtx.dhtTx();
@@ -667,8 +667,8 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K
return ret;
}
- },
- cctx.kernalContext());
+ }
+ );
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index e3cdc6e..58338a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -128,13 +128,6 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
private IgniteInClosure<GridNearTxPrepareResponse<K, V>> completeCb;
/**
- * Empty constructor required for {@link Externalizable}.
- */
- public GridDhtTxPrepareFuture() {
- // No-op.
- }
-
- /**
* @param cctx Context.
* @param tx Transaction.
* @param nearMiniId Near mini future id.
@@ -173,7 +166,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
this.nearMiniId = nearMiniId;
- log = U.logger(ctx, logRef, GridDhtTxPrepareFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridDhtTxPrepareFuture.class);
dhtMap = tx.dhtMap();
nearMap = tx.nearMap();
@@ -1133,7 +1126,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
* Empty constructor required for {@link Externalizable}.
*/
public MiniFuture() {
- super(cctx.kernalContext());
+ super();
}
/**
@@ -1142,7 +1135,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
* @param nearMapping nearMapping.
*/
MiniFuture(UUID nodeId, GridDistributedTxMapping<K, V> dhtMapping, GridDistributedTxMapping<K, V> nearMapping) {
- super(cctx.kernalContext());
+ super();
assert dhtMapping == null || nearMapping == null || dhtMapping.node() == nearMapping.node();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 980389c..511b3c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -158,7 +158,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
ver = cctx.versions().next();
- log = U.logger(ctx, logRef, GridPartitionedGetFuture.class);
+ log = U.logger(cctx.kernalContext(), logRef, GridPartitionedGetFuture.class);
}
/**
@@ -306,7 +306,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
return;
if (!locVals.isEmpty())
- add(new GridFinishedFuture<>(cctx.kernalContext(), locVals));
+ add(new GridFinishedFuture<>(locVals));
if (hasRmtNodes) {
trackable = true;
@@ -347,7 +347,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
remapKeys.add(key);
}
- long updTopVer = ctx.discovery().topologyVersion();
+ long updTopVer = cctx.discovery().topologyVersion();
assert updTopVer > topVer : "Got invalid partitions for local node but topology version did " +
"not change [topVer=" + topVer + ", updTopVer=" + updTopVer +
@@ -604,7 +604,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
* @param topVer Topology version.
*/
MiniFuture(ClusterNode node, LinkedHashMap<K, Boolean> keys, long topVer) {
- super(cctx.kernalContext());
+ super();
this.node = node;
this.keys = keys;
@@ -651,7 +651,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
if (log.isDebugEnabled())
log.debug("Remote node left grid while sending or waiting for reply (will retry): " + this);
- long updTopVer = ctx.discovery().topologyVersion();
+ long updTopVer = cctx.discovery().topologyVersion();
assert updTopVer > topVer : "Got topology exception but topology version did " +
"not change [topVer=" + topVer + ", updTopVer=" + updTopVer +
@@ -697,7 +697,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
log.debug("Remapping mini get future [invalidParts=" + invalidParts + ", fut=" + this + ']');
// Need to wait for next topology version to remap.
- IgniteInternalFuture<Long> topFut = ctx.discovery().topologyFuture(rmtTopVer);
+ IgniteInternalFuture<Long> topFut = cctx.discovery().topologyFuture(rmtTopVer);
topFut.listenAsync(new CIX1<IgniteInternalFuture<Long>>() {
@SuppressWarnings("unchecked")
[44/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/9b2a034d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b2a034d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b2a034d
Branch: refs/heads/ignite-313
Commit: 9b2a034d5fd1a8c56701fbce99937b0b707927dc
Parents: ff5173d 9af2566
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Mar 4 18:20:10 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Mar 4 18:20:10 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsEx.java | 6 +
.../visor/node/VisorIgfsConfiguration.java | 7 +-
.../hadoop/IgfsHadoopFileSystemWrapper.java | 44 +-
.../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 48 +-
.../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 54 +-
.../hadoop/SecondaryFileSystemProvider.java | 111 ++++
...oopSecondaryFileSystemConfigurationTest.java | 541 +++++++++++++++++++
.../testsuites/IgniteHadoopTestSuite.java | 2 +
.../schema/generator/SnippetGenerator.java | 2 +-
.../schema/parser/DatabaseMetadataParser.java | 7 +-
10 files changed, 718 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
[10/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/3be22ab1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3be22ab1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3be22ab1
Branch: refs/heads/ignite-313
Commit: 3be22ab1f4d9e9096b5600cf8728b19800760ccc
Parents: ea6a1c0 0086e9c
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 16:00:38 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 16:00:38 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/visor/cache/VisorCache.java | 190 ++------
.../cache/VisorCacheAffinityConfiguration.java | 53 +-
.../visor/cache/VisorCacheConfiguration.java | 484 ++++---------------
.../cache/VisorCacheDefaultConfiguration.java | 27 +-
.../cache/VisorCacheEvictionConfiguration.java | 81 +---
.../cache/VisorCacheNearConfiguration.java | 42 +-
.../cache/VisorCachePreloadConfiguration.java | 54 +--
.../cache/VisorCacheStoreConfiguration.java | 148 +++++-
.../VisorCacheWriteBehindConfiguration.java | 137 ------
.../visor/node/VisorAtomicConfiguration.java | 27 +-
.../visor/node/VisorBasicConfiguration.java | 180 +------
.../node/VisorCacheQueryConfiguration.java | 45 +-
.../node/VisorExecutorServiceConfiguration.java | 54 +--
.../visor/node/VisorGridConfiguration.java | 177 +------
.../visor/node/VisorIgfsConfiguration.java | 244 ++--------
.../visor/node/VisorLifecycleConfiguration.java | 9 +-
.../visor/node/VisorMetricsConfiguration.java | 29 +-
.../node/VisorPeerToPeerConfiguration.java | 28 +-
.../visor/node/VisorQueryConfiguration.java | 65 +--
.../visor/node/VisorRestConfiguration.java | 80 +--
.../node/VisorSegmentationConfiguration.java | 45 +-
.../visor/node/VisorSpisConfiguration.java | 92 +---
.../node/VisorTransactionConfiguration.java | 62 +--
.../internal/visor/util/VisorTaskUtils.java | 4 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 63 ++-
.../IgniteCacheExpiryPolicyAbstractTest.java | 38 +-
.../ignite/schema/generator/XmlGenerator.java | 8 +-
.../apache/ignite/schema/model/PojoField.java | 11 +-
.../apache/ignite/schema/load/model/Ignite.xml | 133 +++--
.../commands/cache/VisorCacheCommand.scala | 25 +-
.../yardstick/config/ignite-store-config.xml | 15 +-
31 files changed, 606 insertions(+), 2044 deletions(-)
----------------------------------------------------------------------
[11/50] [abbrv] incubator-ignite git commit: sprint-2 fix for
ignite-321
Posted by yz...@apache.org.
sprint-2 fix for ignite-321
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11efb918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11efb918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11efb918
Branch: refs/heads/ignite-313
Commit: 11efb91874a547c408dcac58f0651725ad518abe
Parents: 3be22ab
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 16:36:02 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 16:36:02 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheStoreManager.java | 12 ++++----
.../GridDistributedCacheAdapter.java | 2 ++
.../dataload/IgniteDataLoaderImpl.java | 29 +++++++++++++++-----
3 files changed, 30 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11efb918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
index 9262a8f..c768f54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
@@ -616,6 +616,9 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
handleClassCastException(e);
}
catch (Exception e) {
+ if (!(e instanceof CacheWriterException))
+ e = new CacheWriterException(e);
+
if (!entries.isEmpty()) {
List<Object> keys = new ArrayList<>(entries.size());
@@ -625,9 +628,6 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
throw new CacheStorePartialUpdateException(keys, e);
}
- if (!(e instanceof CacheWriterException))
- e = new CacheWriterException(e);
-
throw new IgniteCheckedException(e);
}
finally {
@@ -725,12 +725,12 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
handleClassCastException(e);
}
catch (Exception e) {
- if (!keys0.isEmpty())
- throw new CacheStorePartialUpdateException(keys0, e);
-
if (!(e instanceof CacheWriterException))
e = new CacheWriterException(e);
+ if (!keys0.isEmpty())
+ throw new CacheStorePartialUpdateException(keys0, e);
+
throw new IgniteCheckedException(e);
}
finally {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11efb918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index dc82e83..00190d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -277,6 +277,8 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
dht = (GridDhtCacheAdapter<K, V>)cacheAdapter;
try (IgniteDataLoader<K, V> dataLdr = ignite.dataLoader(cacheName)) {
+ ((IgniteDataLoaderImpl)dataLdr).maxRemapCount(0);
+
dataLdr.updater(GridDataLoadCacheUpdaters.<K, V>batched());
for (GridDhtLocalPartition<K, V> locPart : dht.topology().currentLocalPartitions()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11efb918/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index ced8d1d..ed3bbcb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -66,7 +66,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
private byte[] updaterBytes;
/** Max remap count before issuing an error. */
- private static final int MAX_REMAP_CNT = 32;
+ private static final int DFLT_MAX_REMAP_CNT = 32;
/** Log reference. */
private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
@@ -156,6 +156,9 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
/** */
private boolean skipStore;
+ /** */
+ private int maxRemapCnt = DFLT_MAX_REMAP_CNT;
+
/**
* @param ctx Grid kernal context.
* @param cacheName Cache name.
@@ -434,12 +437,6 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
) {
assert entries != null;
- if (remaps >= MAX_REMAP_CNT) {
- resFut.onDone(new IgniteCheckedException("Failed to finish operation (too many remaps): " + remaps));
-
- return;
- }
-
Map<ClusterNode, Collection<Map.Entry<K, V>>> mappings = new HashMap<>();
boolean initPda = ctx.deploy().enabled() && jobPda == null;
@@ -526,6 +523,10 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
resFut.onDone(new IgniteCheckedException("Data loader has been cancelled: " +
IgniteDataLoaderImpl.this, e1));
}
+ else if (remaps + 1 > maxRemapCnt) {
+ resFut.onDone(new IgniteCheckedException("Failed to finish operation (too many remaps): "
+ + remaps), e1);
+ }
else
load0(entriesForNode, resFut, activeKeys, remaps + 1);
}
@@ -760,6 +761,20 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
close(false);
}
+ /**
+ * @return Max remap count.
+ */
+ public int maxRemapCount() {
+ return maxRemapCnt;
+ }
+
+ /**
+ * @param maxRemapCnt New max remap count.
+ */
+ public void maxRemapCount(int maxRemapCnt) {
+ this.maxRemapCnt = maxRemapCnt;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgniteDataLoaderImpl.class, this);
[09/50] [abbrv] incubator-ignite git commit: sprint-2 fix for
ignite-301
Posted by yz...@apache.org.
sprint-2 fix for ignite-301
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea6a1c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea6a1c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea6a1c03
Branch: refs/heads/ignite-313
Commit: ea6a1c03c66c1f78a9d9f00f73f9483c32569858
Parents: c9f46c1
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 16:00:21 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 16:00:21 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContext.java | 10 ++++-
.../ignite/internal/GridKernalContextImpl.java | 14 +++++-
.../apache/ignite/internal/IgniteKernal.java | 23 +++++-----
.../processors/cluster/ClusterProcessor.java | 46 ++++++++++++++++++++
4 files changed, 78 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 100ad28..cb9ffa1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -33,11 +33,12 @@ import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.processors.closure.*;
+import org.apache.ignite.internal.processors.cluster.*;
import org.apache.ignite.internal.processors.continuous.*;
import org.apache.ignite.internal.processors.dataload.*;
import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.job.*;
import org.apache.ignite.internal.processors.jobmetrics.*;
import org.apache.ignite.internal.processors.offheap.*;
@@ -508,4 +509,11 @@ public interface GridKernalContext extends Iterable<GridComponent> {
* @return Exception registry.
*/
public IgniteExceptionRegistry exceptionRegistry();
+
+ /**
+ * Gets Cluster processor.
+ *
+ * @return Cluster processor.
+ */
+ public ClusterProcessor cluster();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 395ad52..756c16a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -36,11 +36,12 @@ import org.apache.ignite.internal.processors.cache.dr.os.*;
import org.apache.ignite.internal.processors.cache.serialization.*;
import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.processors.closure.*;
+import org.apache.ignite.internal.processors.cluster.*;
import org.apache.ignite.internal.processors.continuous.*;
import org.apache.ignite.internal.processors.dataload.*;
import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.job.*;
import org.apache.ignite.internal.processors.jobmetrics.*;
import org.apache.ignite.internal.processors.offheap.*;
@@ -245,6 +246,10 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** */
@GridToStringExclude
+ private ClusterProcessor cluster;
+
+ /** */
+ @GridToStringExclude
private DataStructuresProcessor dataStructuresProc;
/** */
@@ -461,6 +466,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
qryProc = (GridQueryProcessor)comp;
else if (comp instanceof DataStructuresProcessor)
dataStructuresProc = (DataStructuresProcessor)comp;
+ else if (comp instanceof ClusterProcessor)
+ cluster = (ClusterProcessor)comp;
else
assert (comp instanceof GridPluginComponent) : "Unknown manager class: " + comp.getClass();
@@ -854,6 +861,11 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
}
/** {@inheritDoc} */
+ @Override public ClusterProcessor cluster() {
+ return cluster;
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridKernalContextImpl.class, this);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 9c92edd..f46d071 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.processors.closure.*;
+import org.apache.ignite.internal.processors.cluster.*;
import org.apache.ignite.internal.processors.continuous.*;
import org.apache.ignite.internal.processors.dataload.*;
import org.apache.ignite.internal.processors.datastructures.*;
@@ -182,10 +183,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@GridToStringExclude
private boolean errOnStop;
- /** Cluster. */
- @GridToStringExclude
- private IgniteClusterImpl cluster;
-
/** Scheduler. */
@GridToStringExclude
private IgniteScheduler scheduler;
@@ -229,37 +226,37 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** {@inheritDoc} */
@Override public IgniteClusterEx cluster() {
- return cluster;
+ return ctx.cluster().get();
}
/** {@inheritDoc} */
@Override public ClusterNode localNode() {
- return cluster.localNode();
+ return ctx.cluster().get().localNode();
}
/** {@inheritDoc} */
@Override public IgniteCompute compute() {
- return cluster.compute();
+ return ctx.cluster().get().compute();
}
/** {@inheritDoc} */
@Override public IgniteMessaging message() {
- return cluster.message();
+ return ctx.cluster().get().message();
}
/** {@inheritDoc} */
@Override public IgniteEvents events() {
- return cluster.events();
+ return ctx.cluster().get().events();
}
/** {@inheritDoc} */
@Override public IgniteServices services() {
- return cluster.services();
+ return ctx.cluster().get().services();
}
/** {@inheritDoc} */
@Override public ExecutorService executorService() {
- return cluster.executorService();
+ return ctx.cluster().get().executorService();
}
/** {@inheritDoc} */
@@ -678,7 +675,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
igfsExecSvc,
restExecSvc);
- cluster = new IgniteClusterImpl(ctx);
+ startProcessor(ctx, new ClusterProcessor(ctx), attrs);
U.onGridStart();
@@ -1793,7 +1790,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// No more kernal calls from this point on.
gw.setState(STOPPING);
- cluster.clearNodeMap();
+ ctx.cluster().get().clearNodeMap();
if (log.isDebugEnabled())
log.debug("Grid " + (gridName == null ? "" : '\'' + gridName + "' ") + "is stopping.");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
new file mode 100644
index 0000000..0ee00f1
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cluster;
+
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.cluster.*;
+import org.apache.ignite.internal.processors.*;
+
+/**
+ *
+ */
+public class ClusterProcessor extends GridProcessorAdapter {
+ /** */
+ private IgniteClusterImpl cluster;
+
+ /**
+ * @param ctx Kernal context.
+ */
+ public ClusterProcessor(GridKernalContext ctx) {
+ super(ctx);
+
+ cluster = new IgniteClusterImpl(ctx);
+ }
+
+ /**
+ * @return Cluster.
+ */
+ public IgniteClusterImpl get() {
+ return cluster;
+ }
+}
[40/50] [abbrv] incubator-ignite git commit: # sprint-2 Refactored to
use JUL logger.
Posted by yz...@apache.org.
# sprint-2 Refactored to use JUL logger.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/882ded50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/882ded50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/882ded50
Branch: refs/heads/ignite-313
Commit: 882ded509d7eac6e24fcc69206fab70c33aed60e
Parents: e7f7f57
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 21:45:05 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 21:45:05 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/schema/parser/DatabaseMetadataParser.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/882ded50/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
index a849bd2..696ca62 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
@@ -23,11 +23,15 @@ import org.apache.ignite.schema.parser.dialect.*;
import java.sql.*;
import java.util.*;
+import java.util.logging.*;
/**
* Database metadata parser.
*/
public class DatabaseMetadataParser {
+ /** Logger. */
+ private static final Logger log = Logger.getLogger(DatabaseMetadataParser.class.getName());
+
/**
* Parse database metadata.
*
@@ -50,8 +54,7 @@ public class DatabaseMetadataParser {
dialect = new JdbcMetadataDialect();
}
catch (SQLException e) {
- System.err.println("Failed to resolve dialect (JdbcMetaDataDialect will be used.");
- e.printStackTrace();
+ log.log(Level.SEVERE, "Failed to resolve dialect (JdbcMetaDataDialect will be used.", e);
dialect = new JdbcMetadataDialect();
}