You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/04/01 10:32:19 UTC
[01/50] incubator-ignite git commit: #ignite-629: Fix
GridCacheCommandHandlerSelfTest.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-639 002e395db -> 6011305b7
#ignite-629: Fix GridCacheCommandHandlerSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40d6b75a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40d6b75a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40d6b75a
Branch: refs/heads/ignite-639
Commit: 40d6b75a49937f63654b434c072a8bf5fd5ebd8a
Parents: 2c49bf7
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 30 15:20:27 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 30 15:20:27 2015 +0300
----------------------------------------------------------------------
.../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40d6b75a/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 c4c7ff6..2a6ae9d 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
@@ -218,7 +218,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
return fut;
}
// Rewriting flagOn result to keep intercepting invocations after it.
- else if ("flagsOn".equals(mtd.getName()))
+ else if ("setSkipStore".equals(mtd.getName()))
return proxy;
else if ("forSubjectId".equals(mtd.getName()))
return proxy;
[31/50] incubator-ignite git commit: Merge branch 'ignite-443' into
ignite-sprint-3
Posted by ak...@apache.org.
Merge branch 'ignite-443' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b362fd2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b362fd2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b362fd2a
Branch: refs/heads/ignite-639
Commit: b362fd2a036ec21b1e73b68b0750f1c9022dde6b
Parents: c2f5211 bf41e9e
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 13:38:12 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 13:38:12 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../cache/CacheConflictResolutionManager.java | 30 +++++
.../cache/CacheOsConflictResolutionManager.java | 58 ++++++++++
.../processors/cache/GridCacheContext.java | 19 ++--
.../processors/cache/GridCacheProcessor.java | 9 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 ++++++++++++++++++
.../cache/dr/os/GridOsCacheDrManager.java | 111 -------------------
.../version/CacheVersionConflictResolver.java | 40 +++++++
...ridCacheVersionAbstractConflictResolver.java | 56 ----------
.../GridCacheVersionConflictResolver.java | 59 ----------
.../loadtests/hashmap/GridCacheTestContext.java | 6 +-
12 files changed, 257 insertions(+), 245 deletions(-)
----------------------------------------------------------------------
[35/50] incubator-ignite git commit: # ignite-sprint-3 fixed issue
number
Posted by ak...@apache.org.
# ignite-sprint-3 fixed issue number
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c302175e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c302175e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c302175e
Branch: refs/heads/ignite-639
Commit: c302175e49452c67ff5800f67896e7c20dba6db5
Parents: e182c34
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 15:37:47 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 15:37:47 2015 +0300
----------------------------------------------------------------------
.../ignite/testsuites/IgniteCacheFailoverTestSuite.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c302175e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
index 17f2458..9556235 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*;
*/
public class IgniteCacheFailoverTestSuite extends TestSuite {
/**
- * @return Ignite Cache Group Lock Failover test suite.
+ * @return Ignite Cache Failover test suite.
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
@@ -52,9 +52,9 @@ public class IgniteCacheFailoverTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.class);
suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfTest.class);
- //suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class); TODO-gg-4813
- //suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class); TODO-gg-4813
- //suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class); TODO-gg-4813
+ //suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class); TODO IGNITE-631.
+ //suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class); TODO IGNITE-631.
+ //suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class); TODO IGNITE-631.
return suite;
}
[43/50] incubator-ignite git commit: IGNITE-651 - Persistance for
marshaller cache
Posted by ak...@apache.org.
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00c934cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00c934cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00c934cc
Branch: refs/heads/ignite-639
Commit: 00c934cc3921d05f92e1c0f7400ae9253b779b01
Parents: ea7d248
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 31 14:52:31 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 31 14:52:31 2015 -0700
----------------------------------------------------------------------
.../ignite/internal/MarshallerContextImpl.java | 31 ++++++++++++++++----
1 file changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c934cc/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 4a27222..d5a0526 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import javax.cache.event.*;
import java.io.*;
+import java.nio.channels.*;
import java.util.concurrent.*;
/**
@@ -124,8 +125,18 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
if (clsName == null) {
File file = new File(workDir, id + ".classname");
- try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
- clsName = reader.readLine();
+ try (
+ FileInputStream in = new FileInputStream(file);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in))
+ ) {
+ FileLock lock = in.getChannel().lock(0, Long.MAX_VALUE, true);
+
+ try {
+ clsName = reader.readLine();
+ }
+ finally {
+ lock.release();
+ }
}
catch (IOException e) {
throw new IgniteCheckedException("Failed to read class name from file [id=" + id +
@@ -162,10 +173,20 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
File file = new File(workDir, evt.getKey() + ".classname");
- try (Writer writer = new FileWriter(file)) {
- writer.write(evt.getValue());
+ try (
+ FileOutputStream out = new FileOutputStream(file);
+ Writer writer = new OutputStreamWriter(out)
+ ) {
+ FileLock lock = out.getChannel().lock();
+
+ try {
+ writer.write(evt.getValue());
- writer.flush();
+ writer.flush();
+ }
+ finally {
+ lock.release();
+ }
}
catch (IOException e) {
U.error(log, "Failed to write class name to file [id=" + evt.getKey() +
[32/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07683c91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07683c91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07683c91
Branch: refs/heads/ignite-639
Commit: 07683c9120d2eda5758a9e5e88b05d46587ac2c2
Parents: b362fd2 dfe90fb
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 13:39:00 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 13:39:00 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../processors/cache/CacheProjection.java | 24 --
.../processors/cache/GridCacheAdapter.java | 60 ----
.../processors/cache/GridCacheProcessor.java | 11 -
.../processors/cache/GridCacheProjectionEx.java | 9 -
.../cache/GridCacheProjectionImpl.java | 280 +++----------------
.../processors/cache/GridCacheProxyImpl.java | 19 --
.../processors/cache/IgniteCacheProxy.java | 2 -
.../CacheDataStructuresManager.java | 4 +-
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../GridProjectionForCachesSelfTest.java | 12 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridServiceReassignmentSelfTest.java | 5 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
parent/pom.xml | 38 +--
17 files changed, 76 insertions(+), 432 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07683c91/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
[30/50] incubator-ignite git commit: #IGNITE-443 Fixed code style.
Posted by ak...@apache.org.
#IGNITE-443 Fixed code style.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf41e9e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf41e9e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf41e9e7
Branch: refs/heads/ignite-639
Commit: bf41e9e77c65faf5362746f8120d34948869e72d
Parents: 4cf4de6
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 13:37:01 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 13:37:01 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheOsConflictResolutionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf41e9e7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
index 2835753..29e50b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.version.*;
/**
[15/50] incubator-ignite git commit: #IGNITE-443 Extracted interface
CacheVersionConflictResolver.
Posted by ak...@apache.org.
#IGNITE-443 Extracted interface CacheVersionConflictResolver.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67b7ffd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67b7ffd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67b7ffd9
Branch: refs/heads/ignite-639
Commit: 67b7ffd93540b4578ef28e6b2d7608dea09fad5c
Parents: f881307
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 11:31:50 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 11:31:50 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContextImpl.java | 5 +-
.../processors/cache/CacheConflictManager.java | 30 ------
.../cache/CacheConflictResolverManager.java | 30 ++++++
.../cache/CacheOsConflictManager.java | 33 ------
.../cache/CacheOsConflictResolverManager.java | 58 ++++++++++
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../cache/dr/GridOsCacheDrManager.java | 106 +++++++++++++++++++
.../cache/dr/os/GridOsCacheDrManager.java | 106 -------------------
.../version/CacheVersionConflictResolver.java | 56 +---------
.../CacheVersionConflictResolverImpl.java | 82 ++++++++++++++
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
12 files changed, 288 insertions(+), 228 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/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 7472413..ee82950 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
@@ -32,7 +32,6 @@ import org.apache.ignite.internal.managers.swapspace.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.dr.os.*;
import org.apache.ignite.internal.processors.cacheobject.*;
import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.processors.closure.*;
@@ -791,8 +790,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
return (T)new GridOsCacheDrManager();
else if (cls.equals(IgniteCacheObjectProcessor.class))
return (T)new IgniteCacheObjectProcessorImpl(this);
- else if (cls.equals(CacheConflictManager.class))
- return (T)new CacheOsConflictManager<>();
+ else if (cls.equals(CacheConflictResolverManager.class))
+ return (T)new CacheOsConflictResolverManager<>();
throw new IgniteException("Unsupported component type: " + cls);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.java
deleted file mode 100644
index 5f4e35d..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.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.processors.cache;
-
-import org.apache.ignite.internal.processors.cache.version.*;
-
-/**
- * Conflict resolver manager.
- */
-public interface CacheConflictManager<K, V> extends GridCacheManager<K, V> {
- /**
- * @return Cache conflict resolver.
- */
- public CacheVersionConflictResolver conflictResolver();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
new file mode 100644
index 0000000..73b98eb
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
@@ -0,0 +1,30 @@
+/*
+ * 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.internal.processors.cache.version.*;
+
+/**
+ * Conflict resolver manager.
+ */
+public interface CacheConflictResolverManager<K, V> extends GridCacheManager<K, V> {
+ /**
+ * @return Cache conflict resolver.
+ */
+ public CacheVersionConflictResolver conflictResolver();
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictManager.java
deleted file mode 100644
index b63580e..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictManager.java
+++ /dev/null
@@ -1,33 +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.processors.cache;
-
-import org.apache.ignite.internal.processors.cache.version.*;
-
-/**
- * OS conflict resolver manager.
- */
-public class CacheOsConflictManager<K ,V> extends GridCacheManagerAdapter<K ,V>
- implements CacheConflictManager<K, V> {
- /**
- * @return Cache conflict resolver.
- */
- @Override public CacheVersionConflictResolver conflictResolver() {
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
new file mode 100644
index 0000000..2f6aacd
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
@@ -0,0 +1,58 @@
+/*
+ * 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.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.version.*;
+
+/**
+ * OS conflict resolver manager.
+ */
+public class CacheOsConflictResolverManager<K ,V> implements CacheConflictResolverManager<K, V> {
+ /**
+ * @return Cache conflict resolver.
+ */
+ @Override public CacheVersionConflictResolver conflictResolver() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start(GridCacheContext<K, V> cctx) throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void stop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStart() throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void printMemoryStats() {
+ // No-op.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/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 9dfb356..d56214e 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
@@ -136,7 +136,7 @@ public class GridCacheContext<K, V> implements Externalizable {
private CacheJtaManagerAdapter jtaMgr;
/** Conflict resolver manager. */
- private CacheConflictManager rslvrMgr;
+ private CacheConflictResolverManager rslvrMgr;
/** Managers. */
private List<GridCacheManager<K, V>> mgrs = new LinkedList<>();
@@ -247,7 +247,7 @@ public class GridCacheContext<K, V> implements Externalizable {
GridCacheTtlManager ttlMgr,
GridCacheDrManager drMgr,
CacheJtaManagerAdapter jtaMgr,
- CacheConflictManager<K, V> rslvrMgr) {
+ CacheConflictResolverManager<K, V> rslvrMgr) {
assert ctx != null;
assert sharedCtx != null;
assert cacheCfg != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/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 cadeb3c..41ff94e 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
@@ -1014,7 +1014,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager();
GridCacheTtlManager ttlMgr = new GridCacheTtlManager();
GridCacheDrManager drMgr = ctx.createComponent(GridCacheDrManager.class);
- CacheConflictManager rslvrMgr = ctx.createComponent(CacheConflictManager.class);
+ CacheConflictResolverManager rslvrMgr = ctx.createComponent(CacheConflictResolverManager.class);
GridCacheStoreManager storeMgr = new GridCacheStoreManager(ctx, sesHolders, cfgStore, cfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
new file mode 100644
index 0000000..00ed020
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
@@ -0,0 +1,106 @@
+/*
+ * 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.dr;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.processors.affinity.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.dr.*;
+import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.dr.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * No-op implementation for {@link GridCacheDrManager}.
+ */
+public class GridOsCacheDrManager implements GridCacheDrManager {
+ /** {@inheritDoc} */
+ @Override public boolean enabled() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start(GridCacheContext cctx) throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void stop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStart() throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void printMemoryStats() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte dataCenterId() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void replicate(KeyCacheObject key,
+ @Nullable CacheObject val,
+ long ttl,
+ long expireTime,
+ GridCacheVersion ver,
+ GridDrType drType) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void beforeExchange(AffinityTopologyVersion topVer, boolean left) throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void partitionEvicted(int part) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onReceiveCacheEntriesReceived(int entriesCnt) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onReceiveCacheConflictResolved(boolean useNew, boolean useOld, boolean merge) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void resetMetrics() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean receiveEnabled() {
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
deleted file mode 100644
index 1bfb6fc..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
+++ /dev/null
@@ -1,106 +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.processors.cache.dr.os;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.jetbrains.annotations.*;
-
-/**
- * No-op implementation for {@link GridCacheDrManager}.
- */
-public class GridOsCacheDrManager implements GridCacheDrManager {
- /** {@inheritDoc} */
- @Override public boolean enabled() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public void start(GridCacheContext cctx) throws IgniteCheckedException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void stop(boolean cancel) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStop(boolean cancel) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void printMemoryStats() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public byte dataCenterId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public void replicate(KeyCacheObject key,
- @Nullable CacheObject val,
- long ttl,
- long expireTime,
- GridCacheVersion ver,
- GridDrType drType) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void beforeExchange(AffinityTopologyVersion topVer, boolean left) throws IgniteCheckedException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void partitionEvicted(int part) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onReceiveCacheEntriesReceived(int entriesCnt) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onReceiveCacheConflictResolved(boolean useNew, boolean useOld, boolean merge) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void resetMetrics() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public boolean receiveEnabled() {
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
index a18eedd..f570634 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
@@ -18,12 +18,11 @@
package org.apache.ignite.internal.processors.cache.version;
import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
/**
* Cache version conflict resolver.
*/
-public class CacheVersionConflictResolver {
+public interface CacheVersionConflictResolver {
/**
* Resolve the conflict.
*
@@ -33,53 +32,8 @@ public class CacheVersionConflictResolver {
* @return Conflict resolution context.
* @throws IgniteCheckedException If failed.
*/
- public <K, V> GridCacheVersionConflictContext<K, V> resolve(GridCacheVersionedEntryEx<K, V> oldEntry,
- GridCacheVersionedEntryEx<K, V> newEntry, boolean atomicVerComparator) throws IgniteCheckedException {
- GridCacheVersionConflictContext<K, V> ctx = new GridCacheVersionConflictContext<>(oldEntry, newEntry);
-
- resolve0(ctx, oldEntry, newEntry, atomicVerComparator);
-
- return ctx;
- }
-
- /**
- * Internal conflict resolution routine.
- *
- * @param ctx Context.
- * @param oldEntry Old entry.
- * @param newEntry New entry.
- * @param atomicVerComparator Whether to use atomic version comparator.
- * @throws IgniteCheckedException If failed.
- */
- protected <K, V> void resolve0(GridCacheVersionConflictContext<K, V> ctx,
- GridCacheVersionedEntryEx<K, V> oldEntry, GridCacheVersionedEntryEx<K, V> newEntry,
- boolean atomicVerComparator) throws IgniteCheckedException {
- if (newEntry.dataCenterId() != oldEntry.dataCenterId())
- ctx.useNew();
- else {
- if (oldEntry.isStartVersion())
- ctx.useNew();
- else {
- if (atomicVerComparator) {
- // Handle special case when version check using ATOMIC cache comparator is required.
- if (GridCacheMapEntry.ATOMIC_VER_COMPARATOR.compare(oldEntry.version(), newEntry.version(), false) >= 0)
- ctx.useOld();
- else
- ctx.useNew();
- }
- else {
- long topVerDiff = newEntry.topologyVersion() - oldEntry.topologyVersion();
-
- if (topVerDiff > 0)
- ctx.useNew();
- else if (topVerDiff < 0)
- ctx.useOld();
- else if (newEntry.order() > oldEntry.order())
- ctx.useNew();
- else
- ctx.useOld();
- }
- }
- }
- }
+ public <K, V> GridCacheVersionConflictContext<K, V> resolve(
+ GridCacheVersionedEntryEx<K, V> oldEntry,
+ GridCacheVersionedEntryEx<K, V> newEntry,
+ boolean atomicVerComparator) throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
new file mode 100644
index 0000000..175a451
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
@@ -0,0 +1,82 @@
+/*
+ * 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.version;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.processors.cache.*;
+
+/**
+ * Cache version conflict resolver.
+ */
+public class CacheVersionConflictResolverImpl implements CacheVersionConflictResolver {
+ /** {@inheritDoc} */
+ @Override public <K, V> GridCacheVersionConflictContext<K, V> resolve(
+ GridCacheVersionedEntryEx<K, V> oldEntry,
+ GridCacheVersionedEntryEx<K, V> newEntry,
+ boolean atomicVerComparator) throws IgniteCheckedException {
+ GridCacheVersionConflictContext<K, V> ctx = new GridCacheVersionConflictContext<>(oldEntry, newEntry);
+
+ resolve0(ctx, oldEntry, newEntry, atomicVerComparator);
+
+ return ctx;
+ }
+
+ /**
+ * Internal conflict resolution routine.
+ *
+ * @param ctx Context.
+ * @param oldEntry Old entry.
+ * @param newEntry New entry.
+ * @param atomicVerComparator Whether to use atomic version comparator.
+ * @throws IgniteCheckedException If failed.
+ */
+ protected <K, V> void resolve0(
+ GridCacheVersionConflictContext<K, V> ctx,
+ GridCacheVersionedEntryEx<K, V> oldEntry,
+ GridCacheVersionedEntryEx<K, V> newEntry,
+ boolean atomicVerComparator) throws IgniteCheckedException {
+ if (newEntry.dataCenterId() != oldEntry.dataCenterId())
+ ctx.useNew();
+ else {
+ if (oldEntry.isStartVersion())
+ ctx.useNew();
+ else {
+ if (atomicVerComparator) {
+ // Handle special case when version check using ATOMIC cache comparator is required.
+ if (GridCacheMapEntry.ATOMIC_VER_COMPARATOR.compare(oldEntry.version(),
+ newEntry.version(), false) >= 0)
+ ctx.useOld();
+ else
+ ctx.useNew();
+ }
+ else {
+ long topVerDiff = newEntry.topologyVersion() - oldEntry.topologyVersion();
+
+ if (topVerDiff > 0)
+ ctx.useNew();
+ else if (topVerDiff < 0)
+ ctx.useOld();
+ else if (newEntry.order() > oldEntry.order())
+ ctx.useNew();
+ else
+ ctx.useOld();
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67b7ffd9/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index b96707d..b34e6e6 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
-import org.apache.ignite.internal.processors.cache.dr.os.*;
+import org.apache.ignite.internal.processors.cache.dr.GridOsCacheDrManager;
import org.apache.ignite.internal.processors.cache.jta.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.processors.cache.query.continuous.*;
@@ -70,6 +70,6 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> {
new GridCacheTtlManager(),
new GridOsCacheDrManager(),
new CacheNoopJtaManager(),
- new CacheOsConflictManager<K, V>());
+ new CacheOsConflictResolverManager<K, V>());
}
}
[23/50] incubator-ignite git commit: ignite-629: Add test for skip
store and remove iterator.
Posted by ak...@apache.org.
ignite-629: Add test for skip store and remove iterator.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50998c50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50998c50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50998c50
Branch: refs/heads/ignite-639
Commit: 50998c504573834e243df8b00681dcc8aa22dcf6
Parents: 885643a
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Mar 31 12:30:44 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Mar 31 12:30:44 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 28 ++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50998c50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index f543be0..1a8bdcd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4291,6 +4291,34 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
assertNotNull(cache.get(key));
}
+
+ String newKey = "New key";
+
+ assertFalse(map.containsKey(newKey));
+
+ cacheSkipStore.put(newKey, 1);
+
+ assertFalse(map.containsKey(newKey));
+
+ cache.put(newKey, 1);
+
+ assertTrue(map.containsKey(newKey));
+
+ Iterator<Cache.Entry<String, Integer>> it = cacheSkipStore.iterator();
+
+ assertTrue(it.hasNext());
+
+ Cache.Entry<String, Integer> entry = it.next();
+
+ String removedKey = entry.getKey();
+
+ assertTrue(map.containsKey(removedKey));
+
+ it.remove();
+
+ assertNull(cacheSkipStore.get(removedKey));
+
+ assertTrue(map.containsKey(removedKey));
}
/**
[36/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-654
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-654
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41963b70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41963b70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41963b70
Branch: refs/heads/ignite-639
Commit: 41963b70f02edb63080cc9b0e8f40e693fbfee59
Parents: 3821f00 c302175
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 15:48:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 15:48:10 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 6 +
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../cache/CacheConflictResolutionManager.java | 30 ++
.../cache/CacheOsConflictResolutionManager.java | 58 ++++
.../processors/cache/CacheProjection.java | 24 --
.../processors/cache/GridCacheAdapter.java | 60 ----
.../processors/cache/GridCacheContext.java | 19 +-
.../processors/cache/GridCacheProcessor.java | 20 +-
.../processors/cache/GridCacheProjectionEx.java | 9 -
.../cache/GridCacheProjectionImpl.java | 280 +++----------------
.../processors/cache/GridCacheProxyImpl.java | 19 --
.../processors/cache/IgniteCacheProxy.java | 2 -
.../CacheDataStructuresManager.java | 4 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 +++++++
.../cache/dr/os/GridOsCacheDrManager.java | 111 --------
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../transactions/IgniteTxLocalAdapter.java | 13 +-
.../version/CacheVersionConflictResolver.java | 40 +++
...ridCacheVersionAbstractConflictResolver.java | 56 ----
.../GridCacheVersionConflictResolver.java | 59 ----
.../GridProjectionForCachesSelfTest.java | 12 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridServiceReassignmentSelfTest.java | 5 +-
.../loadtests/hashmap/GridCacheTestContext.java | 6 +-
.../IgniteCacheFailoverTestSuite.java | 8 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
parent/pom.xml | 38 +--
31 files changed, 351 insertions(+), 686 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
[16/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-443' into ignite-443
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-443' into ignite-443
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/82b34192
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82b34192
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82b34192
Branch: refs/heads/ignite-639
Commit: 82b34192acf6bea99cb49cf5dab40009bfd5be88
Parents: 67b7ffd aa99733
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 11:32:56 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 11:32:56 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/GridCacheContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82b34192/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
[34/50] incubator-ignite git commit: # ignite-sprint-3 avoid
StringIndexOutOfBoundsException (ignite-657)
Posted by ak...@apache.org.
# ignite-sprint-3 avoid StringIndexOutOfBoundsException (ignite-657)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e182c34b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e182c34b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e182c34b
Branch: refs/heads/ignite-639
Commit: e182c34bde3321f7fb8e9af471bc0dfa2a938f65
Parents: 07683c9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 15:34:05 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 15:34:05 2015 +0300
----------------------------------------------------------------------
.../cache/transactions/IgniteTxLocalAdapter.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e182c34b/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 ca85838..e552619 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
@@ -3067,17 +3067,20 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
if (!cctx.txCompatible(this, activeCacheIds, cacheCtx)) {
StringBuilder cacheNames = new StringBuilder();
+ int idx = 0;
+
for (Integer activeCacheId : activeCacheIds) {
cacheNames.append(cctx.cacheContext(activeCacheId).name());
- cacheNames.append(", ");
+ if (idx++ < activeCacheIds.size() - 1)
+ cacheNames.append(", ");
}
- cacheNames.setLength(cacheNames.length() - 2);
-
throw new IgniteCheckedException("Failed to enlist new cache to existing transaction " +
- "(cache configurations are not compatible) [activeCaches=[" + cacheNames +
- "], cacheName=" + cacheCtx.name() + ", txSystem=" + system() +
+ "(cache configurations are not compatible) [" +
+ "activeCaches=[" + cacheNames + "]" +
+ ", cacheName=" + cacheCtx.name() +
+ ", txSystem=" + system() +
", cacheSystem=" + cacheCtx.system() + ']');
}
else
[25/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-611' into ignite-sprint-3
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-611' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfe90fbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfe90fbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfe90fbd
Branch: refs/heads/ignite-639
Commit: dfe90fbd3b750d6af2049fe60e227a03ced43b9b
Parents: 6ef11d4 dc0da5d
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Mar 31 12:47:13 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Mar 31 12:47:13 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../processors/cache/CacheProjection.java | 24 --
.../processors/cache/GridCacheAdapter.java | 60 ----
.../processors/cache/GridCacheProcessor.java | 11 -
.../processors/cache/GridCacheProjectionEx.java | 9 -
.../cache/GridCacheProjectionImpl.java | 280 +++----------------
.../processors/cache/GridCacheProxyImpl.java | 19 --
.../processors/cache/IgniteCacheProxy.java | 2 -
.../CacheDataStructuresManager.java | 4 +-
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../GridProjectionForCachesSelfTest.java | 12 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridServiceReassignmentSelfTest.java | 5 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
16 files changed, 57 insertions(+), 413 deletions(-)
----------------------------------------------------------------------
[22/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-test-compile' into ignite-sprint-3
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-test-compile' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ef11d49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ef11d49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ef11d49
Branch: refs/heads/ignite-639
Commit: 6ef11d4973df0c5961fa23c6f98dc90d5cf6cdd1
Parents: c2f5211 211a740
Author: anovikov <an...@gridgain.com>
Authored: Tue Mar 31 16:23:14 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Tue Mar 31 16:23:14 2015 +0700
----------------------------------------------------------------------
parent/pom.xml | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[48/50] incubator-ignite git commit: # IGNITE-562 Minor fix for
comments.
Posted by ak...@apache.org.
# IGNITE-562 Minor fix for comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0dfb5c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0dfb5c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0dfb5c03
Branch: refs/heads/ignite-639
Commit: 0dfb5c03bb785a8fdbbdb70d8260ea7922e2accc
Parents: 528d46b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 1 10:22:44 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 1 10:22:44 2015 +0700
----------------------------------------------------------------------
.../ignite/visor/commands/disco/VisorDiscoveryCommand.scala | 8 ++++----
.../ignite/visor/commands/tasks/VisorTasksCommand.scala | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dfb5c03/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
index 11689f5..3b6ca7e 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
@@ -41,16 +41,16 @@ import scala.language.{implicitConversions, reflectiveCalls}
* {{{
* +---------------------------------------------------------------------------------------+
* | disco | Prints topology change log as seen from the oldest node. |
- * | | Timeframe for querying events can be specified in arguments. |
+ * | | Timeframe for querying events can be specified in arguments. |
* | | |
- * | | Note that this command depends on Ignite events. |
+ * | | Note that this command depends on Ignite events. |
* | | |
- * | | Ignite events can be individually enabled and disabled and disabled events |
+ * | | Ignite events can be individually enabled and disabled and disabled events |
* | | can affect the results produced by this command. Note also that configuration |
* | | of Event Storage SPI that is responsible for temporary storage of generated |
* | | events on each node can also affect the functionality of this command. |
* | | |
- * | | By default - all events are DISABLED and Ignite stores last 10,000 local |
+ * | | By default - all events are DISABLED and Ignite stores last 10,000 local |
* | | events on each node. Both of these defaults can be changed in configuration. |
* +---------------------------------------------------------------------------------------+
* }}}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dfb5c03/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
index 9d9dde0..5feae8c 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
@@ -242,14 +242,14 @@ private case class VisorTask(
* +---------------------------------------------------------------------------------------+
* | tasks | Prints statistics about tasks and executions. |
* | | |
- * | | Note that this command depends on Ignite events. |
+ * | | Note that this command depends on Ignite events. |
* | | |
- * | | Ignite events can be individually enabled and disabled and disabled events |
+ * | | Ignite events can be individually enabled and disabled and disabled events |
* | | can affect the results produced by this command. Note also that configuration |
* | | of Event Storage SPI that is responsible for temporary storage of generated |
* | | events on each node can also affect the functionality of this command. |
* | | |
- * | | By default - all events are enabled and Ignite stores last 10,000 local |
+ * | | By default - all events are enabled and Ignite stores last 10,000 local |
* | | events on each node. Both of these defaults can be changed in configuration. |
* +---------------------------------------------------------------------------------------+
* }}}
[24/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-629-1
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b6700f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b6700f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b6700f1
Branch: refs/heads/ignite-639
Commit: 5b6700f1dc2583d7910444c38628768920530b51
Parents: 50998c5 6ef11d4
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 12:34:54 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 12:34:54 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[42/50] incubator-ignite git commit: # IGNITE-644 - Review
Posted by ak...@apache.org.
# IGNITE-644 - 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/ad140b90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad140b90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad140b90
Branch: refs/heads/ignite-639
Commit: ad140b906526cb95f6db14daf9f1c025e2e45c9d
Parents: f1f873b
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 31 14:18:50 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 31 14:18:50 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 34 +++++++++++---------
1 file changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad140b90/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 7442d12..5b52919 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
@@ -1751,7 +1751,7 @@ public class IgnitionEx {
}
// Always add marshaller and utility caches.
- copies[0] = marshallerSystemCache();
+ copies[0] = marshallerSystemCache(clientDisco);
copies[1] = utilitySystemCache(clientDisco);
cfg.setCacheConfiguration(copies);
@@ -1899,20 +1899,24 @@ public class IgnitionEx {
*
* @return Marshaller system cache configuration.
*/
- private static CacheConfiguration marshallerSystemCache() {
- CacheConfiguration cache = new CacheConfiguration();
-
- cache.setName(CU.MARSH_CACHE_NAME);
- cache.setCacheMode(REPLICATED);
- cache.setAtomicityMode(ATOMIC);
- cache.setSwapEnabled(false);
- cache.setRebalanceMode(SYNC);
- cache.setWriteSynchronizationMode(FULL_SYNC);
- cache.setAffinity(new RendezvousAffinityFunction(false, 20));
- cache.setNodeFilter(CacheConfiguration.ALL_NODES);
- cache.setStartSize(300);
-
- return cache;
+ private static CacheConfiguration marshallerSystemCache(boolean client) {
+ if (!client) {
+ CacheConfiguration cache = new CacheConfiguration();
+
+ cache.setName(CU.MARSH_CACHE_NAME);
+ cache.setCacheMode(REPLICATED);
+ cache.setAtomicityMode(ATOMIC);
+ cache.setSwapEnabled(false);
+ cache.setRebalanceMode(SYNC);
+ cache.setWriteSynchronizationMode(FULL_SYNC);
+ cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+ cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+ cache.setStartSize(300);
+
+ return cache;
+ }
+
+ return null;
}
/**
[46/50] incubator-ignite git commit: Merge branch 'ignite-644' into
ignite-sprint-3
Posted by ak...@apache.org.
Merge branch 'ignite-644' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17a9744d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17a9744d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17a9744d
Branch: refs/heads/ignite-639
Commit: 17a9744d2b7cc23a7e27cb20b45038ed114c589e
Parents: ca472ac ad140b9
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 31 18:51:46 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 31 18:51:46 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 4 ++--
.../processors/cache/distributed/near/GridNearAtomicCache.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a9744d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
[14/50] incubator-ignite git commit: Merge branch 'sprint-3' into
ignite-443
Posted by ak...@apache.org.
Merge branch 'sprint-3' into ignite-443
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8813070
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8813070
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8813070
Branch: refs/heads/ignite-639
Commit: f8813070c13bff26824c52b0d25a3256b29cbae3
Parents: b4285d2 8e590f9
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 11:16:46 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 11:16:46 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 15 +-
RELEASE_NOTES.txt | 20 +-
.../rest/AbstractRestProcessorSelfTest.java | 9 -
.../java/org/apache/ignite/IgniteCache.java | 4 +-
.../swapspace/GridSwapSpaceManager.java | 6 +-
.../processors/cache/CacheProjection.java | 6 +-
.../processors/cache/GridCacheAdapter.java | 12 +-
.../processors/cache/GridCacheMapEntry.java | 24 +-
.../processors/cache/GridCacheProcessor.java | 25 +-
.../cache/GridCacheProjectionImpl.java | 6 +-
.../processors/cache/GridCacheProxyImpl.java | 6 +-
.../processors/cache/GridCacheUtils.java | 5 +-
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../distributed/dht/GridDhtLocalPartition.java | 101 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../distributed/near/GridNearCacheAdapter.java | 7 -
.../near/GridNearTxPrepareFuture.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 4 +-
.../processors/query/GridQueryIndexing.java | 3 +-
.../processors/query/GridQueryProcessor.java | 22 +-
.../ignite/internal/util/lang/GridFunc.java | 14 +
.../spi/swapspace/SwapSpaceSpiListener.java | 3 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 45 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +-
.../GridCacheAbstractFailoverSelfTest.java | 134 +---
.../GridCacheAbstractFailoverTxSelfTest.java | 110 +++
.../cache/GridCacheAbstractFullApiSelfTest.java | 95 +--
.../cache/GridCacheAbstractMetricsSelfTest.java | 4 +
.../cache/GridCacheAbstractSelfTest.java | 109 +--
.../cache/GridCacheClearLocallySelfTest.java | 81 ++-
.../GridCacheConcurrentTxMultiNodeTest.java | 28 -
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheExAbstractFullApiSelfTest.java | 10 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 2 +
.../cache/GridCacheLuceneQueryIndexTest.java | 20 +-
.../cache/GridCacheMemoryModeSelfTest.java | 28 +-
.../cache/GridCacheOffHeapSelfTest.java | 662 -------------------
.../processors/cache/GridCacheOffHeapTest.java | 4 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 8 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 19 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 16 +-
...idCacheValueConsistencyAbstractSelfTest.java | 59 +-
.../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 4 +-
.../cache/IgnitePutAllLargeBatchSelfTest.java | 16 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 5 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 20 +-
.../GridCacheClientModesAbstractSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 279 ++++----
.../GridCacheNodeFailureAbstractTest.java | 8 -
...GridCachePreloadRestartAbstractSelfTest.java | 9 -
.../IgniteCacheSystemTransactionsSelfTest.java | 2 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 4 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 4 +-
.../IgniteTxTimeoutAbstractTest.java | 8 -
...heAbstractTransformWriteThroughSelfTest.java | 2 +-
.../dht/GridCacheColocatedFailoverSelfTest.java | 2 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 8 -
.../distributed/dht/GridCacheDhtTestUtils.java | 10 -
...itionedTxOriginatingNodeFailureSelfTest.java | 17 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 52 ++
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +
...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
.../near/GridCacheNearMetricsSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 2 +-
.../near/GridCacheNearOneNodeSelfTest.java | 2 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 26 +-
.../GridCachePartitionedFailoverSelfTest.java | 2 +-
...GridCachePartitionedFilteredPutSelfTest.java | 5 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 8 -
...achePartitionedMultiNodeFullApiSelfTest.java | 68 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 2 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 2 +-
.../GridCacheReplicatedEvictionSelfTest.java | 8 +-
.../GridCacheReplicatedFailoverSelfTest.java | 2 +-
.../GridCacheReplicatedInvalidateSelfTest.java | 13 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +-
.../GridCacheReplicatedPreloadSelfTest.java | 2 +-
.../eviction/GridCacheEvictionAbstractTest.java | 6 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 10 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 20 +-
.../DataStreamProcessorSelfTest.java | 8 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 2 +-
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../igfs/IgfsDualAbstractSelfTest.java | 2 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 8 +-
.../processors/igfs/IgfsSizeSelfTest.java | 10 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 7 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 9 +-
.../inmemory/GridTestSwapSpaceSpi.java | 2 +-
.../ignite/testframework/GridTestUtils.java | 14 +-
.../junits/common/GridCommonAbstractTest.java | 83 +--
.../IgniteCacheFailoverTestSuite.java | 13 +-
modules/geospatial/README.txt | 15 +
.../query/h2/GridH2IndexingGeoSelfTest.java | 14 +-
.../processors/hadoop/HadoopClassLoader.java | 21 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 2 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 4 +-
.../processors/hadoop/v2/HadoopDaemon.java | 125 ++++
.../processors/hadoop/v2/HadoopV2Job.java | 58 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 3 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +-
modules/hibernate/README.txt | 15 +
.../processors/query/h2/IgniteH2Indexing.java | 50 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 95 ++-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 64 +-
.../query/h2/opt/GridH2RowDescriptor.java | 2 +-
.../processors/query/h2/opt/GridH2Table.java | 31 +-
.../query/h2/opt/GridH2TreeIndex.java | 4 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 40 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 52 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 129 ++--
.../cache/GridCacheOffHeapSelfTest.java | 624 +++++++++++++++++
.../cache/GridCacheQueryMetricsSelfTest.java | 6 +-
...idCacheReduceQueryMultithreadedSelfTest.java | 5 +-
.../processors/cache/GridCacheSwapSelfTest.java | 138 ++--
.../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 16 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 319 +++++++++
.../cache/IgniteCacheQueryLoadSelfTest.java | 26 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 79 +--
...GridCachePartitionedFieldsQuerySelfTest.java | 7 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 16 +-
.../query/h2/GridH2IndexRebuildTest.java | 66 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 8 +-
.../IgniteCacheQuerySelfTestSuite.java | 2 +-
modules/schedule/README.txt | 15 +
pom.xml | 28 +-
143 files changed, 2642 insertions(+), 2143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8813070/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
[27/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-629-1
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4f580e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4f580e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4f580e8
Branch: refs/heads/ignite-639
Commit: a4f580e8bec7a5ac2ed8ac265ceb7a6c2e07d68f
Parents: 5fd9ded dfe90fb
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 13:01:22 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 13:01:22 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../processors/cache/CacheProjection.java | 24 --
.../processors/cache/GridCacheAdapter.java | 60 +---
.../processors/cache/GridCacheProcessor.java | 11 -
.../processors/cache/GridCacheProjectionEx.java | 9 -
.../cache/GridCacheProjectionImpl.java | 276 +++----------------
.../processors/cache/GridCacheProxyImpl.java | 19 --
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../CacheDataStructuresManager.java | 4 +-
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../GridProjectionForCachesSelfTest.java | 12 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridServiceReassignmentSelfTest.java | 5 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
16 files changed, 56 insertions(+), 410 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index d4f1ec0,c6e13ee..0ff316d
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@@ -217,34 -219,25 +217,10 @@@ public interface CacheProjection<K, V>
public CacheQueries<K, V> queries();
/**
- * Gets cache projection only for given key and value type. Only {@code non-null} key-value
- * pairs that have matching key and value pairs will be used in this projection.
- *
- * @param keyType Key type.
- * @param valType Value type.
- * @param <K1> Key type.
- * @param <V1> Value type.
- * @return Cache projection for given key and value types.
- */
- public <K1, V1> CacheProjection<K1, V1> projection(Class<? super K1> keyType, Class<? super V1> valType);
-
- /**
- * Gets cache projection based on given entry filter. This filter will be simply passed through
- * to all cache operations on this projection. Unlike <code>projection(org.apache.ignite.lang.IgniteBiPredicate)</code>
- * method, this filter will <b>not</b> be used for pre-filtering.
- * Gets cache projection base on this one, but with the specified flags turned on.
- * <h1 class="header">Cache Flags</h1>
- * The resulting projection will inherit all the flags from this projection.
-- *
- * @param filter Filter to be passed through to all cache operations. If {@code null}, then the
- * same projection is returned. If cache operation receives its own filter, then filters
- * will be {@code 'anded'}.
- * @return Projection based on given filter.
- */
- public CacheProjection<K, V> projection(@Nullable CacheEntryPredicate filter);
-
- /**
- * @param flags Flags to turn on (if empty, then no-op).
- * @return New projection based on this one, but with the specified flags turned on.
+ * @param skipStore Skip store flag.
+ * @return New projection based on this one, but with skip store flag enabled.
*/
- public CacheProjection<K, V> flagsOn(@Nullable CacheFlag... flags);
-
- /**
- * Gets cache projection base on this but with the specified flags turned off.
- * <h1 class="header">Cache Flags</h1>
- * The resulting projection will inherit all the flags from this projection except for
- * the ones that were turned off.
- *
- * @param flags Flags to turn off (if empty, then all flags will be turned off).
- * @return New projection based on this one, but with the specified flags turned off.
- */
- public CacheProjection<K, V> flagsOff(@Nullable CacheFlag... flags);
+ public CacheProjection<K, V> setSkipStore(boolean skipStore);
/**
* Creates projection that will operate with portable objects.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 00ab5719,4c77c68..c3a1225
--- 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
@@@ -379,16 -380,15 +379,10 @@@ public abstract class GridCacheAdapter<
}
/** {@inheritDoc} */
- @Override public CacheEntryPredicate predicate() {
- return null;
- @Override public Set<CacheFlag> flags() {
- return F.asSet(ctx.forcedFlags());
-- }
--
-- /** {@inheritDoc} */
@Override public GridCacheProjectionEx<K, V> forSubjectId(UUID subjId) {
GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this,
ctx,
-- null,
+ false,
subjId,
false,
null);
@@@ -408,8 -403,7 +402,8 @@@
GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this,
ctx,
- EnumSet.copyOf(F.asList(flags)),
+ null,
- skipStore,
++ false,
null,
false,
null);
@@@ -458,59 -455,8 +452,7 @@@
plc);
}
-
/** {@inheritDoc} */
- @SuppressWarnings({"unchecked", "RedundantCast"})
- @Override public <K1, V1> CacheProjection<K1, V1> projection(
- Class<? super K1> keyType,
- Class<? super V1> valType
- ) {
- if (ctx.deploymentEnabled()) {
- try {
- ctx.deploy().registerClasses(keyType, valType);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException(e);
- }
- }
-
- GridCacheProjectionImpl<K1, V1> prj = new GridCacheProjectionImpl<>((CacheProjection<K1, V1>)this,
- (GridCacheContext<K1, V1>)ctx,
- CU.typeFilter0(keyType, valType),
- false,
- /*clientId*/null,
- false,
- null);
-
- return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, prj, prj);
- }
-
- /** {@inheritDoc} */
- @Override public CacheProjection<K, V> projection(CacheEntryPredicate filter) {
- if (filter == null)
- return this;
-
- if (ctx.deploymentEnabled()) {
- try {
- ctx.deploy().registerClasses(filter);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException(e);
- }
- }
-
- GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(
- this,
- ctx,
- filter,
- false,
- null,
- false,
- null);
-
- return new GridCacheProxyImpl<>(ctx, prj, prj);
- }
-
- /** {@inheritDoc} */
@Override public CacheConfiguration configuration() {
return ctx.config();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index eea665a,5526f51..53d353f
--- 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
@@@ -88,8 -82,7 +82,7 @@@ public class GridCacheProjectionImpl<K
/**
* @param parent Parent projection.
* @param cctx Cache context.
- * @param entryFilter Entry filter.
- * @param flags Flags for new projection
+ * @param skipStore Skip store flag.
* @param subjId Subject ID.
* @param keepPortable Keep portable flag.
* @param expiryPlc Expiry policy.
@@@ -97,21 -90,24 +90,17 @@@
public GridCacheProjectionImpl(
CacheProjection<K, V> parent,
GridCacheContext<K, V> cctx,
- @Nullable CacheEntryPredicate entryFilter,
- @Nullable Set<CacheFlag> flags,
+ boolean skipStore,
@Nullable UUID subjId,
boolean keepPortable,
@Nullable ExpiryPolicy expiryPlc) {
assert parent != null;
assert cctx != null;
- // Check if projection flags are conflicting with an ongoing transaction, if any.
- cctx.shared().checkTxFlags(flags);
-
this.cctx = cctx;
- this.flags = !F.isEmpty(flags) ? EnumSet.copyOf(flags) : EnumSet.noneOf(CacheFlag.class);
-
- Set<CacheFlag> f = this.flags;
-
- this.flags = Collections.unmodifiableSet(f);
+ this.skipStore = skipStore;
- this.filter = entryFilter;
-
this.subjId = subjId;
cache = cctx.cache();
@@@ -256,8 -159,7 +152,7 @@@
GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this,
cctx,
- filter,
- flags,
+ skipStore,
subjId,
keepPortable,
expiryPlc);
@@@ -275,73 -177,42 +170,13 @@@
}
/** {@inheritDoc} */
- @SuppressWarnings( {"unchecked", "RedundantCast"})
- @Override public <K1, V1> CacheProjection<K1, V1> projection(
- Class<? super K1> keyType,
- Class<? super V1> valType
- ) {
- A.notNull(keyType, "keyType", valType, "valType");
-
- if (cctx.deploymentEnabled()) {
- try {
- cctx.deploy().registerClasses(keyType, valType);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException(e);
- }
- }
-
- GridCacheProjectionImpl<K1, V1> prj = new GridCacheProjectionImpl<>(
- (CacheProjection<K1, V1>)this,
- (GridCacheContext<K1, V1>)cctx,
- CU.typeFilter0(keyType, valType),
- skipStore,
- subjId,
- keepPortable,
- expiryPlc);
-
- return new GridCacheProxyImpl((GridCacheContext<K1, V1>)cctx, prj, prj);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked"})
- @Override public CacheProjection<K, V> projection(CacheEntryPredicate filter) {
- if (filter == null)
- return new GridCacheProxyImpl<>(cctx, this, this);
-
- if (this.filter != null)
- filter = and(filter);
-
- if (cctx.deploymentEnabled()) {
- try {
- cctx.deploy().registerClasses(filter);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException(e);
- }
- }
-
- GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this,
- cctx,
- filter,
- skipStore,
- subjId,
- keepPortable,
- expiryPlc);
-
- return new GridCacheProxyImpl<>(cctx, prj, prj);
- }
-
-
- /** {@inheritDoc} */
- @Override public CacheProjection<K, V> flagsOn(@Nullable CacheFlag[] flags) {
- if (F.isEmpty(flags))
+ @Override public CacheProjection<K, V> setSkipStore(boolean skipStore) {
+ if (this.skipStore == skipStore)
return new GridCacheProxyImpl<>(cctx, this, this);
- Set<CacheFlag> res = EnumSet.noneOf(CacheFlag.class);
-
- if (!F.isEmpty(this.flags))
- res.addAll(this.flags);
-
- res.addAll(EnumSet.copyOf(F.asList(flags)));
-
GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this,
cctx,
- filter,
- res,
- subjId,
- keepPortable,
- expiryPlc);
-
- return new GridCacheProxyImpl<>(cctx, prj, prj);
- }
-
- /** {@inheritDoc} */
- @Override public CacheProjection<K, V> flagsOff(@Nullable CacheFlag[] flags) {
- if (F.isEmpty(flags))
- return new GridCacheProxyImpl<>(cctx, this, this);
-
- Set<CacheFlag> res = EnumSet.noneOf(CacheFlag.class);
-
- if (!F.isEmpty(this.flags))
- res.addAll(this.flags);
-
- res.removeAll(EnumSet.copyOf(F.asList(flags)));
-
- GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this,
- cctx,
- res,
+ skipStore,
subjId,
keepPortable,
expiryPlc);
@@@ -354,8 -225,7 +189,7 @@@
GridCacheProjectionImpl<K1, V1> prj = new GridCacheProjectionImpl<>(
(CacheProjection<K1, V1>)this,
(GridCacheContext<K1, V1>)cctx,
- filter,
- flags,
+ skipStore,
subjId,
true,
expiryPlc);
@@@ -1112,8 -954,7 +907,7 @@@
return new GridCacheProjectionImpl<>(
this,
cctx,
- filter,
- flags,
+ skipStore,
subjId,
true,
plc);
@@@ -1123,9 -964,7 +917,7 @@@
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(cctx);
- out.writeObject(filter);
-
- U.writeCollection(out, flags);
+ out.writeBoolean(skipStore);
out.writeBoolean(keepPortable);
}
@@@ -1135,9 -974,7 +927,7 @@@
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
cctx = (GridCacheContext<K, V>)in.readObject();
- filter = (CacheEntryPredicate)in.readObject();
-
- flags = U.readSet(in);
+ skipStore = in.readBoolean();
cache = cctx.cache();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 79cf9b2,e66c9f9..d2a561a
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@@ -297,31 -285,7 +297,12 @@@ public class GridCacheProxyImpl<K, V> i
}
/** {@inheritDoc} */
- @Override public CacheEntryPredicate predicate() {
- return delegate.predicate();
- }
-
- /** {@inheritDoc} */
- @Override public Set<CacheFlag> flags() {
+ @Override public GridCacheProjectionEx<K, V> forSubjectId(UUID subjId) {
+ return delegate.forSubjectId(subjId);
+ }
+
+ /** {@inheritDoc} */
- @Override public <K1, V1> CacheProjection<K1, V1> projection(
- Class<? super K1> keyType,
- Class<? super V1> valType
- ) {
- return delegate.projection(keyType, valType);
- }
-
- /** {@inheritDoc} */
- @Override public CacheProjection<K, V> projection(
- @Nullable CacheEntryPredicate filter) {
- return delegate.projection(filter);
- }
-
- /** {@inheritDoc} */
+ @Override public CacheProjection<K, V> setSkipStore(boolean skipStore) {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index aba0c73,fcbfcb2..364b1c3
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@@ -1384,8 -1384,7 +1384,7 @@@ public class IgniteCacheProxy<K, V> ext
GridCacheProjectionImpl<K1, V1> prj0 = new GridCacheProjectionImpl<>(
(CacheProjection<K1, V1>)(prj != null ? prj : delegate),
(GridCacheContext<K1, V1>)ctx,
- null,
- prj != null ? prj.flags() : null,
+ prj != null ? prj.skipStore() : false,
prj != null ? prj.subjectId() : null,
true,
prj != null ? prj.expiry() : null);
@@@ -1415,10 -1425,9 +1414,11 @@@
GridCacheProjectionImpl<K, V> prj0 = new GridCacheProjectionImpl<>(
(prj != null ? prj : delegate),
ctx,
- res,
+ null,
+ prj != null ? prj.subjectId() : null,
true,
+ prj != null ? prj.subjectId() : null,
+ prj != null && prj.isKeepPortable(),
prj != null ? prj.expiry() : null);
return new IgniteCacheProxy<>(ctx,
[02/50] incubator-ignite git commit: IGNITE-644 - Marshaller cache
config
Posted by ak...@apache.org.
IGNITE-644 - Marshaller cache config
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ee3767d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ee3767d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ee3767d
Branch: refs/heads/ignite-639
Commit: 5ee3767d916018922f59edc2fd70b13349e1afc4
Parents: bca4198
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon Mar 30 12:37:13 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon Mar 30 12:37:13 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 34 +++++++++-----------
.../distributed/near/GridNearAtomicCache.java | 3 +-
2 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee3767d/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 4c8a567..7442d12 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
@@ -1751,7 +1751,7 @@ public class IgnitionEx {
}
// Always add marshaller and utility caches.
- copies[0] = marshallerSystemCache(clientDisco);
+ copies[0] = marshallerSystemCache();
copies[1] = utilitySystemCache(clientDisco);
cfg.setCacheConfiguration(copies);
@@ -1897,26 +1897,22 @@ public class IgnitionEx {
/**
* Creates marshaller system cache configuration.
*
- * @param client If {@code true} creates client-only cache configuration.
* @return Marshaller system cache configuration.
*/
- private static CacheConfiguration marshallerSystemCache(boolean client) {
- if (!client) {
- CacheConfiguration cache = new CacheConfiguration();
-
- cache.setName(CU.MARSH_CACHE_NAME);
- cache.setCacheMode(REPLICATED);
- cache.setAtomicityMode(ATOMIC);
- cache.setSwapEnabled(false);
- cache.setRebalanceMode(SYNC);
- cache.setWriteSynchronizationMode(FULL_SYNC);
- cache.setAffinity(new RendezvousAffinityFunction(false, 100));
- cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-
- return cache;
- }
-
- return null;
+ private static CacheConfiguration marshallerSystemCache() {
+ CacheConfiguration cache = new CacheConfiguration();
+
+ cache.setName(CU.MARSH_CACHE_NAME);
+ cache.setCacheMode(REPLICATED);
+ cache.setAtomicityMode(ATOMIC);
+ cache.setSwapEnabled(false);
+ cache.setRebalanceMode(SYNC);
+ cache.setWriteSynchronizationMode(FULL_SYNC);
+ cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+ cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+ cache.setStartSize(300);
+
+ return cache;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee3767d/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 6e24261..d34b13b 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
@@ -69,7 +69,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
public GridNearAtomicCache(GridCacheContext<K, V> ctx) {
super(ctx);
- int size = Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, 1_000_000);
+ int size = CU.isSystemCache(ctx.name()) ? 100 :
+ Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, 1_000_000);
rmvQueue = new GridCircularBuffer<>(U.ceilPow2(size / 10));
}
[38/50] incubator-ignite git commit: # ignite-sprint-3 minor
Posted by ak...@apache.org.
# ignite-sprint-3 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7aba4bad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7aba4bad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7aba4bad
Branch: refs/heads/ignite-639
Commit: 7aba4bad9aac10dc140c484580bce195b25634fc
Parents: 05c8d20
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 17:31:06 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 17:31:06 2015 +0300
----------------------------------------------------------------------
.../GridCachePartitionedQueueCreateMultiNodeSelfTest.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aba4bad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index 67dcb7a..67491fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -106,7 +106,11 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
IgniteInternalFuture<?> fut = multithreadedAsync(
new Callable<Object>() {
@Override public Object call() throws Exception {
- Ignite ignite = startGrid(idx.getAndIncrement());
+ int idx0 = idx.getAndIncrement();
+
+ Thread.currentThread().setName("createQueue-" + idx0);
+
+ Ignite ignite = startGrid(idx0);
UUID locNodeId = ignite.cluster().localNode().id();
[09/50] incubator-ignite git commit: ignite-629: Wait partition map
exchange in affinity test.
Posted by ak...@apache.org.
ignite-629: Wait partition map exchange in affinity 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/6047580d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6047580d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6047580d
Branch: refs/heads/ignite-639
Commit: 6047580daecad8014d4bac4bb6cbac6020fb7382
Parents: 528ea7a
Author: ivasilinets <va...@gmail.com>
Authored: Tue Mar 31 09:29:52 2015 +0300
Committer: ivasilinets <va...@gmail.com>
Committed: Tue Mar 31 09:29:52 2015 +0300
----------------------------------------------------------------------
.../test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6047580d/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index c4683fd..8d4a350 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -96,6 +96,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest {
startGrid(gridCount() - 1);
startGrid(gridCount());
+ awaitPartitionMapExchange();
GRID_CNT += 1;
[19/50] incubator-ignite git commit: ignite-629: Revert
GridCacheReturnValueTransferSelfTest.
Posted by ak...@apache.org.
ignite-629: Revert GridCacheReturnValueTransferSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/885643ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/885643ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/885643ac
Branch: refs/heads/ignite-639
Commit: 885643ac03f52a4b4d97f1535be3c6a1e344a100
Parents: a9996d8
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Mar 31 12:11:39 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Mar 31 12:11:39 2015 +0300
----------------------------------------------------------------------
.../GridCacheReturnValueTransferSelfTest.java | 191 +++++++++++++++++++
1 file changed, 191 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/885643ac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
new file mode 100644
index 0000000..4761e21
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -0,0 +1,191 @@
+/*
+ * 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.configuration.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.processor.*;
+import java.io.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests transform for extra traffic.
+ */
+public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest {
+ /** Distribution mode. */
+ private boolean cache;
+
+ /** Atomicity mode. */
+ private CacheAtomicityMode atomicityMode;
+
+ /** Atomic write order mode. */
+ private CacheAtomicWriteOrderMode writeOrderMode;
+
+ /** Number of backups. */
+ private int backups;
+
+ /** Fail deserialization flag. */
+ private static volatile boolean failDeserialization;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ CacheConfiguration ccfg = new CacheConfiguration();
+
+ ccfg.setBackups(backups);
+ ccfg.setCacheMode(PARTITIONED);
+ ccfg.setAtomicityMode(atomicityMode);
+ ccfg.setAtomicWriteOrderMode(writeOrderMode);
+
+ cfg.setCacheConfiguration(ccfg);
+
+ if (!cache)
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTransformAtomicPrimaryNoBackups() throws Exception {
+ checkTransform(ATOMIC, PRIMARY, 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTransformAtomicClockNoBackups() throws Exception {
+ checkTransform(ATOMIC, CLOCK, 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+ public void _testTransformTransactionalNoBackups() throws Exception {
+ checkTransform(TRANSACTIONAL, PRIMARY, 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+ public void _testTransformTransactionalOneBackup() throws Exception {
+ checkTransform(TRANSACTIONAL, PRIMARY, 1);
+ }
+
+ /**
+ * @param mode Atomicity mode.
+ * @param order Atomic cache write order mode.
+ * @param b Number of backups.
+ * @throws Exception If failed.
+ */
+ private void checkTransform(CacheAtomicityMode mode, CacheAtomicWriteOrderMode order, int b)
+ throws Exception {
+ try {
+ atomicityMode = mode;
+
+ backups = b;
+
+ writeOrderMode = order;
+
+ cache = true;
+
+ startGrids(2);
+
+ cache = false;
+
+ startGrid(2);
+
+ failDeserialization = false;
+
+ // Get client grid.
+ IgniteCache<Integer, TestObject> cache = grid(2).cache(null);
+
+ for (int i = 0; i < 100; i++)
+ cache.put(i, new TestObject());
+
+ failDeserialization = true;
+
+ info(">>>>>> Transforming");
+
+ // Transform (check non-existent keys also).
+ for (int i = 0; i < 200; i++)
+ cache.invoke(i, new Transform());
+
+ Set<Integer> keys = new HashSet<>();
+
+ // Check transformAll.
+ for (int i = 0; i < 300; i++)
+ keys.add(i);
+
+ cache.invokeAll(keys, new Transform());
+
+ // Avoid errors during stop.
+ failDeserialization = false;
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ *
+ */
+ private static class Transform implements EntryProcessor<Integer, TestObject, Void>, Serializable {
+ /** {@inheritDoc} */
+ @Override public Void process(MutableEntry<Integer, TestObject> entry, Object... args) {
+ entry.setValue(new TestObject());
+
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ @IgniteImmutable
+ private static class TestObject implements Externalizable {
+ /**
+ *
+ */
+ public TestObject() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ assert !failDeserialization;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ assert !failDeserialization;
+ }
+ }
+}
[18/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
into ignite-443
Posted by ak...@apache.org.
Merge branch 'ignite-sprint-3' into ignite-443
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/64750bc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64750bc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64750bc1
Branch: refs/heads/ignite-639
Commit: 64750bc17b756fe05647cdc2f2683026ebb1435b
Parents: 2d014b8 c2f5211
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 11:37:20 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 11:37:20 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 6 ++++++
modules/core/pom.xml | 9 +++++----
.../cache/VisorCacheStoreConfiguration.java | 18 +++++++++++-------
.../cache/IgniteCacheDynamicStopSelfTest.java | 19 +++++++++++--------
parent/pom.xml | 3 ++-
5 files changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[41/50] incubator-ignite git commit: Merge branches 'ignite-644' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-644
Posted by ak...@apache.org.
Merge branches 'ignite-644' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-644
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1f873bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1f873bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1f873bf
Branch: refs/heads/ignite-639
Commit: f1f873bf5eb1d5d8c024f68ab9aaa90bd0cc9122
Parents: 5ee3767 c6b3380
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 31 14:08:23 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 31 14:08:23 2015 -0700
----------------------------------------------------------------------
DEVNOTES.txt | 6 +
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../ignite/internal/GridKernalContextImpl.java | 9 +-
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 12 +-
.../internal/client/GridClientCacheFlag.java | 13 -
.../impl/connection/GridClientConnection.java | 9 -
.../internal/managers/GridManagerAdapter.java | 4 +
.../cache/CacheConflictResolutionManager.java | 30 ++
.../internal/processors/cache/CacheFlag.java | 108 ------
.../processors/cache/CacheFlagException.java | 67 ----
.../cache/CacheOsConflictResolutionManager.java | 58 +++
.../processors/cache/CacheProjection.java | 233 +-----------
.../internal/processors/cache/GridCache.java | 3 -
.../processors/cache/GridCacheAdapter.java | 271 +++-----------
.../cache/GridCacheConcurrentMap.java | 44 +--
.../processors/cache/GridCacheContext.java | 241 ++-----------
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 27 +-
.../processors/cache/GridCacheProcessor.java | 20 +-
.../processors/cache/GridCacheProjectionEx.java | 29 --
.../cache/GridCacheProjectionImpl.java | 357 +++----------------
.../processors/cache/GridCacheProxyImpl.java | 55 +--
.../cache/GridCacheSharedContext.java | 21 --
.../processors/cache/IgniteCacheProxy.java | 31 +-
.../CacheDataStructuresManager.java | 4 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 3 +-
.../dht/atomic/GridDhtAtomicCache.java | 32 --
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 -
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++--
.../dht/colocated/GridDhtColocatedCache.java | 2 -
.../colocated/GridDhtDetachedCacheEntry.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 2 -
.../distributed/near/GridNearCacheAdapter.java | 9 -
.../distributed/near/GridNearGetFuture.java | 3 +-
.../near/GridNearTransactionalCache.java | 2 -
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 ++++++
.../cache/dr/os/GridOsCacheDrManager.java | 111 ------
.../local/atomic/GridLocalAtomicCache.java | 74 +---
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../continuous/CacheContinuousQueryHandler.java | 5 -
.../transactions/IgniteTransactionsImpl.java | 1 -
.../transactions/IgniteTxLocalAdapter.java | 19 +-
.../cache/transactions/IgniteTxManager.java | 2 -
.../version/CacheVersionConflictResolver.java | 40 +++
...ridCacheVersionAbstractConflictResolver.java | 56 ---
.../GridCacheVersionConflictResolver.java | 59 ---
.../datastreamer/DataStreamerImpl.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 13 +-
.../datastructures/GridCacheAtomicLongImpl.java | 14 +-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 66 ++--
.../cache/VisorCacheStoreConfiguration.java | 18 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java | 13 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +-
.../GridProjectionForCachesSelfTest.java | 12 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 +-
.../cache/GridCacheAbstractFlagsTest.java | 97 -----
.../cache/GridCacheAbstractFullApiSelfTest.java | 61 +++-
.../cache/GridCachePutAllFailoverSelfTest.java | 26 +-
.../GridCacheReturnValueTransferSelfTest.java | 36 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +-
...GridCacheValueConsistencyAtomicSelfTest.java | 101 ------
.../near/GridCachePartitionedFlagsTest.java | 41 ---
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridCacheReplicatedFlagsTest.java | 28 --
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../GridServiceReassignmentSelfTest.java | 5 +-
.../loadtests/hashmap/GridCacheTestContext.java | 6 +-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../testframework/GridSpiTestContext.java | 18 +-
.../IgniteCacheFailoverTestSuite.java | 8 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 --
parent/pom.xml | 38 +-
96 files changed, 723 insertions(+), 2362 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1f873bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
[08/50] incubator-ignite git commit: # ignite-sprint-3 Added support
for nodes filters and minor cleanup of configs.
Posted by ak...@apache.org.
# ignite-sprint-3 Added support for nodes filters and minor cleanup of configs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/768ca6aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/768ca6aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/768ca6aa
Branch: refs/heads/ignite-639
Commit: 768ca6aab93c63f37e506318065bb491870ee8f4
Parents: bca4198
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Mar 31 11:44:10 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Mar 31 11:44:10 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheStoreConfiguration.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/768ca6aa/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
index 7284b7d..a4a2235 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.store.*;
import org.apache.ignite.cache.store.jdbc.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -67,13 +68,16 @@ public class VisorCacheStoreConfiguration implements Serializable {
private int flushThreadCnt;
/**
+ * @param ignite Ignite instance.
* @param ccfg Cache configuration.
* @return Data transfer object for cache store configuration properties.
*/
public static VisorCacheStoreConfiguration from(Ignite ignite, CacheConfiguration ccfg) {
VisorCacheStoreConfiguration cfg = new VisorCacheStoreConfiguration();
- CacheStore store = ((IgniteKernal)ignite).internalCache(ccfg.getName()).context().store().configuredStore();
+ GridCacheAdapter<Object, Object> c = ((IgniteKernal)ignite).internalCache(ccfg.getName());
+
+ CacheStore store = c != null && c.context().started() ? c.context().store().configuredStore() : null;
cfg.jdbcStore = store instanceof CacheAbstractJdbcStore;
@@ -156,10 +160,10 @@ public class VisorCacheStoreConfiguration implements Serializable {
}
/**
- * @param batchSize New maximum batch size for write-behind cache store operations.
+ * @param batchSz New maximum batch size for write-behind cache store operations.
*/
- public void batchSize(int batchSize) {
- this.batchSz = batchSize;
+ public void batchSize(int batchSz) {
+ this.batchSz = batchSz;
}
/**
@@ -184,10 +188,10 @@ public class VisorCacheStoreConfiguration implements Serializable {
}
/**
- * @param flushSize New maximum object count in write-behind cache.
+ * @param flushSz New maximum object count in write-behind cache.
*/
- public void flushSize(int flushSize) {
- this.flushSz = flushSize;
+ public void flushSize(int flushSz) {
+ this.flushSz = flushSz;
}
/**
[40/50] incubator-ignite git commit: IGNITE-651 - Persistance for
marshaller cache
Posted by ak...@apache.org.
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea7d2485
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea7d2485
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea7d2485
Branch: refs/heads/ignite-639
Commit: ea7d2485622cc455be536dec3ecbb36dec3498db
Parents: c6b3380
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 31 13:29:08 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 31 13:29:08 2015 -0700
----------------------------------------------------------------------
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +--
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../org/apache/ignite/internal/IgnitionEx.java | 6 +-
.../internal/MarshallerContextAdapter.java | 6 +-
.../ignite/internal/MarshallerContextImpl.java | 90 ++++++++++++++++++--
.../processors/cache/GridCacheProcessor.java | 8 +-
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../ignite/marshaller/MarshallerContext.java | 3 +-
.../optimized/OptimizedMarshallerUtils.java | 9 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../OptimizedMarshallerNodeFailoverTest.java | 71 ++++++++++++++-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 28 +++---
.../junits/GridTestKernalContext.java | 2 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/spi/GridSpiAbstractTest.java | 13 +--
22 files changed, 231 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
index f48a754..bb92e09 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
@@ -100,7 +100,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
final String key = KEY_PREFIX + i;
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() {
+ @Override public void applyx() throws IgniteCheckedException {
assertNotNull("Missing checkpoint: " + key,
getSpi().loadCheckpoint(key));
}
@@ -122,7 +122,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
final String key = KEY_PREFIX + i;
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() {
+ @Override public void applyx() throws IgniteCheckedException {
assertTrue(getSpi().removeCheckpoint(key));
}
});
@@ -133,7 +133,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
final String key = KEY_PREFIX + i;
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() {
+ @Override public void applyx() throws IgniteCheckedException {
assertNull(getSpi().loadCheckpoint(key));
}
});
@@ -159,7 +159,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
final String key = KEY_PREFIX + i;
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() {
+ @Override public void applyx() throws IgniteCheckedException {
assertNull("Checkpoint state should not be loaded with key: " + key,
getSpi().loadCheckpoint(key));
}
@@ -181,7 +181,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
getSpi().saveCheckpoint(KEY_PREFIX, GridTestIoUtils.serializeJdk(state2), 0, true);
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() {
+ @Override public void applyx() throws IgniteCheckedException {
assertNotNull(getSpi().loadCheckpoint(KEY_PREFIX));
}
});
@@ -197,7 +197,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
getSpi().removeCheckpoint(KEY_PREFIX);
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() {
+ @Override public void applyx() throws IgniteCheckedException {
assertNull(getSpi().loadCheckpoint(KEY_PREFIX));
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/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 6c953e7..4abf5e7 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
@@ -325,6 +325,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
* @param mgmtExecSvc Management executor service.
* @param igfsExecSvc IGFS executor service.
* @param restExecSvc REST executor service.
+ * @throws IgniteCheckedException In case of error.
*/
@SuppressWarnings("TypeMayBeWeakened")
protected GridKernalContextImpl(
@@ -339,7 +340,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
ExecutorService p2pExecSvc,
ExecutorService mgmtExecSvc,
ExecutorService igfsExecSvc,
- ExecutorService restExecSvc) {
+ ExecutorService restExecSvc) throws IgniteCheckedException {
assert grid != null;
assert cfg != null;
assert gw != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/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 4c8a567..19fff08 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
@@ -19,11 +19,11 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.util.spring.*;
import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.spring.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
@@ -34,7 +34,7 @@ import org.apache.ignite.marshaller.jdk.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.mxbean.*;
import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.resources.SpringApplicationContextResource;
+import org.apache.ignite.resources.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.checkpoint.noop.*;
import org.apache.ignite.spi.collision.noop.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index 08f2137..5dca2f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
@@ -95,7 +95,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
}
/** {@inheritDoc} */
- @Override public Class getClass(int id, ClassLoader ldr) throws ClassNotFoundException {
+ @Override public Class getClass(int id, ClassLoader ldr) throws ClassNotFoundException, IgniteCheckedException {
String clsName = map.get(id);
if (clsName == null) {
@@ -118,6 +118,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
* @param id Type ID.
* @param clsName Class name.
* @return Whether class name was registered.
+ * @throws IgniteCheckedException In case of error.
*/
protected abstract boolean registerClassName(int id, String clsName) throws IgniteCheckedException;
@@ -126,6 +127,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
*
* @param id Type ID.
* @return Class name.
+ * @throws IgniteCheckedException In case of error.
*/
- protected abstract String className(int id);
+ protected abstract String className(int id) throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 17de465..4a27222 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -21,6 +21,8 @@ import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import javax.cache.event.*;
+import java.io.*;
import java.util.concurrent.*;
/**
@@ -31,6 +33,9 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
private final CountDownLatch latch = new CountDownLatch(1);
/** */
+ private final File workDir;
+
+ /** */
private IgniteLogger log;
/** */
@@ -40,9 +45,30 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
private int failedCnt;
/**
+ * @throws IgniteCheckedException In case of error.
+ */
+ public MarshallerContextImpl() throws IgniteCheckedException {
+ workDir = U.resolveWorkDirectory("marshaller", false);
+ }
+
+ /**
+ * @param ctx Kernal context.
+ * @throws IgniteCheckedException In case of error.
+ */
+ public void onMarshallerCacheStarted(GridKernalContext ctx) throws IgniteCheckedException {
+ ctx.cache().marshallerCache().context().continuousQueries().executeInternalQuery(
+ new ContinuousQueryListener(log, workDir),
+ null,
+ true,
+ true
+ );
+ }
+
+ /**
* @param ctx Kernal context.
+ * @throws IgniteCheckedException In case of error.
*/
- public void onMarshallerCacheReady(GridKernalContext ctx) {
+ public void onMarshallerCachePreloaded(GridKernalContext ctx) throws IgniteCheckedException {
assert ctx != null;
log = ctx.log(MarshallerContextImpl.class);
@@ -89,15 +115,63 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
}
/** {@inheritDoc} */
- @Override protected String className(int id) {
- try {
- if (cache == null)
- U.awaitQuiet(latch);
+ @Override protected String className(int id) throws IgniteCheckedException {
+ if (cache == null)
+ U.awaitQuiet(latch);
+
+ String clsName = cache.get(id);
+
+ if (clsName == null) {
+ File file = new File(workDir, id + ".classname");
- return cache.get(id);
+ try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+ clsName = reader.readLine();
+ }
+ catch (IOException e) {
+ throw new IgniteCheckedException("Failed to read class name from file [id=" + id +
+ ", file=" + file.getAbsolutePath() + ']', e);
+ }
}
- catch (IgniteCheckedException e) {
- throw U.convertException(e);
+
+ return clsName;
+ }
+
+ /**
+ */
+ private static class ContinuousQueryListener implements CacheEntryUpdatedListener<Integer, String> {
+ /** */
+ private final IgniteLogger log;
+
+ /** */
+ private final File workDir;
+
+ /**
+ * @param log Logger.
+ * @param workDir Work directory.
+ */
+ private ContinuousQueryListener(IgniteLogger log, File workDir) {
+ this.log = log;
+ this.workDir = workDir;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onUpdated(Iterable<CacheEntryEvent<? extends Integer, ? extends String>> events)
+ throws CacheEntryListenerException {
+ for (CacheEntryEvent<? extends Integer, ? extends String> evt : events) {
+ assert evt.getOldValue() == null;
+
+ File file = new File(workDir, evt.getKey() + ".classname");
+
+ try (Writer writer = new FileWriter(file)) {
+ writer.write(evt.getValue());
+
+ writer.flush();
+ }
+ catch (IOException e) {
+ U.error(log, "Failed to write class name to file [id=" + evt.getKey() +
+ ", clsName=" + evt.getValue() + ", file=" + file.getAbsolutePath() + ']', e);
+ }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/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 a04746a..0e96994 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
@@ -677,9 +677,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
}
- marshallerCache().context().preloader().syncFuture().listen(new CI1<IgniteInternalFuture<?>>() {
- @Override public void apply(IgniteInternalFuture<?> f) {
- ctx.marshallerContext().onMarshallerCacheReady(ctx);
+ ctx.marshallerContext().onMarshallerCacheStarted(ctx);
+
+ marshallerCache().context().preloader().syncFuture().listen(new CIX1<IgniteInternalFuture<?>>() {
+ @Override public void applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException {
+ ctx.marshallerContext().onMarshallerCachePreloaded(ctx);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
index b779c18..a21213f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
@@ -45,5 +45,8 @@ interface CacheContinuousQueryListener<K, V> {
*/
public boolean oldValueRequired();
+ /**
+ * @return Whether to notify on existing entries.
+ */
public boolean notifyExisting();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index eff845d..ed3bbea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -129,7 +129,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter {
assert e != null;
assert key != null;
- boolean internal = e.isInternal();
+ boolean internal = e.isInternal() || e.context().system();
if (preload && !internal)
return;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 5f6da0f..8aebac2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -8347,7 +8347,7 @@ public abstract class IgniteUtils {
/**
* Nullifies work directory. For test purposes only.
*/
- static void nullifyWorkDirectory() {
+ public static void nullifyWorkDirectory() {
igniteWork = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
index 393a35b..f0e248a 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
@@ -40,6 +40,7 @@ public interface MarshallerContext {
* @param ldr Class loader.
* @return Class.
* @throws ClassNotFoundException If class was not found.
+ * @throws IgniteCheckedException In case of any other error.
*/
- public Class getClass(int id, ClassLoader ldr) throws ClassNotFoundException;
+ public Class getClass(int id, ClassLoader ldr) throws ClassNotFoundException, IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index d5caa9d..fafdea1 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -246,7 +246,14 @@ class OptimizedMarshallerUtils {
ClassLoader ldr,
MarshallerContext ctx,
OptimizedMarshallerIdMapper mapper) throws IOException, ClassNotFoundException {
- Class cls = ctx.getClass(id, ldr);
+ Class cls;
+
+ try {
+ cls = ctx.getClass(id, ldr);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IOException("Failed to resolve class for ID: " + id, e);
+ }
OptimizedClassDescriptor desc = clsMap.get(cls);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
index dab197c..e0a62e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
@@ -32,7 +32,7 @@ public class GridNoopManagerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- public void testEnabledManager() {
+ public void testEnabledManager() throws IgniteCheckedException {
GridTestKernalContext ctx = new GridTestKernalContext(new GridStringLogger());
assertTrue(new Manager(ctx, new Spi()).enabled());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index c11156a..3890716 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.*;
*/
public class GridIoManagerSelfTest extends GridCommonAbstractTest {
/** Grid test context. */
- private GridTestKernalContext ctx = new GridTestKernalContext(log);
+ private GridTestKernalContext ctx;
/** Test local node. */
private GridTestNode locNode = new GridTestNode(UUID.randomUUID());
@@ -53,6 +53,13 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
/** Test remote node. */
private GridTestNode rmtNode = new GridTestNode(UUID.randomUUID());
+ /**
+ * @throws IgniteCheckedException In case of error.
+ */
+ public GridIoManagerSelfTest() throws IgniteCheckedException {
+ ctx = new GridTestKernalContext(log);
+ }
+
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
ctx.config().setCommunicationSpi(new TcpCommunicationSpi());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
index 8f7796d..6e3e0e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
@@ -293,7 +293,7 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest {
/**
* @param ignite Grid.
*/
- private SelfReferencedJob(Ignite ignite) {
+ private SelfReferencedJob(Ignite ignite) throws IgniteCheckedException {
node = ignite.cluster().localNode();
ref = this;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
index a28996d..07fd9e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
@@ -20,6 +20,8 @@ package org.apache.ignite.marshaller.optimized;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.marshaller.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -42,6 +44,9 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
/** */
private boolean cache;
+ /** */
+ private String workDir;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -54,6 +59,8 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
cfg.setMarshaller(new OptimizedMarshaller());
+ cfg.setWorkDirectory(workDir);
+
if (cache) {
CacheConfiguration ccfg = new CacheConfiguration();
@@ -111,6 +118,66 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
assertNotNull(ignite.cache(null));
}
+ /**
+ * @throws Exception If failed.
+ */
+ public void testRestartAllNodes() throws Exception {
+ cache = false;
+
+ String home = U.getIgniteHome();
+
+ String[] workDirs = new String[3];
+
+ for (int i = 0; i < 3; i++) {
+ workDirs[i] = home + "/work/marshallerTestNode_" + i;
+
+ File file = new File(workDirs[i]);
+
+ if (file.exists())
+ assert U.delete(file);
+ }
+
+ try {
+ for (int i = 0; i < workDirs.length; i++) {
+ workDir = workDirs[i];
+
+ U.nullifyWorkDirectory();
+
+ startGrid(i);
+ }
+
+ Marshaller marsh = ignite(0).configuration().getMarshaller();
+
+ TestClass1 obj = new TestClass1();
+
+ obj.val = 111;
+
+ byte[] bytes = marsh.marshal(obj);
+
+ stopAllGrids();
+
+ for (int i = 0; i < workDirs.length; i++) {
+ workDir = workDirs[i];
+
+ U.nullifyWorkDirectory();
+
+ startGrid(i);
+ }
+
+ for (int i = 0; i < 3; i++) {
+ marsh = ignite(i).configuration().getMarshaller();
+
+ TestClass1 obj0 = marsh.unmarshal(bytes, null);
+
+ assertEquals(111, obj0.val);
+ }
+ }
+ finally {
+ for (String dir : workDirs)
+ assert U.delete(new File(dir));
+ }
+ }
+
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
@@ -153,7 +220,9 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
/**
*
*/
- static class TestClass1 implements Serializable {}
+ static class TestClass1 implements Serializable {
+ int val;
+ }
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java
index 7925823..a0eb81f 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java
@@ -141,7 +141,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest {
* @param cfgVal {@code true} if {@code localHost} property value should be set to configuration.
* @return Resource processor.
*/
- private GridResourceProcessor getResourceProcessor(boolean cfgVal) {
+ private GridResourceProcessor getResourceProcessor(boolean cfgVal) throws IgniteCheckedException {
GridTestKernalContext ctx = newContext();
if (cfgVal)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java
index 40e5b28..0e993a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java
@@ -32,7 +32,7 @@ import static org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisi
@GridSpiTest(spi = PriorityQueueCollisionSpi.class, group = "Collision SPI")
public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<PriorityQueueCollisionSpi> {
/** {@inheritDoc} */
- @Override protected void afterTest() {
+ @Override protected void afterTest() throws Exception {
getSpi().setParallelJobsNumber(DFLT_PARALLEL_JOBS_NUM);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
index 72c1014..55c3016 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
@@ -112,7 +112,7 @@ public class GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest
}
/** */
- public void testNodeNotInTopology() {
+ public void testNodeNotInTopology() throws Exception {
ComputeTaskSession ses = new GridTestTaskSession();
ClusterNode node = new GridTestNode(UUID.randomUUID());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 93d1d74..da316fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -116,7 +116,7 @@ public abstract class GridAbstractTest extends TestCase {
private static final ConcurrentMap<UUID, Object> serializedObj = new ConcurrentHashMap<>();
/** */
- protected GridAbstractTest() {
+ protected GridAbstractTest() throws IgniteCheckedException {
this(false);
log = getTestCounters().getTestResources().getLogger().getLogger(getClass());
@@ -172,7 +172,7 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @return Test resources.
*/
- protected IgniteTestResources getTestResources() {
+ protected IgniteTestResources getTestResources() throws IgniteCheckedException {
return getTestCounters().getTestResources();
}
@@ -215,7 +215,8 @@ public abstract class GridAbstractTest extends TestCase {
* @param cats Additional categories.
*/
@SuppressWarnings({"deprecation"})
- protected void resetLog4j(Level log4jLevel, boolean logToFile, String cat, String... cats) {
+ protected void resetLog4j(Level log4jLevel, boolean logToFile, String cat, String... cats)
+ throws IgniteCheckedException {
for (String c : F.concat(false, cat, F.asList(cats)))
Logger.getLogger(c).setLevel(log4jLevel);
@@ -381,7 +382,7 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @return Test kernal context.
*/
- protected GridTestKernalContext newContext() {
+ protected GridTestKernalContext newContext() throws IgniteCheckedException {
return new GridTestKernalContext(log());
}
@@ -672,7 +673,7 @@ public abstract class GridAbstractTest extends TestCase {
* @param cfg Configuration.
* @return Optimized configuration (by modifying passed in one).
*/
- protected IgniteConfiguration optimize(IgniteConfiguration cfg) {
+ protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException {
// TODO: GG-4048: propose another way to avoid network overhead in tests.
if (cfg.getLocalHost() == null) {
if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi)
@@ -1055,7 +1056,7 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @return Ignite home.
*/
- protected String home() {
+ protected String home() throws IgniteCheckedException {
return getTestResources().getIgniteHome();
}
@@ -1250,7 +1251,7 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @return First test flag.
*/
- protected boolean isFirstTest() {
+ protected boolean isFirstTest() throws IgniteCheckedException {
TestCounters cntrs = getTestCounters();
return cntrs.getStarted() == 1 && cntrs.getStopped() == 0;
@@ -1259,7 +1260,7 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @return Last test flag.
*/
- protected boolean isLastTest() {
+ protected boolean isLastTest() throws IgniteCheckedException {
TestCounters cntrs = getTestCounters();
return cntrs.getStopped() == cntrs.getNumberOfTests();
@@ -1268,7 +1269,7 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @return Test counters.
*/
- protected synchronized TestCounters getTestCounters() {
+ protected synchronized TestCounters getTestCounters() throws IgniteCheckedException {
TestCounters tc = tests.get(getClass());
if (tc == null)
@@ -1461,7 +1462,14 @@ public abstract class GridAbstractTest extends TestCase {
private boolean reset;
/** */
- private IgniteTestResources rsrcs = new IgniteTestResources();
+ private IgniteTestResources rsrcs;
+
+ /**
+ * @throws IgniteCheckedException In case of error.
+ */
+ public TestCounters() throws IgniteCheckedException {
+ rsrcs = new IgniteTestResources();
+ }
/**
* @return Reset flag.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
index b871a4a..6b7a7f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
@@ -33,7 +33,7 @@ public class GridTestKernalContext extends GridKernalContextImpl {
/**
* @param log Logger to use in context config.
*/
- public GridTestKernalContext(IgniteLogger log) {
+ public GridTestKernalContext(IgniteLogger log) throws IgniteCheckedException {
super(new GridLoggerProxy(log, null, null, null),
new IgniteKernal(null),
new IgniteConfiguration(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 583c082..61dddbe 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -63,13 +63,15 @@ public class IgniteTestResources {
private GridResourceProcessor rsrcProc;
/** */
- public IgniteTestResources() {
+ public IgniteTestResources() throws IgniteCheckedException {
log = rootLog.getLogger(getClass());
nodeId = UUID.randomUUID();
jmx = ManagementFactory.getPlatformMBeanServer();
home = U.getIgniteHome();
locHost = localHost();
+ U.setWorkDirectory(null, null);
+
GridTestKernalContext ctx = new GridTestKernalContext(log);
rsrcProc = new GridResourceProcessor(ctx);
@@ -78,7 +80,7 @@ public class IgniteTestResources {
/**
* @param jmx JMX server.
*/
- public IgniteTestResources(MBeanServer jmx) {
+ public IgniteTestResources(MBeanServer jmx) throws IgniteCheckedException {
assert jmx != null;
this.jmx = jmx;
@@ -97,7 +99,7 @@ public class IgniteTestResources {
/**
* @param log Logger.
*/
- public IgniteTestResources(IgniteLogger log) {
+ public IgniteTestResources(IgniteLogger log) throws IgniteCheckedException {
assert log != null;
this.log = log.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
index 3df5283..7898c3d 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testframework.junits.spi;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -86,7 +87,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
* @return Test data.
*/
@SuppressWarnings({"unchecked"})
- protected TestData<T> getTestData() {
+ protected TestData<T> getTestData() throws IgniteCheckedException {
TestData<T> data = (TestData<T>)tests.get(getClass());
if (data == null)
@@ -157,7 +158,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
}
/** {@inheritDoc} */
- @Override protected final IgniteTestResources getTestResources() {
+ @Override protected final IgniteTestResources getTestResources() throws IgniteCheckedException {
return getTestData().getTestResources();
}
@@ -429,7 +430,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
/**
* @return Fully initialized and started SPI implementation.
*/
- protected final T getSpi() {
+ protected final T getSpi() throws IgniteCheckedException {
return getTestData().getSpi();
}
@@ -584,13 +585,13 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
private Map<String, Object> allAttrs = new HashMap<>();
/** */
- private IgniteTestResources rsrcs = new IgniteTestResources();
+ private IgniteTestResources rsrcs;
/**
*
*/
- TestData() {
- // No-op.
+ TestData() throws IgniteCheckedException {
+ rsrcs = new IgniteTestResources();
}
/**
[03/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-611
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-611
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46bb91a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46bb91a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46bb91a3
Branch: refs/heads/ignite-639
Commit: 46bb91a3ec135b743fc8a2bdaacac64afeb14940
Parents: 2289f64 bca4198
Author: ivasilinets <va...@gmail.com>
Authored: Mon Mar 30 23:02:49 2015 +0300
Committer: ivasilinets <va...@gmail.com>
Committed: Mon Mar 30 23:02:49 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 15 +--
RELEASE_NOTES.txt | 20 ++-
modules/core/pom.xml | 9 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../near/GridNearTxPrepareFuture.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 4 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 8 +-
.../GridCacheAbstractFailoverSelfTest.java | 134 +++++--------------
.../GridCacheAbstractFailoverTxSelfTest.java | 110 +++++++++++++++
.../GridCacheInterceptorAbstractSelfTest.java | 2 +
.../cache/IgniteCacheDynamicStopSelfTest.java | 19 +--
.../dht/GridCacheColocatedFailoverSelfTest.java | 2 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +++++++
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +++++
...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +++++
.../GridCachePartitionedFailoverSelfTest.java | 2 +-
.../GridCacheReplicatedFailoverSelfTest.java | 2 +-
.../IgniteCacheFailoverTestSuite.java | 13 +-
modules/geospatial/README.txt | 15 +++
.../processors/hadoop/HadoopClassLoader.java | 21 ++-
.../processors/hadoop/HadoopDefaultJobInfo.java | 2 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 4 +-
.../processors/hadoop/v2/HadoopDaemon.java | 125 +++++++++++++++++
.../processors/hadoop/v2/HadoopV2Job.java | 58 ++++++--
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +-
modules/hibernate/README.txt | 15 +++
modules/schedule/README.txt | 15 +++
parent/pom.xml | 3 +-
pom.xml | 22 ++-
32 files changed, 588 insertions(+), 166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46bb91a3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
----------------------------------------------------------------------
[06/50] incubator-ignite git commit: ignite-629: Remove test for
Force transform flag.
Posted by ak...@apache.org.
ignite-629: Remove test for Force transform flag.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/528ea7af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528ea7af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528ea7af
Branch: refs/heads/ignite-639
Commit: 528ea7afab72f05ed367bd85d0a031f67094574e
Parents: 053d32c
Author: ivasilinets <va...@gmail.com>
Authored: Tue Mar 31 00:46:47 2015 +0300
Committer: ivasilinets <va...@gmail.com>
Committed: Tue Mar 31 00:46:47 2015 +0300
----------------------------------------------------------------------
.../GridCacheReturnValueTransferSelfTest.java | 205 -------------------
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
2 files changed, 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528ea7af/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
deleted file mode 100644
index 5b3e19d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ /dev/null
@@ -1,205 +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.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- * Tests transform for extra traffic.
- */
-public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest {
- /** Distribution mode. */
- private boolean cache;
-
- /** Atomicity mode. */
- private CacheAtomicityMode atomicityMode;
-
- /** Atomic write order mode. */
- private CacheAtomicWriteOrderMode writeOrderMode;
-
- /** Number of backups. */
- private int backups;
-
- /** Fail deserialization flag. */
- private static volatile boolean failDeserialization;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- CacheConfiguration ccfg = new CacheConfiguration();
-
- ccfg.setBackups(backups);
- ccfg.setCacheMode(PARTITIONED);
- ccfg.setAtomicityMode(atomicityMode);
- ccfg.setAtomicWriteOrderMode(writeOrderMode);
-
- cfg.setCacheConfiguration(ccfg);
-
- if (!cache)
- cfg.setClientMode(true);
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTransformAtomicPrimaryNoBackups() throws Exception {
- checkTransform(ATOMIC, PRIMARY, 0);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTransformAtomicClockNoBackups() throws Exception {
- checkTransform(ATOMIC, CLOCK, 0);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTransformAtomicPrimaryOneBackup() throws Exception {
- checkTransform(ATOMIC, PRIMARY, 1);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTransformAtomicClockOneBackup() throws Exception {
- checkTransform(ATOMIC, CLOCK, 1);
- }
-
- /**
- * @throws Exception If failed.
- * TODO gg-8273 enable when fixed
- */
- public void _testTransformTransactionalNoBackups() throws Exception {
- checkTransform(TRANSACTIONAL, PRIMARY, 0);
- }
-
- /**
- * @throws Exception If failed.
- * TODO gg-8273 enable when fixed
- */
- public void _testTransformTransactionalOneBackup() throws Exception {
- checkTransform(TRANSACTIONAL, PRIMARY, 1);
- }
-
- /**
- * @param mode Atomicity mode.
- * @param order Atomic cache write order mode.
- * @param b Number of backups.
- * @throws Exception If failed.
- */
- private void checkTransform(CacheAtomicityMode mode, CacheAtomicWriteOrderMode order, int b)
- throws Exception {
- try {
- atomicityMode = mode;
-
- backups = b;
-
- writeOrderMode = order;
-
- cache = true;
-
- startGrids(2);
-
- cache = false;
-
- startGrid(2);
-
- failDeserialization = false;
-
- // Get client grid.
- IgniteCache<Integer, TestObject> cache = grid(2).cache(null);
-
- for (int i = 0; i < 100; i++)
- cache.put(i, new TestObject());
-
- failDeserialization = true;
-
- info(">>>>>> Transforming");
-
- // Transform (check non-existent keys also).
- for (int i = 0; i < 200; i++)
- cache.invoke(i, new Transform());
-
- Set<Integer> keys = new HashSet<>();
-
- // Check transformAll.
- for (int i = 0; i < 300; i++)
- keys.add(i);
-
- cache.invokeAll(keys, new Transform());
-
- // Avoid errors during stop.
- failDeserialization = false;
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- *
- */
- private static class Transform implements EntryProcessor<Integer, TestObject, Void>, Serializable {
- /** {@inheritDoc} */
- @Override public Void process(MutableEntry<Integer, TestObject> entry, Object... args) {
- entry.setValue(new TestObject());
-
- return null;
- }
- }
-
- /**
- *
- */
- @IgniteImmutable
- private static class TestObject implements Externalizable {
- /**
- *
- */
- public TestObject() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- assert !failDeserialization;
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- assert !failDeserialization;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528ea7af/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 8cf9d2b..e3fefc8 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -238,7 +238,6 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class));
- suite.addTest(new TestSuite(GridCacheReturnValueTransferSelfTest.class));
suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class));
// TODO: GG-7242, GG-7243: Enabled when fixed.
[21/50] incubator-ignite git commit: #IGNITE-443 Moved
CacheVerstionConflictResolver
Posted by ak...@apache.org.
#IGNITE-443 Moved CacheVerstionConflictResolver
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da1b89f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da1b89f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da1b89f1
Branch: refs/heads/ignite-639
Commit: da1b89f18c8a32d0eed4ac923002f12e223dac71
Parents: 64750bc
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 12:14:18 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 12:14:18 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 6 +-
.../CacheVersionConflictResolverImpl.java | 84 --------------------
.../loadtests/hashmap/GridCacheTestContext.java | 5 +-
4 files changed, 8 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da1b89f1/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 7187600..8f202a8 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
@@ -247,7 +247,7 @@ public class GridCacheContext<K, V> implements Externalizable {
GridCacheTtlManager ttlMgr,
GridCacheDrManager drMgr,
CacheJtaManagerAdapter jtaMgr,
- CacheConflictManager<K, V> rslvrMgr
+ CacheConflictResolverManager<K, V> rslvrMgr
) {
assert ctx != null;
assert sharedCtx != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da1b89f1/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 41ff94e..4b0955f 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
@@ -1039,7 +1039,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ttlMgr,
drMgr,
jta,
- rslvrMgr);
+ rslvrMgr
+ );
cacheCtx.cacheObjectContext(cacheObjCtx);
@@ -1164,7 +1165,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ttlMgr,
drMgr,
jta,
- rslvrMgr);
+ rslvrMgr
+ );
cacheCtx.cacheObjectContext(cacheObjCtx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da1b89f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
deleted file mode 100644
index 9f316a8..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
+++ /dev/null
@@ -1,84 +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.processors.cache.version;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-
-/**
- * Cache version conflict resolver.
- */
-public class CacheVersionConflictResolverImpl implements CacheVersionConflictResolver {
- /** {@inheritDoc} */
- @Override public <K, V> GridCacheVersionConflictContext<K, V> resolve(
- GridCacheVersionedEntryEx<K, V> oldEntry,
- GridCacheVersionedEntryEx<K, V> newEntry,
- boolean atomicVerComparator
- ) throws IgniteCheckedException {
- GridCacheVersionConflictContext<K, V> ctx = new GridCacheVersionConflictContext<>(oldEntry, newEntry);
-
- resolve0(ctx, oldEntry, newEntry, atomicVerComparator);
-
- return ctx;
- }
-
- /**
- * Internal conflict resolution routine.
- *
- * @param ctx Context.
- * @param oldEntry Old entry.
- * @param newEntry New entry.
- * @param atomicVerComparator Whether to use atomic version comparator.
- * @throws IgniteCheckedException If failed.
- */
- protected <K, V> void resolve0(
- GridCacheVersionConflictContext<K, V> ctx,
- GridCacheVersionedEntryEx<K, V> oldEntry,
- GridCacheVersionedEntryEx<K, V> newEntry,
- boolean atomicVerComparator
- ) throws IgniteCheckedException {
- if (newEntry.dataCenterId() != oldEntry.dataCenterId())
- ctx.useNew();
- else {
- if (oldEntry.isStartVersion())
- ctx.useNew();
- else {
- if (atomicVerComparator) {
- // Handle special case when version check using ATOMIC cache comparator is required.
- if (GridCacheMapEntry.ATOMIC_VER_COMPARATOR.compare(oldEntry.version(),
- newEntry.version(), false) >= 0)
- ctx.useOld();
- else
- ctx.useNew();
- }
- else {
- long topVerDiff = newEntry.topologyVersion() - oldEntry.topologyVersion();
-
- if (topVerDiff > 0)
- ctx.useNew();
- else if (topVerDiff < 0)
- ctx.useOld();
- else if (newEntry.order() > oldEntry.order())
- ctx.useNew();
- else
- ctx.useOld();
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da1b89f1/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index b34e6e6..187616e 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
-import org.apache.ignite.internal.processors.cache.dr.GridOsCacheDrManager;
+import org.apache.ignite.internal.processors.cache.dr.*;
import org.apache.ignite.internal.processors.cache.jta.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.processors.cache.query.continuous.*;
@@ -70,6 +70,7 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> {
new GridCacheTtlManager(),
new GridOsCacheDrManager(),
new CacheNoopJtaManager(),
- new CacheOsConflictResolverManager<K, V>());
+ new CacheOsConflictResolverManager<K, V>()
+ );
}
}
[07/50] incubator-ignite git commit: # ignite-sprint-3 Fixed tests.
Posted by ak...@apache.org.
# ignite-sprint-3 Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/211a7400
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/211a7400
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/211a7400
Branch: refs/heads/ignite-639
Commit: 211a7400592008d704340f7724cdd8a897f30433
Parents: bca4198
Author: anovikov <an...@gridgain.com>
Authored: Tue Mar 31 10:24:53 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Tue Mar 31 10:24:53 2015 +0700
----------------------------------------------------------------------
parent/pom.xml | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/211a7400/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e95d5f6..f408434 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -509,6 +509,25 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-libs</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeGroupIds>org.apache.ignite</excludeGroupIds>
+ <outputDirectory>target/libs</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -626,25 +645,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-libs</id>
- <phase>test-compile</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <excludeGroupIds>org.apache.ignite</excludeGroupIds>
- <outputDirectory>target/libs</outputDirectory>
- <includeScope>runtime</includeScope>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
[20/50] incubator-ignite git commit: # ignite-611
Posted by ak...@apache.org.
# ignite-611
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dc0da5d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc0da5d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc0da5d0
Branch: refs/heads/ignite-639
Commit: dc0da5d07cff084ae767d83da5998b4c8ae7e485
Parents: 46bb91a
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 12:13:53 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 12:13:53 2015 +0300
----------------------------------------------------------------------
.../cache/query/GridCacheQueriesImpl.java | 23 +-------------------
1 file changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc0da5d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
index ae25c1c..40839fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
@@ -34,7 +34,7 @@ import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryTy
/**
* {@link CacheQueries} implementation.
*/
-public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Externalizable {
+public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V> {
/** */
private static final long serialVersionUID = 0L;
@@ -214,25 +214,4 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext
incMeta,
prj != null && prj.isKeepPortable());
}
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(prj);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings("unchecked")
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- prj = (GridCacheProjectionImpl<K, V>)in.readObject();
- }
-
- /**
- * Reconstructs object on unmarshalling.
- *
- * @return Reconstructed object.
- * @throws ObjectStreamException Thrown in case of unmarshalling error.
- */
- private Object readResolve() throws ObjectStreamException {
- return prj.queries();
- }
}
[47/50] incubator-ignite git commit: # IGNITE-562 Minor rename
preload -> rebalance.
Posted by ak...@apache.org.
# IGNITE-562 Minor rename preload -> rebalance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/528d46bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528d46bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528d46bc
Branch: refs/heads/ignite-639
Commit: 528d46bc95fa40049c24a7eee1d27812934ac5a5
Parents: 17a9744
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 1 10:18:57 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 1 10:18:57 2015 +0700
----------------------------------------------------------------------
.../commands/events/VisorEventsCommand.scala | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528d46bc/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index 3316579..01d8b14 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -41,16 +41,16 @@ import scala.language.implicitConversions
* ==Help==
* {{{
* +----------------------------------------------------------------------------------------+
- * | events | Prints events from a node. |
+ * | events | Prints events from a node. |
* | | |
- * | | Note that this command depends on Ignite events. |
+ * | | Note that this command depends on Ignite events. |
* | | |
- * | | Ignite events can be individually enabled and disabled and disabled events |
+ * | | Ignite events can be individually enabled and disabled and disabled events |
* | | can affect the results produced by this command. Note also that configuration |
* | | of Event Storage SPI that is responsible for temporary storage of generated |
* | | events on each node can also affect the functionality of this command. |
* | | |
- * | | By default - all events are DISABLED and Ignite stores last 10,000 local |
+ * | | By default - all events are DISABLED and Ignite stores last 10,000 local |
* | | events on each node. Both of these defaults can be changed in configuration. |
* +----------------------------------------------------------------------------------------+
* }}}
@@ -58,7 +58,7 @@ import scala.language.implicitConversions
* ====Specification====
* {{{
* events
- * events "{-id=<node-id>|-id8=<node-id8>} {-e=<ch,cp,de,di,jo,ta,cl,ca,sw>}
+ * events "{-id=<node-id>|-id8=<node-id8>} {-e=<ch,cr,de,di,jo,ta,cl,ca,sw>}
* {-t=<num>s|m|h|d} {-s=e|t} {-r} {-c=<n>}"
* }}}
*
@@ -72,7 +72,7 @@ import scala.language.implicitConversions
* Node ID8.
* Either '-id' or '-id8' can be specified.
* If called without the arguments - starts in interactive mode.
- * -e=<ch,de,di,jo,ta,ca,cp,sw>
+ * -e=<ch,de,di,jo,ta,ca,cr,sw>
* Comma separated list of event types that should be queried:
* ch Checkpoint events.
* de Deployment events.
@@ -81,7 +81,7 @@ import scala.language.implicitConversions
* ta Task execution events.
* cl Cloud events.
* ca Cache events.
- * cp Cache pre-loader events.
+ * cr Cache rebalance events.
* sw Swapspace events.
* -t=<num>s|m|h|d
* Defines time frame for querying events:
@@ -159,7 +159,7 @@ class VisorEventsCommand {
case "jo" => arr ++= EVTS_JOB_EXECUTION.toList
case "ta" => arr ++= EVTS_TASK_EXECUTION.toList
case "ca" => arr ++= EVTS_CACHE.toList
- case "cp" => arr ++= EVTS_CACHE_REBALANCE.toList
+ case "cr" => arr ++= EVTS_CACHE_REBALANCE.toList
case "sw" => arr ++= EVTS_SWAPSPACE.toList
case "di" => arr ++= EVTS_DISCOVERY.toList
case t => throw new IllegalArgumentException("Unknown event type: " + t)
@@ -185,7 +185,7 @@ class VisorEventsCommand {
case t if EVTS_TASK_EXECUTION.contains(t) => "ta"
case t if EVTS_CACHE.contains(t) => "ca"
case t if EVTS_SWAPSPACE.contains(t) => "sw"
- case t if EVTS_CACHE_REBALANCE.contains(t) => "cp"
+ case t if EVTS_CACHE_REBALANCE.contains(t) => "cr"
}
}
@@ -437,7 +437,7 @@ object VisorEventsCommand {
),
spec = List(
"events",
- "events {-id=<node-id>|-id8=<node-id8>} {-e=<ch,de,di,jo,ta,ca,cp,sw>}",
+ "events {-id=<node-id>|-id8=<node-id8>} {-e=<ch,de,di,jo,ta,ca,cr,sw>}",
" {-t=<num>s|m|h|d} {-s=e|t} {-r} {-c=<n>}"
),
args = List(
@@ -452,7 +452,7 @@ object VisorEventsCommand {
"you can also use '@n0' ... '@nn' variables as shortcut to <node-id8>.",
"If called without the arguments - starts in interactive mode."
),
- "-e=<ch,de,di,jo,ta,ca,cp,sw>" -> List(
+ "-e=<ch,de,di,jo,ta,ca,cr,sw>" -> List(
"Comma separated list of event types that should be queried:",
" ch Checkpoint events.",
" de Deployment events.",
@@ -460,7 +460,7 @@ object VisorEventsCommand {
" jo Job execution events.",
" ta Task execution events.",
" ca Cache events.",
- " cp Cache pre-loader events.",
+ " cr Cache rebalance events.",
" sw Swapspace events."
),
"-t=<num>s|m|h|d" -> List(
[44/50] incubator-ignite git commit: IGNITE-651 - Persistance for
marshaller cache
Posted by ak...@apache.org.
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/685209c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/685209c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/685209c6
Branch: refs/heads/ignite-639
Commit: 685209c6e360dc8299e9e5b3227e8e9a7929898b
Parents: 00c934c
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 31 15:37:24 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 31 15:37:24 2015 -0700
----------------------------------------------------------------------
.../ignite/internal/MarshallerContextImpl.java | 31 ++++----------------
...ridCacheContinuousQueryAbstractSelfTest.java | 2 +-
2 files changed, 6 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/685209c6/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index d5a0526..4a27222 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import javax.cache.event.*;
import java.io.*;
-import java.nio.channels.*;
import java.util.concurrent.*;
/**
@@ -125,18 +124,8 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
if (clsName == null) {
File file = new File(workDir, id + ".classname");
- try (
- FileInputStream in = new FileInputStream(file);
- BufferedReader reader = new BufferedReader(new InputStreamReader(in))
- ) {
- FileLock lock = in.getChannel().lock(0, Long.MAX_VALUE, true);
-
- try {
- clsName = reader.readLine();
- }
- finally {
- lock.release();
- }
+ try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+ clsName = reader.readLine();
}
catch (IOException e) {
throw new IgniteCheckedException("Failed to read class name from file [id=" + id +
@@ -173,20 +162,10 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
File file = new File(workDir, evt.getKey() + ".classname");
- try (
- FileOutputStream out = new FileOutputStream(file);
- Writer writer = new OutputStreamWriter(out)
- ) {
- FileLock lock = out.getChannel().lock();
-
- try {
- writer.write(evt.getValue());
+ try (Writer writer = new FileWriter(file)) {
+ writer.write(evt.getValue());
- writer.flush();
- }
- finally {
- lock.release();
- }
+ writer.flush();
}
catch (IOException e) {
U.error(log, "Failed to write class name to file [id=" + evt.getKey() +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/685209c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 27bb4e4..a22e0c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -174,7 +174,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
for (int i = 0; i < gridCount(); i++) {
GridContinuousProcessor proc = grid(i).context().continuous();
- assertEquals(String.valueOf(i), 2, ((Map)U.field(proc, "locInfos")).size());
+ assertEquals(String.valueOf(i), 3, ((Map)U.field(proc, "locInfos")).size());
assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "rmtInfos")).size());
assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "startFuts")).size());
assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "waitForStartAck")).size());
[49/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Posted by ak...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e217256
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e217256
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e217256
Branch: refs/heads/ignite-639
Commit: 8e21725698cf60cb9c28b8a565e6739246d90fd3
Parents: 002e395 0dfb5c0
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 1 13:11:21 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 1 13:11:21 2015 +0700
----------------------------------------------------------------------
DEVNOTES.txt | 6 +
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../ignite/internal/GridKernalContextImpl.java | 12 +-
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 12 +-
.../org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../internal/MarshallerContextAdapter.java | 6 +-
.../ignite/internal/MarshallerContextImpl.java | 90 ++++-
.../internal/client/GridClientCacheFlag.java | 13 -
.../impl/connection/GridClientConnection.java | 9 -
.../internal/managers/GridManagerAdapter.java | 4 +
.../cache/CacheConflictResolutionManager.java | 30 ++
.../internal/processors/cache/CacheFlag.java | 108 ------
.../processors/cache/CacheFlagException.java | 67 ----
.../cache/CacheOsConflictResolutionManager.java | 58 +++
.../processors/cache/CacheProjection.java | 233 +-----------
.../internal/processors/cache/GridCache.java | 3 -
.../processors/cache/GridCacheAdapter.java | 271 +++-----------
.../cache/GridCacheConcurrentMap.java | 44 +--
.../processors/cache/GridCacheContext.java | 241 ++-----------
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 27 +-
.../processors/cache/GridCacheProcessor.java | 28 +-
.../processors/cache/GridCacheProjectionEx.java | 29 --
.../cache/GridCacheProjectionImpl.java | 357 +++----------------
.../processors/cache/GridCacheProxyImpl.java | 55 +--
.../cache/GridCacheSharedContext.java | 21 --
.../processors/cache/IgniteCacheProxy.java | 31 +-
.../CacheDataStructuresManager.java | 4 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 3 +-
.../dht/atomic/GridDhtAtomicCache.java | 32 --
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 -
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++--
.../dht/colocated/GridDhtColocatedCache.java | 2 -
.../colocated/GridDhtDetachedCacheEntry.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 5 +-
.../distributed/near/GridNearCacheAdapter.java | 9 -
.../distributed/near/GridNearGetFuture.java | 3 +-
.../near/GridNearTransactionalCache.java | 2 -
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 ++++++
.../cache/dr/os/GridOsCacheDrManager.java | 111 ------
.../local/atomic/GridLocalAtomicCache.java | 74 +---
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../continuous/CacheContinuousQueryHandler.java | 5 -
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 5 +-
.../transactions/IgniteTxLocalAdapter.java | 19 +-
.../cache/transactions/IgniteTxManager.java | 2 -
.../version/CacheVersionConflictResolver.java | 40 +++
...ridCacheVersionAbstractConflictResolver.java | 56 ---
.../GridCacheVersionConflictResolver.java | 59 ---
.../datastreamer/DataStreamerImpl.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 13 +-
.../datastructures/GridCacheAtomicLongImpl.java | 14 +-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 66 ++--
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../ignite/marshaller/MarshallerContext.java | 3 +-
.../optimized/OptimizedMarshallerUtils.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java | 13 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +-
.../GridProjectionForCachesSelfTest.java | 12 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 +-
.../cache/GridCacheAbstractFlagsTest.java | 97 -----
.../cache/GridCacheAbstractFullApiSelfTest.java | 61 +++-
.../cache/GridCachePutAllFailoverSelfTest.java | 26 +-
.../GridCacheReturnValueTransferSelfTest.java | 36 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 38 +-
...GridCacheValueConsistencyAtomicSelfTest.java | 101 ------
.../near/GridCachePartitionedFlagsTest.java | 41 ---
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridCacheReplicatedFlagsTest.java | 28 --
...ridCacheContinuousQueryAbstractSelfTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../GridServiceReassignmentSelfTest.java | 5 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../loadtests/hashmap/GridCacheTestContext.java | 6 +-
.../OptimizedMarshallerNodeFailoverTest.java | 71 +++-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../testframework/GridSpiTestContext.java | 18 +-
.../testframework/junits/GridAbstractTest.java | 28 +-
.../junits/GridTestKernalContext.java | 2 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/spi/GridSpiAbstractTest.java | 13 +-
.../IgniteCacheFailoverTestSuite.java | 8 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 --
.../commands/disco/VisorDiscoveryCommand.scala | 8 +-
.../commands/events/VisorEventsCommand.scala | 24 +-
.../commands/tasks/VisorTasksCommand.scala | 6 +-
parent/pom.xml | 38 +-
120 files changed, 981 insertions(+), 2460 deletions(-)
----------------------------------------------------------------------
[39/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-629-1' into ignite-sprint-3
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-629-1' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6b3380f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6b3380f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6b3380f
Branch: refs/heads/ignite-639
Commit: c6b3380f6391e92584bfeb6d3b2fe28edb0ebbe5
Parents: 7aba4ba 79c76cd
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 17:31:53 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 17:31:53 2015 +0300
----------------------------------------------------------------------
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../internal/client/GridClientCacheFlag.java | 13 --
.../impl/connection/GridClientConnection.java | 9 -
.../internal/processors/cache/CacheFlag.java | 108 ---------
.../processors/cache/CacheFlagException.java | 67 ------
.../processors/cache/CacheProjection.java | 209 +----------------
.../internal/processors/cache/GridCache.java | 3 -
.../processors/cache/GridCacheAdapter.java | 211 ++++--------------
.../cache/GridCacheConcurrentMap.java | 44 +---
.../processors/cache/GridCacheContext.java | 222 +------------------
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 27 +--
.../processors/cache/GridCacheProjectionEx.java | 20 --
.../cache/GridCacheProjectionImpl.java | 77 ++-----
.../processors/cache/GridCacheProxyImpl.java | 36 +--
.../cache/GridCacheSharedContext.java | 21 --
.../processors/cache/IgniteCacheProxy.java | 29 +--
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 32 ---
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 -
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++-----
.../dht/colocated/GridDhtColocatedCache.java | 2 -
.../colocated/GridDhtDetachedCacheEntry.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 2 -
.../distributed/near/GridNearCacheAdapter.java | 9 -
.../near/GridNearTransactionalCache.java | 2 -
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 74 +------
.../continuous/CacheContinuousQueryHandler.java | 5 -
.../transactions/IgniteTransactionsImpl.java | 1 -
.../transactions/IgniteTxLocalAdapter.java | 6 +-
.../cache/transactions/IgniteTxManager.java | 2 -
.../datastreamer/DataStreamerImpl.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 13 +-
.../datastructures/GridCacheAtomicLongImpl.java | 14 +-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 66 +++---
.../cache/GridCacheAbstractFlagsTest.java | 97 --------
.../cache/GridCacheAbstractFullApiSelfTest.java | 61 ++++-
.../GridCacheReturnValueTransferSelfTest.java | 36 +--
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
...GridCacheValueConsistencyAtomicSelfTest.java | 101 ---------
.../near/GridCachePartitionedFlagsTest.java | 41 ----
.../GridCacheReplicatedFlagsTest.java | 28 ---
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 ---
61 files changed, 278 insertions(+), 1629 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
[28/50] incubator-ignite git commit: #IGNITE-443 Fixed review notes.
Posted by ak...@apache.org.
#IGNITE-443 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4cf4de6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4cf4de6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4cf4de6c
Branch: refs/heads/ignite-639
Commit: 4cf4de6c359871e9e32f4bf8b1d7341d823f0bce
Parents: da1b89f
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 13:04:28 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 13:04:28 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContextImpl.java | 4 +-
.../cache/CacheConflictResolutionManager.java | 30 ++++++++++
.../cache/CacheConflictResolverManager.java | 30 ----------
.../cache/CacheOsConflictResolutionManager.java | 58 ++++++++++++++++++++
.../cache/CacheOsConflictResolverManager.java | 58 --------------------
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../loadtests/hashmap/GridCacheTestContext.java | 2 +-
8 files changed, 94 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/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 ee82950..3bee762 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
@@ -790,8 +790,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
return (T)new GridOsCacheDrManager();
else if (cls.equals(IgniteCacheObjectProcessor.class))
return (T)new IgniteCacheObjectProcessorImpl(this);
- else if (cls.equals(CacheConflictResolverManager.class))
- return (T)new CacheOsConflictResolverManager<>();
+ else if (cls.equals(CacheConflictResolutionManager.class))
+ return (T)new CacheOsConflictResolutionManager<>();
throw new IgniteException("Unsupported component type: " + cls);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
new file mode 100644
index 0000000..6d65d82
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
@@ -0,0 +1,30 @@
+/*
+ * 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.internal.processors.cache.version.*;
+
+/**
+ * Conflict resolver manager.
+ */
+public interface CacheConflictResolutionManager<K, V> extends GridCacheManager<K, V> {
+ /**
+ * @return Cache conflict resolver.
+ */
+ public CacheVersionConflictResolver conflictResolver();
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
deleted file mode 100644
index 73b98eb..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.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.processors.cache;
-
-import org.apache.ignite.internal.processors.cache.version.*;
-
-/**
- * Conflict resolver manager.
- */
-public interface CacheConflictResolverManager<K, V> extends GridCacheManager<K, V> {
- /**
- * @return Cache conflict resolver.
- */
- public CacheVersionConflictResolver conflictResolver();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
new file mode 100644
index 0000000..2835753
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
@@ -0,0 +1,58 @@
+/*
+ * 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.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.version.*;
+
+/**
+ * OS conflict resolver manager.
+ */
+public class CacheOsConflictResolutionManager<K ,V> implements CacheConflictResolutionManager<K, V> {
+ /**
+ * @return Cache conflict resolver.
+ */
+ @Override public CacheVersionConflictResolver conflictResolver() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start(GridCacheContext<K, V> cctx) throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void stop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStart() throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void printMemoryStats() {
+ // No-op.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
deleted file mode 100644
index 2f6aacd..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
+++ /dev/null
@@ -1,58 +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.processors.cache;
-
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.processors.cache.version.*;
-
-/**
- * OS conflict resolver manager.
- */
-public class CacheOsConflictResolverManager<K ,V> implements CacheConflictResolverManager<K, V> {
- /**
- * @return Cache conflict resolver.
- */
- @Override public CacheVersionConflictResolver conflictResolver() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public void start(GridCacheContext<K, V> cctx) throws IgniteCheckedException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void stop(boolean cancel) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStop(boolean cancel) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void printMemoryStats() {
- // No-op.
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/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 8f202a8..434d9e0 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
@@ -136,7 +136,7 @@ public class GridCacheContext<K, V> implements Externalizable {
private CacheJtaManagerAdapter jtaMgr;
/** Conflict resolver manager. */
- private CacheConflictResolverManager rslvrMgr;
+ private CacheConflictResolutionManager rslvrMgr;
/** Managers. */
private List<GridCacheManager<K, V>> mgrs = new LinkedList<>();
@@ -247,7 +247,7 @@ public class GridCacheContext<K, V> implements Externalizable {
GridCacheTtlManager ttlMgr,
GridCacheDrManager drMgr,
CacheJtaManagerAdapter jtaMgr,
- CacheConflictResolverManager<K, V> rslvrMgr
+ CacheConflictResolutionManager<K, V> rslvrMgr
) {
assert ctx != null;
assert sharedCtx != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/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 4b0955f..870f0d0 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
@@ -1014,7 +1014,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager();
GridCacheTtlManager ttlMgr = new GridCacheTtlManager();
GridCacheDrManager drMgr = ctx.createComponent(GridCacheDrManager.class);
- CacheConflictResolverManager rslvrMgr = ctx.createComponent(CacheConflictResolverManager.class);
+ CacheConflictResolutionManager rslvrMgr = ctx.createComponent(CacheConflictResolutionManager.class);
GridCacheStoreManager storeMgr = new GridCacheStoreManager(ctx, sesHolders, cfgStore, cfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index 187616e..90b6b1f 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@ -70,7 +70,7 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> {
new GridCacheTtlManager(),
new GridOsCacheDrManager(),
new CacheNoopJtaManager(),
- new CacheOsConflictResolverManager<K, V>()
+ new CacheOsConflictResolutionManager<K, V>()
);
}
}
[12/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-629-1
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1617648e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1617648e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1617648e
Branch: refs/heads/ignite-639
Commit: 1617648e448c3842b64261457b9b9fce0eca80f3
Parents: 6047580 c2f5211
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 10:41:18 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 10:41:18 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 6 ++++++
.../visor/cache/VisorCacheStoreConfiguration.java | 18 +++++++++++-------
2 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[17/50] incubator-ignite git commit: #IGNITE-443 Fixed code style.
Posted by ak...@apache.org.
#IGNITE-443 Fixed code style.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d014b82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d014b82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d014b82
Branch: refs/heads/ignite-639
Commit: 2d014b8299b88bf8c773500cf8938cbe69b8b4ec
Parents: 82b3419
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 11:36:41 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 11:36:41 2015 +0300
----------------------------------------------------------------------
.../processors/cache/version/CacheVersionConflictResolver.java | 3 ++-
.../cache/version/CacheVersionConflictResolverImpl.java | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d014b82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
index f570634..1fe4c9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
@@ -35,5 +35,6 @@ public interface CacheVersionConflictResolver {
public <K, V> GridCacheVersionConflictContext<K, V> resolve(
GridCacheVersionedEntryEx<K, V> oldEntry,
GridCacheVersionedEntryEx<K, V> newEntry,
- boolean atomicVerComparator) throws IgniteCheckedException;
+ boolean atomicVerComparator
+ ) throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d014b82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
index 175a451..9f316a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java
@@ -28,7 +28,8 @@ public class CacheVersionConflictResolverImpl implements CacheVersionConflictRes
@Override public <K, V> GridCacheVersionConflictContext<K, V> resolve(
GridCacheVersionedEntryEx<K, V> oldEntry,
GridCacheVersionedEntryEx<K, V> newEntry,
- boolean atomicVerComparator) throws IgniteCheckedException {
+ boolean atomicVerComparator
+ ) throws IgniteCheckedException {
GridCacheVersionConflictContext<K, V> ctx = new GridCacheVersionConflictContext<>(oldEntry, newEntry);
resolve0(ctx, oldEntry, newEntry, atomicVerComparator);
@@ -49,7 +50,8 @@ public class CacheVersionConflictResolverImpl implements CacheVersionConflictRes
GridCacheVersionConflictContext<K, V> ctx,
GridCacheVersionedEntryEx<K, V> oldEntry,
GridCacheVersionedEntryEx<K, V> newEntry,
- boolean atomicVerComparator) throws IgniteCheckedException {
+ boolean atomicVerComparator
+ ) throws IgniteCheckedException {
if (newEntry.dataCenterId() != oldEntry.dataCenterId())
ctx.useNew();
else {
[10/50] incubator-ignite git commit: # sprint-3 - updated dev notes.
Posted by ak...@apache.org.
# sprint-3 - updated dev notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2f52114
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2f52114
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2f52114
Branch: refs/heads/ignite-639
Commit: c2f5211420893331813c77fb8a377e6397958690
Parents: 768ca6a
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Tue Mar 31 00:19:36 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Tue Mar 31 00:19:36 2015 -0700
----------------------------------------------------------------------
DEVNOTES.txt | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2f52114/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 54dbf72..2e8e431 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -23,3 +23,9 @@ To check license headers use:
mvn clean validate -Pcheck-licenses
For more information (e.g. exclude list) see "check-licenses" profile in pom.xml.
+
+
+Useful Release Commands
+========================
+ZIP: zip -r9 apache-ignite-X.X.X-src apache-ignite-X.X.X-src.zip
+PGP: gpg --armor --output apache-ignite-X.X.X-src.zip.asc --detach-sig apache-ignite-X.X.X-src.zip
[13/50] incubator-ignite git commit: # ignite-629-1
Posted by ak...@apache.org.
# ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a9996d8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9996d8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9996d8f
Branch: refs/heads/ignite-639
Commit: a9996d8fdb2ae5ecbf1a56b88a4161f5d8bcf5de
Parents: 1617648
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 11:01:37 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 11:01:37 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/client/impl/ClientCacheFlagsCodecTest.java | 1 +
.../ignite/internal/processors/cache/CacheProjection.java | 4 ++--
.../ignite/internal/processors/cache/GridCacheContext.java | 2 +-
.../internal/processors/cache/GridCacheProjectionImpl.java | 5 ++++-
.../processors/cache/local/atomic/GridLocalAtomicCache.java | 1 +
.../java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 1 -
.../processors/cache/IgniteCacheInvokeAbstractTest.java | 4 ----
7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 973a0a3..9f177d7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -44,6 +44,7 @@ public class ClientCacheFlagsCodecTest extends TestCase {
assertTrue(bits != 0);
boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
+
assertEquals(out, true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 6189d6b..d4f1ec0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -241,8 +241,8 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> {
public CacheProjection<K, V> projection(@Nullable CacheEntryPredicate filter);
/**
- * @param skipStore Skip store.
- * @return New projection based on this one, but with skip store.
+ * @param skipStore Skip store flag.
+ * @return New projection based on this one, but with skip store flag enabled.
*/
public CacheProjection<K, V> setSkipStore(boolean skipStore);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/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 bec175a..7fae62f 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
@@ -1225,7 +1225,7 @@ public class GridCacheContext<K, V> implements Externalizable {
}
/**
- * @return {@code true} if the skip store is set.
+ * @return {@code true} if the skip store flag is set.
*/
public boolean skipStore() {
if (nearContext())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/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 3517b42..eea665a 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
@@ -89,7 +89,10 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
* @param parent Parent projection.
* @param cctx Cache context.
* @param entryFilter Entry filter.
- * @param skipStore Skip store.
+ * @param skipStore Skip store flag.
+ * @param subjId Subject ID.
+ * @param keepPortable Keep portable flag.
+ * @param expiryPlc Expiry policy.
*/
@SuppressWarnings({"unchecked", "TypeMayBeWeakened"})
public GridCacheProjectionImpl(
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/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 80ef55c..a9a6f23 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
@@ -508,6 +508,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
* @param storeEnabled Store enabled flag.
* @param taskName Task name.
* @param deserializePortable Deserialize portable .
+ * @param skipVals Skip value flag.
* @return Key-value map.
* @throws IgniteCheckedException If failed.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index 8d4a350..c4683fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -96,7 +96,6 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest {
startGrid(gridCount() - 1);
startGrid(gridCount());
- awaitPartitionMapExchange();
GRID_CNT += 1;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
index a91aca7..102604e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
@@ -55,8 +55,6 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
invoke(cache, OPTIMISTIC);
}
- else if (gridCount() > 1)
- invoke(cache, null);
}
/**
@@ -181,8 +179,6 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
invokeAll(cache, OPTIMISTIC);
}
- else if (gridCount() > 1)
- invokeAll(cache, null);
}
/**
[29/50] incubator-ignite git commit: # ignite-629-1
Posted by ak...@apache.org.
# ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67bb43aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67bb43aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67bb43aa
Branch: refs/heads/ignite-639
Commit: 67bb43aaf1a233393e5d88bdc60161b454c0939a
Parents: a4f580e
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 13:36:21 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 13:36:21 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 3 ---
.../processors/cache/GridCacheConcurrentMap.java | 18 ++++++++++++++++--
.../processors/cache/IgniteCacheProxy.java | 2 --
3 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/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 c3a1225..8c6bfd6 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
@@ -402,7 +402,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this,
ctx,
- null,
false,
null,
false,
@@ -427,7 +426,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return new GridCacheProjectionImpl<>(
(CacheProjection<K1, V1>)this,
(GridCacheContext<K1, V1>)ctx,
- null,
false,
null,
true,
@@ -445,7 +443,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return new GridCacheProjectionImpl<>(
this,
ctx,
- null,
false,
null,
false,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 51df644..ba6a7f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1744,7 +1744,12 @@ public class GridCacheConcurrentMap {
curVal = null;
try {
- ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
+ CacheProjection prj = ctx.projectionPerCall();
+
+ if (prj != null)
+ prj.removex(e.key());
+ else
+ ((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key());
}
catch (IgniteCheckedException ex) {
throw new IgniteException(ex);
@@ -2021,7 +2026,16 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public void remove() {
- it.remove();
+ GridCacheProjectionImpl<K, V> oldPrj = ctx.projectionPerCall();
+
+ ctx.projectionPerCall(prjPerCall);
+
+ try {
+ it.remove();
+ }
+ finally {
+ ctx.projectionPerCall(oldPrj);
+ }
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 364b1c3..dfc3ef4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -1414,8 +1414,6 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
GridCacheProjectionImpl<K, V> prj0 = new GridCacheProjectionImpl<>(
(prj != null ? prj : delegate),
ctx,
- null,
- prj != null ? prj.subjectId() : null,
true,
prj != null ? prj.subjectId() : null,
prj != null && prj.isKeepPortable(),
[26/50] incubator-ignite git commit: # ignite-629-1
Posted by ak...@apache.org.
# ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5fd9ded9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fd9ded9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fd9ded9
Branch: refs/heads/ignite-639
Commit: 5fd9ded9336d3dd8cc0da3e88f548de8fb57c12c
Parents: 5b6700f
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 12:53:34 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 12:53:34 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 6 ++++--
.../cache/GridCacheAbstractFullApiSelfTest.java | 10 +++++-----
.../GridCacheReturnValueTransferSelfTest.java | 18 ++----------------
3 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/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 db1fd12..00ab5719 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
@@ -4155,6 +4155,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
if (!ctx.isSwapOrOffheapEnabled() && ctx.kernalContext().discovery().size() == 1)
return localIteratorHonorExpirePolicy();
+ final GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall();
+
CacheQueryFuture<Map.Entry<K, V>> fut = queries().createScanQuery(null)
.keepAll(false)
.execute();
@@ -4165,7 +4167,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
@Override protected void remove(Cache.Entry<K, V> item) {
- ctx.gate().enter();
+ GridCacheProjectionImpl<K, V> prev = ctx.gate().enter(prj);
try {
removex(item.getKey());
@@ -4174,7 +4176,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
throw CU.convertToCacheException(e);
}
finally {
- ctx.gate().leave();
+ ctx.gate().leave(prev);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 1a8bdcd..d5c279b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4310,19 +4310,19 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
Cache.Entry<String, Integer> entry = it.next();
- String removedKey = entry.getKey();
+ String rmvKey = entry.getKey();
- assertTrue(map.containsKey(removedKey));
+ assertTrue(map.containsKey(rmvKey));
it.remove();
- assertNull(cacheSkipStore.get(removedKey));
+ assertNull(cacheSkipStore.get(rmvKey));
- assertTrue(map.containsKey(removedKey));
+ assertTrue(map.containsKey(rmvKey));
}
/**
- *
+ * @return Cache start mode.
*/
protected CacheStartMode cacheStartType() {
String mode = System.getProperty("cache.start.mode");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 4761e21..0dd23a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -71,21 +71,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
- */
- public void testTransformAtomicPrimaryNoBackups() throws Exception {
- checkTransform(ATOMIC, PRIMARY, 0);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTransformAtomicClockNoBackups() throws Exception {
- checkTransform(ATOMIC, CLOCK, 0);
- }
-
- /**
- * @throws Exception If failed.
- * TODO gg-8273 enable when fixed
+ * TODO IGNITE-581 enable when fixed
*/
public void _testTransformTransactionalNoBackups() throws Exception {
checkTransform(TRANSACTIONAL, PRIMARY, 0);
@@ -93,7 +79,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
- * TODO gg-8273 enable when fixed
+ * TODO IGNITE-581 enable when fixed
*/
public void _testTransformTransactionalOneBackup() throws Exception {
checkTransform(TRANSACTIONAL, PRIMARY, 1);
[50/50] incubator-ignite git commit: # IGNITE-639 WIP.
Posted by ak...@apache.org.
# IGNITE-639 WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6011305b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6011305b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6011305b
Branch: refs/heads/ignite-639
Commit: 6011305b72610eb42290d090ccbf674324df5ddd
Parents: 8e21725
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 1 15:32:10 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 1 15:32:10 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteEx.java | 8 +
.../apache/ignite/internal/IgniteKernal.java | 5 +
.../visor/cache/VisorCacheConfiguration.java | 17 +-
.../cache/VisorCacheMetricsCollectorTask.java | 75 +++-
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 +
.../commands/cache/VisorCacheCommand.scala | 374 ++++++++++---------
6 files changed, 296 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6011305b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index b8c1e11..6604050 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -69,6 +69,14 @@ public interface IgniteEx extends Ignite {
public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super GridCache<?, ?>>... p);
/**
+ * Gets system state of cache with specified name.
+ *
+ * @param name Cache name.
+ * @return {@code true} if cache with specified name is system.
+ */
+ public boolean systemCache(@Nullable String name);
+
+ /**
* Checks if the event type is user-recordable.
*
* @param type Event type to check.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6011305b/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 5f35d16..c8cd372 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
@@ -2448,6 +2448,11 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
/** {@inheritDoc} */
+ @Override public boolean systemCache(@Nullable String name) {
+ return ctx.cache().systemCache(name);
+ }
+
+ /** {@inheritDoc} */
@Override public <K, V> GridCache<K, V> cachex() {
guard();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6011305b/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 98a8bc2..7afdb0d 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
@@ -17,9 +17,9 @@
package org.apache.ignite.internal.visor.cache;
-import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -116,12 +116,15 @@ public class VisorCacheConfiguration implements Serializable {
/** Query configuration. */
private VisorCacheQueryConfiguration qryCfg;
+ /** System cache state. */
+ private boolean system;
+
/**
* @param ignite Grid.
* @param ccfg Cache configuration.
* @return Data transfer object for cache configuration properties.
*/
- public static VisorCacheConfiguration from(Ignite ignite, CacheConfiguration ccfg) {
+ public static VisorCacheConfiguration from(IgniteEx ignite, CacheConfiguration ccfg) {
VisorCacheConfiguration cfg = new VisorCacheConfiguration();
cfg.name = ccfg.getName();
@@ -144,6 +147,7 @@ public class VisorCacheConfiguration implements Serializable {
cfg.ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
cfg.writerFactory = compactClass(ccfg.getCacheWriterFactory());
cfg.expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
+ cfg.system = ignite.systemCache(ccfg.getName());
cfg.affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
cfg.rebalanceCfg = VisorCacheRebalanceConfiguration.from(ccfg);
@@ -161,7 +165,7 @@ public class VisorCacheConfiguration implements Serializable {
* @param caches Cache configurations.
* @return Data transfer object for cache configurations properties.
*/
- public static Iterable<VisorCacheConfiguration> list(Ignite ignite, CacheConfiguration[] caches) {
+ public static Iterable<VisorCacheConfiguration> list(IgniteEx ignite, CacheConfiguration[] caches) {
if (caches == null)
return Collections.emptyList();
@@ -369,6 +373,13 @@ public class VisorCacheConfiguration implements Serializable {
return qryCfg;
}
+ /**
+ * @return System cache state.
+ */
+ public boolean system() {
+ return system;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCacheConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6011305b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index de232f7..f29d47a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -26,19 +26,21 @@ import org.apache.ignite.internal.visor.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
+import java.io.*;
import java.util.*;
/**
* Task that collect cache metrics from all nodes.
*/
@GridInternal
-public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiTuple<Boolean, String>,
- Iterable<VisorCacheAggregatedMetrics>, Map<String, VisorCacheMetrics>> {
+public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<
+ VisorCacheMetricsCollectorTask.VisorCacheMetricsCollectorArg, Iterable<VisorCacheAggregatedMetrics>,
+ Map<String, VisorCacheMetrics>> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorCacheMetricsCollectorJob job(IgniteBiTuple<Boolean, String> arg) {
+ @Override protected VisorCacheMetricsCollectorJob job(VisorCacheMetricsCollectorArg arg) {
return new VisorCacheMetricsCollectorJob(arg, debug);
}
@@ -72,7 +74,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
* Job that collect cache metrics from node.
*/
private static class VisorCacheMetricsCollectorJob
- extends VisorJob<IgniteBiTuple<Boolean, String>, Map<String, VisorCacheMetrics>> {
+ extends VisorJob<VisorCacheMetricsCollectorArg, Map<String, VisorCacheMetrics>> {
/** */
private static final long serialVersionUID = 0L;
@@ -82,15 +84,15 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
* @param arg Whether to collect metrics for all caches or for specified cache name only.
* @param debug Debug flag.
*/
- private VisorCacheMetricsCollectorJob(IgniteBiTuple<Boolean, String> arg, boolean debug) {
+ private VisorCacheMetricsCollectorJob(VisorCacheMetricsCollectorArg arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected Map<String, VisorCacheMetrics> run(IgniteBiTuple<Boolean, String> arg) {
- Collection<? extends GridCache<?, ?>> caches = arg.get1()
- ? ignite.cachesx()
- : F.asList(ignite.cachex(arg.get2()));
+ @Override protected Map<String, VisorCacheMetrics> run(final VisorCacheMetricsCollectorArg arg) {
+ Collection<? extends GridCache<?, ?>> caches = arg.allCaches
+ ? ignite.cachesx(new VisorSystemCachesPredicate(arg.systemCaches))
+ : F.asList(ignite.cachex(arg.cacheName));
if (caches != null) {
Map<String, VisorCacheMetrics> res = U.newHashMap(caches.size());
@@ -109,4 +111,59 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
return S.toString(VisorCacheMetricsCollectorJob.class, this);
}
}
+
+ /**
+ * Arguments for {@link VisorCacheMetricsCollectorTask}.
+ */
+ @SuppressWarnings("PublicInnerClass")
+ public static class VisorCacheMetricsCollectorArg implements Serializable {
+ /** Collect metrics for all caches. */
+ private final Boolean allCaches;
+
+ /** Include system cache metrics. */
+ private final Boolean systemCaches;
+
+ /** Collect metrics for cache with name only. */
+ private final String cacheName;
+
+ /**
+ * Create task arguments with given parameters.
+ *
+ * @param allCaches Collect metrics for all caches.
+ * @param systemCaches Include system cache metrics.
+ * @param cacheName Collect metrics for cache with name only.
+ */
+ public VisorCacheMetricsCollectorArg(Boolean allCaches, Boolean systemCaches, String cacheName) {
+ this.allCaches = allCaches;
+ this.systemCaches = systemCaches;
+ this.cacheName = cacheName;
+ }
+
+ /** @return Collect metrics for all caches. */
+ public Boolean allCaches() {
+ return allCaches;
+ }
+
+ /** @return Include system cache metrics. */
+ public Boolean systemCaches() {
+ return systemCaches;
+ }
+
+ /** @return Collect metrics for cache with name only. */
+ public String cacheName() {
+ return cacheName;
+ }
+ }
+
+ private static class VisorSystemCachesPredicate implements IgnitePredicate<GridCache<?,?>> {
+ private final Boolean showSystem;
+
+ VisorSystemCachesPredicate(Boolean showSystem) {
+ this.showSystem = showSystem;
+ }
+
+ @Override public boolean apply(GridCache<?, ?> cache) {
+ return showSystem || !CU.isSystemCache(cache.name());
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6011305b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
index 7075f2e..bd84be2 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
@@ -961,6 +961,11 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes
}
/** {@inheritDoc} */
+ @Override public boolean systemCache(@Nullable String name) {
+ return false;
+ }
+
+ /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super GridCache<?, ?>>... p) {
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6011305b/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 e11c197..53792f1 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
@@ -21,7 +21,6 @@ import org.apache.ignite._
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.internal.processors.cache.{GridCacheUtils => CU}
import org.apache.ignite.internal.util.typedef._
-import org.apache.ignite.lang.IgniteBiTuple
import org.apache.ignite.visor.VisorTag
import org.apache.ignite.visor.commands.cache.VisorCacheCommand._
import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}
@@ -32,13 +31,13 @@ import org.jetbrains.annotations._
import java.lang.{Boolean => JavaBoolean}
import java.util.UUID
+import org.apache.ignite.internal.visor.cache.VisorCacheMetricsCollectorTask.VisorCacheMetricsCollectorArg
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 scala.collection.JavaConversions._
import scala.language.{implicitConversions, reflectiveCalls}
-import scala.util.control.Breaks._
/**
* ==Overview==
@@ -67,11 +66,11 @@ import scala.util.control.Breaks._
*
* ====Specification====
* {{{
- * cache
- * cache -i
- * cache {-c=<cache-name>} {-id=<node-id>|id8=<node-id8>} {-s=hi|mi|rd|wr|cn} {-a} {-r}
+ * cache {-system}
+ * cache -i {-system}
+ * cache {-c=<cache-name>} {-id=<node-id>|id8=<node-id8>} {-s=hi|mi|rd|wr|cn} {-a} {-r} {-system}
* cache -clear {-c=<cache-name>}
- * cache -scan -c=<cache-name> {-id=<node-id>|id8=<node-id8>} {-p=<page size>}
+ * cache -scan -c=<cache-name> {-id=<node-id>|id8=<node-id8>} {-p=<page size>} {-system}
* cache -swap {-c=<cache-name>} {-id=<node-id>|id8=<node-id8>}
* cache -stop -c=<cache-name>
* }}}
@@ -105,6 +104,8 @@ import scala.util.control.Breaks._
* -a
* Prints details statistics about each cache.
* By default only aggregated summary is printed.
+ * -system
+ * Enable showing of information about system caches.
* -clear
* Clears cache.
* -scan
@@ -122,6 +123,8 @@ import scala.util.control.Breaks._
* ====Examples====
* {{{
* cache
+ * Prints summary statistics about all no system caches.
+ * cache -system
* Prints summary statistics about all caches.
* cache -id8=12345678 -s=hi -r
* Prints summary statistics about caches from node with specified id8
@@ -212,213 +215,227 @@ class VisorCacheCommand {
* @param args Command arguments.
*/
def cache(args: String) {
- breakable {
- if (!isConnected)
- adviseToConnect()
- else {
- var argLst = parseArgs(args)
-
- if (hasArgFlag("i", argLst)) {
- askForNode("Select node from:") match {
- case Some(nid) => ask("Detailed statistics (y/n) [n]: ", "n") match {
- case "n" | "N" => nl(); cache("-id=" + nid).^^
- case "y" | "Y" => nl(); cache("-a -id=" + nid).^^
- case x => nl(); warn("Invalid answer: " + x).^^
- }
- case None => break()
+ if (!isConnected)
+ adviseToConnect()
+ else {
+ var argLst = parseArgs(args)
+
+ if (hasArgFlag("i", argLst)) {
+ askForNode("Select node from:") match {
+ case Some(nid) => ask("Detailed statistics (y/n) [n]: ", "n") match {
+ case "n" | "N" => nl(); cache("-id=" + nid).^^
+ case "y" | "Y" => nl(); cache("-a -id=" + nid).^^
+ case x => nl(); warn("Invalid answer: " + x).^^
}
-
- break()
- }
-
- val node = parseNode(argLst) match {
- case Left(msg) =>
- scold(msg)
-
- break()
-
- case Right(n) => n
+ case None => return
}
- var cacheName = argValue("c", argLst) match {
- 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
- }
+ return
+ }
- if (Seq("clear", "swap", "scan", "stop").exists(hasArgFlag(_, argLst))) {
- if (cacheName.isEmpty)
- askForCache("Select cache from:", node) match {
- case Some(name) =>
- argLst = argLst ++ Seq("c" -> name)
+ val node = parseNode(argLst) match {
+ case Left(msg) =>
+ scold(msg)
- cacheName = Some(name)
- case None => break()
- }
+ return
- if (hasArgFlag("clear", argLst))
- VisorCacheClearCommand().clear(argLst, node)
- else if (hasArgFlag("swap", argLst))
- VisorCacheSwapCommand().swap(argLst, node)
- else if (hasArgFlag("scan", argLst))
- VisorCacheScanCommand().scan(argLst, node)
- else if (hasArgFlag("stop", argLst)) {
- cacheName.foreach(name => {
- if (!CU.isSystemCache(name))
- VisorCacheStopCommand().scan(argLst, node)
- else
- warn("Stopping of system cache is not allowed: " + name)
- })
- }
+ case Right(n) => n
+ }
- break()
- }
+ val showSystem = hasArgFlag("system", argLst)
- val all = hasArgFlag("a", argLst)
+ var cacheName = argValue("c", argLst) match {
+ case Some(dfltName) if dfltName == DFLT_CACHE_KEY || dfltName == DFLT_CACHE_NAME =>
+ argLst = argLst.filter(_._1 != "c") ++ Seq("c" -> null)
- val sortType = argValue("s", argLst)
- val reversed = hasArgName("r", argLst)
+ Some(null)
- if (sortType.isDefined && !isValidSortType(sortType.get))
- scold("Invalid '-s' argument in: " + args).^^
+ case cn => cn
+ }
- // Get cache stats data from all nodes.
- val aggrData = cacheData(node, cacheName)
+ /** Check that argument list has flag from list. */
+ def hasArgFlagIn(flags: String *) = {
+ flags.exists(hasArgFlag(_, argLst))
+ }
- if (aggrData.isEmpty)
- scold("No caches found.").^^
+ if (hasArgFlagIn("clear", "swap", "scan", "stop")) {
+ if (cacheName.isEmpty)
+ askForCache("Select cache from:", node, showSystem && !hasArgFlagIn("clear", "swap", "stop")) match {
+ case Some(name) =>
+ argLst = argLst ++ Seq("c" -> name)
- println("Time of the snapshot: " + formatDateTime(System.currentTimeMillis))
+ cacheName = Some(name)
- val sumT = VisorTextTable()
+ case None => return
+ }
- sumT #= ("Name(@)", "Nodes", "Entries", "Hits", "Misses", "Reads", "Writes")
+ cacheName.foreach(name => {
+ if (hasArgFlag("scan", argLst))
+ VisorCacheScanCommand().scan(argLst, node)
+ else {
+ if (!CU.isSystemCache(name)) {
+ if (hasArgFlag("clear", argLst))
+ VisorCacheClearCommand().clear(argLst, node)
+ else if (hasArgFlag("swap", argLst))
+ VisorCacheSwapCommand().swap(argLst, node)
+ else if (hasArgFlag("stop", argLst))
+ VisorCacheStopCommand().scan(argLst, node)
+ }
+ else {
+ if (hasArgFlag("clear", argLst))
+ warn("Clearing of system cache is not allowed: " + name)
+ else if (hasArgFlag("swap", argLst))
+ warn("Backup swapping of system cache is not allowed: " + name)
+ else if (hasArgFlag("stop", argLst))
+ warn("Stopping of system cache is not allowed: " + name)
+ }
+ }
+ })
- sortAggregatedData(aggrData, sortType.getOrElse("cn"), reversed).foreach(
- ad => {
- // Add cache host as visor variable.
- registerCacheName(ad.cacheName)
+ return
+ }
- sumT += (
- mkCacheName(ad.cacheName),
- ad.nodes,
- (
- "min: " + ad.minimumSize,
- "avg: " + formatDouble(ad.averageSize),
- "max: " + ad.maximumSize
- ),
- (
- "min: " + ad.minimumHits,
- "avg: " + formatDouble(ad.averageHits),
- "max: " + ad.maximumHits
- ),
- (
- "min: " + ad.minimumMisses,
- "avg: " + formatDouble(ad.averageMisses),
- "max: " + ad.maximumMisses
- ),
- (
- "min: " + ad.minimumReads,
- "avg: " + formatDouble(ad.averageReads),
- "max: " + ad.maximumReads
- ),
- (
- "min: " + ad.minimumWrites,
- "avg: " + formatDouble(ad.averageWrites),
- "max: " + ad.maximumWrites
- )
+ val all = hasArgFlag("a", argLst)
+
+ val sortType = argValue("s", argLst)
+ val reversed = hasArgName("r", argLst)
+
+ if (sortType.isDefined && !isValidSortType(sortType.get))
+ scold("Invalid '-s' argument in: " + args).^^
+
+ // Get cache stats data from all nodes.
+ val aggrData = cacheData(node, cacheName, showSystem)
+
+ if (aggrData.isEmpty)
+ scold("No caches found.").^^
+
+ println("Time of the snapshot: " + formatDateTime(System.currentTimeMillis))
+
+ val sumT = VisorTextTable()
+
+ sumT #= ("Name(@)", "Nodes", "Entries", "Hits", "Misses", "Reads", "Writes")
+
+ sortAggregatedData(aggrData, sortType.getOrElse("cn"), reversed).foreach(
+ ad => {
+ // Add cache host as visor variable.
+ registerCacheName(ad.cacheName)
+
+ sumT += (
+ mkCacheName(ad.cacheName),
+ ad.nodes,
+ (
+ "min: " + ad.minimumSize,
+ "avg: " + formatDouble(ad.averageSize),
+ "max: " + ad.maximumSize
+ ),
+ (
+ "min: " + ad.minimumHits,
+ "avg: " + formatDouble(ad.averageHits),
+ "max: " + ad.maximumHits
+ ),
+ (
+ "min: " + ad.minimumMisses,
+ "avg: " + formatDouble(ad.averageMisses),
+ "max: " + ad.maximumMisses
+ ),
+ (
+ "min: " + ad.minimumReads,
+ "avg: " + formatDouble(ad.averageReads),
+ "max: " + ad.maximumReads
+ ),
+ (
+ "min: " + ad.minimumWrites,
+ "avg: " + formatDouble(ad.averageWrites),
+ "max: " + ad.maximumWrites
)
- }
- )
+ )
+ }
+ )
- sumT.render()
+ sumT.render()
- if (all) {
- val sorted = aggrData.sortWith((k1, k2) => {
- if (k1.cacheName == null)
- true
- else if (k2.cacheName == null)
- false
- else k1.cacheName.compareTo(k2.cacheName) < 0
- })
+ if (all) {
+ val sorted = aggrData.sortWith((k1, k2) => {
+ if (k1.cacheName == null)
+ true
+ else if (k2.cacheName == null)
+ false
+ else k1.cacheName.compareTo(k2.cacheName) < 0
+ })
- val gCfg = node.map(config).collect {
- case cfg if cfg != null => cfg
- }
+ val gCfg = node.map(config).collect {
+ case cfg if cfg != null => cfg
+ }
- sorted.foreach(ad => {
- val cacheNameVar = mkCacheName(ad.cacheName)
+ sorted.foreach(ad => {
+ val cacheNameVar = mkCacheName(ad.cacheName)
- println("\nCache '" + cacheNameVar + "':")
+ println("\nCache '" + cacheNameVar + "':")
- val m = ad.metrics()
+ val m = ad.metrics()
- val csT = VisorTextTable()
+ val csT = VisorTextTable()
- csT += ("Name(@)", cacheNameVar)
- csT += ("Nodes", m.size())
- csT += ("Size Min/Avg/Max", ad.minimumSize + " / " + formatDouble(ad.averageSize) + " / " + ad.maximumSize)
+ csT += ("Name(@)", cacheNameVar)
+ csT += ("Nodes", m.size())
+ csT += ("Size Min/Avg/Max", ad.minimumSize + " / " + formatDouble(ad.averageSize) + " / " + ad.maximumSize)
- val ciT = VisorTextTable()
+ val ciT = VisorTextTable()
- ciT #= ("Node ID8(@), IP", "CPUs", "Heap Used", "CPU Load", "Up Time", "Size", "Hi/Mi/Rd/Wr")
+ ciT #= ("Node ID8(@), IP", "CPUs", "Heap Used", "CPU Load", "Up Time", "Size", "Hi/Mi/Rd/Wr")
- sortData(m.toMap, sortType.getOrElse("hi"), reversed).foreach { case (nid, cm) =>
- val nm = ignite.cluster.node(nid).metrics()
+ sortData(m.toMap, sortType.getOrElse("hi"), reversed).foreach { case (nid, cm) =>
+ val nm = ignite.cluster.node(nid).metrics()
- ciT += (
- nodeId8Addr(nid),
- nm.getTotalCpus,
- formatDouble(100d * nm.getHeapMemoryUsed / nm.getHeapMemoryMaximum) + " %",
+ ciT += (
+ nodeId8Addr(nid),
+ nm.getTotalCpus,
+ formatDouble(100d * nm.getHeapMemoryUsed / nm.getHeapMemoryMaximum) + " %",
- formatDouble(nm.getCurrentCpuLoad * 100d) + " %",
- X.timeSpan2HMSM(nm.getUpTime),
- cm.keySize(),
- (
- "Hi: " + cm.hits(),
- "Mi: " + cm.misses(),
- "Rd: " + cm.reads(),
- "Wr: " + cm.writes()
- )
+ formatDouble(nm.getCurrentCpuLoad * 100d) + " %",
+ X.timeSpan2HMSM(nm.getUpTime),
+ cm.keySize(),
+ (
+ "Hi: " + cm.hits(),
+ "Mi: " + cm.misses(),
+ "Rd: " + cm.reads(),
+ "Wr: " + cm.writes()
)
- }
+ )
+ }
- csT.render()
+ csT.render()
- nl()
- println("Nodes for: " + cacheNameVar)
+ nl()
+ println("Nodes for: " + cacheNameVar)
- ciT.render()
+ ciT.render()
- // Print footnote.
- println("'Hi' - Number of cache hits.")
- println("'Mi' - Number of cache misses.")
- println("'Rd' - number of cache reads.")
- println("'Wr' - Number of cache writes.")
+ // Print footnote.
+ println("'Hi' - Number of cache hits.")
+ println("'Mi' - Number of cache misses.")
+ println("'Rd' - number of cache reads.")
+ println("'Wr' - Number of cache writes.")
- // Print metrics.
- nl()
- println("Aggregated queries metrics:")
- println(" Minimum execution time: " + X.timeSpan2HMSM(ad.minimumQueryTime()))
- println(" Maximum execution time: " + X.timeSpan2HMSM(ad.maximumQueryTime))
- println(" Average execution time: " + X.timeSpan2HMSM(ad.averageQueryTime.toLong))
- println(" Total number of executions: " + ad.execsQuery)
- println(" Total number of failures: " + ad.failsQuery)
+ // Print metrics.
+ nl()
+ println("Aggregated queries metrics:")
+ println(" Minimum execution time: " + X.timeSpan2HMSM(ad.minimumQueryTime()))
+ println(" Maximum execution time: " + X.timeSpan2HMSM(ad.maximumQueryTime))
+ println(" Average execution time: " + X.timeSpan2HMSM(ad.averageQueryTime.toLong))
+ println(" Total number of executions: " + ad.execsQuery)
+ println(" Total number of failures: " + ad.failsQuery)
- gCfg.foreach(_.caches().find(_.name() == ad.cacheName()).foreach(cfg => {
- nl()
+ gCfg.foreach(_.caches().find(_.name() == ad.cacheName()).foreach(cfg => {
+ nl()
- showCacheConfiguration("Cache configuration:", cfg)
- }))
- })
+ showCacheConfiguration("Cache configuration:", cfg)
+ }))
+ })
- }
- else
- println("\nUse \"-a\" flag to see detailed statistics.")
}
+ else
+ println("\nUse \"-a\" flag to see detailed statistics.")
}
}
@@ -463,9 +480,12 @@ class VisorCacheCommand {
/**
* Get metrics data for all caches from all node or from specified node.
*
+ * @param node Option of node for cache names extracting. All nodes if `None`.
+ * @param systemCaches Allow selection of system caches.
* @return Caches metrics data.
*/
- private def cacheData(node: Option[ClusterNode], name: Option[String]): List[VisorCacheAggregatedMetrics] = {
+ private def cacheData(node: Option[ClusterNode], name: Option[String], systemCaches: Boolean = false):
+ List[VisorCacheAggregatedMetrics] = {
assert(node != null)
try {
@@ -474,7 +494,7 @@ class VisorCacheCommand {
val nids = prj.nodes().map(_.id())
ignite.compute(prj).execute(classOf[VisorCacheMetricsCollectorTask], toTaskArgument(nids,
- new IgniteBiTuple(JavaBoolean.valueOf(name.isEmpty), name.orNull))).toList
+ new VisorCacheMetricsCollectorArg(JavaBoolean.valueOf(name.isEmpty), systemCaches, name.orNull))).toList
}
catch {
case e: IgniteException => Nil
@@ -570,14 +590,16 @@ class VisorCacheCommand {
* Asks user to select a cache from the list.
*
* @param title Title displayed before the list of caches.
+ * @param node Option of node for cache names extracting. All nodes if `None`.
+ * @param showSystem Allow selection of system caches.
* @return `Option` for ID of selected cache.
*/
- def askForCache(title: String, node: Option[ClusterNode]): Option[String] = {
+ def askForCache(title: String, node: Option[ClusterNode], showSystem: Boolean = false): Option[String] = {
assert(title != null)
assert(visor.visor.isConnected)
// Get cache stats data from all nodes.
- val aggrData = cacheData(node, None)
+ val aggrData = cacheData(node, None, showSystem)
if (aggrData.isEmpty)
scold("No caches found.").^^
[37/50] incubator-ignite git commit: # ignite-654 fixed test
Posted by ak...@apache.org.
# ignite-654 fixed 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/05c8d203
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05c8d203
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05c8d203
Branch: refs/heads/ignite-639
Commit: 05c8d2039f41c53a64136d3268c5809aba2ef7d4
Parents: 41963b7
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 16:37:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 16:37:27 2015 +0300
----------------------------------------------------------------------
.../cache/GridCachePutAllFailoverSelfTest.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05c8d203/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 1b3dd2e..4b5c250 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
@@ -40,6 +40,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
+import static org.apache.ignite.cache.CachePeekMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -50,7 +51,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** Size of the test map. */
- private static final int TEST_MAP_SIZE = 30000;
+ private static final int TEST_MAP_SIZE = 30_000;
/** Cache name. */
private static final String CACHE_NAME = "partitioned";
@@ -339,12 +340,18 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
int primaryCacheSize = 0;
for (Ignite g : runningWorkers) {
- info(">>>>> " + g.cache(CACHE_NAME).localSize());
+ info("Cache size [node=" + g.name() +
+ ", localSize=" + g.cache(CACHE_NAME).localSize() +
+ ", localPrimarySize=" + g.cache(CACHE_NAME).localSize(PRIMARY) +
+ ']');
primaryCacheSize += ((IgniteKernal)g).internalCache(CACHE_NAME).primarySize();
}
assertEquals(TEST_MAP_SIZE, primaryCacheSize);
+
+ for (Ignite g : runningWorkers)
+ assertEquals(TEST_MAP_SIZE, g.cache(CACHE_NAME).size(PRIMARY));
}
finally {
stopAllGrids();
@@ -388,9 +395,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
}
try {
- // Dummy call to fetch affinity function from remote node
- master.cluster().mapKeyToNode(CACHE_NAME, "Dummy");
-
Map<UUID, Collection<Integer>> dataChunks = new HashMap<>();
int chunkCntr = 0;
@@ -539,12 +543,18 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
int primaryCacheSize = 0;
for (Ignite g : runningWorkers) {
- info(">>>>> " + g.cache(CACHE_NAME).localSize());
+ info("Cache size [node=" + g.name() +
+ ", localSize=" + g.cache(CACHE_NAME).localSize() +
+ ", localPrimarySize=" + g.cache(CACHE_NAME).localSize(PRIMARY) +
+ ']');
- primaryCacheSize += ((IgniteKernal)g).internalCache(CACHE_NAME).primarySize();
+ primaryCacheSize += g.cache(CACHE_NAME).localSize(PRIMARY);
}
assertEquals(TEST_MAP_SIZE, primaryCacheSize);
+
+ for (Ignite g : runningWorkers)
+ assertEquals(TEST_MAP_SIZE, g.cache(CACHE_NAME).size(PRIMARY));
}
finally {
stopAllGrids();
@@ -602,6 +612,8 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoverySpi);
if (gridName.startsWith("master")) {
+ cfg.setClientMode(true);
+
cfg.setUserAttributes(ImmutableMap.of("segment", "master"));
// For sure.
[45/50] incubator-ignite git commit: IGNITE-651 - Fixed system
transactions test since marshaller cache is not transactional anymore.
Posted by ak...@apache.org.
IGNITE-651 - Fixed system transactions test since marshaller cache is not transactional anymore.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca472ac5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca472ac5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca472ac5
Branch: refs/heads/ignite-639
Commit: ca472ac50c3e679a305bb9a01a56b180ac3fff82
Parents: 685209c
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue Mar 31 18:46:45 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue Mar 31 18:46:45 2015 -0700
----------------------------------------------------------------------
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 4 +++
.../IgniteCacheSystemTransactionsSelfTest.java | 38 ++++++--------------
3 files changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 4a27222..e6ef192 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -158,7 +158,7 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
@Override public void onUpdated(Iterable<CacheEntryEvent<? extends Integer, ? extends String>> events)
throws CacheEntryListenerException {
for (CacheEntryEvent<? extends Integer, ? extends String> evt : events) {
- assert evt.getOldValue() == null;
+ assert evt.getOldValue() == null : "Received non-null old value for system marshaller cache: " + evt;
File file = new File(workDir, evt.getKey() + ".classname");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
index afa2826..c3ad32b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.transactions;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -137,6 +138,9 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
long timeout, int txSize, @Nullable GridCacheContext sysCacheCtx) {
TransactionConfiguration cfg = cctx.gridConfig().getTransactionConfiguration();
+ if (sysCacheCtx != null && !sysCacheCtx.transactional())
+ throw new IgniteException("Failed to start transaction on non-transactional cache: " + sysCacheCtx.name());
+
if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE)
throw new IllegalArgumentException("SERIALIZABLE isolation level is disabled (to enable change " +
"'txSerializableEnabled' configuration property)");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
index f06838a..d4c3a1b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
@@ -24,9 +24,11 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.*;
import org.apache.ignite.transactions.*;
import java.util.*;
+import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
@@ -101,38 +103,18 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCacheAbstractSelf
/**
* @throws Exception If failed.
*/
- public void testSystemMarshallerTxInsideSystemTx() throws Exception {
+ public void testMarshallerCacheShouldNotStartTx() throws Exception {
IgniteKernal ignite = (IgniteKernal)grid(0);
- GridCacheAdapter<Object, Object> utilityCache = ignite.context().cache().utilityCache();
+ final GridCacheAdapter<String,String> marshallerCache = (GridCacheAdapter<String, String>)(GridCacheAdapter)
+ ignite.context().cache().marshallerCache();
- try (IgniteInternalTx tx = utilityCache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
- utilityCache.get("1");
- utilityCache.put("1", "11");
-
- GridCacheAdapter<String,String> marshallerCache = (GridCacheAdapter<String, String>)(GridCacheAdapter)ignite.context().cache().marshallerCache();
-
- marshallerCache.putIfAbsent("2", "2");
-
- try (IgniteInternalTx itx = marshallerCache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
- assertEquals(null, marshallerCache.get("1"));
- assertEquals("2", marshallerCache.get("2"));
- assertEquals(null, marshallerCache.get("3"));
-
- marshallerCache.put("3", "3");
-
- itx.commit();
+ GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ return marshallerCache.txStartEx(PESSIMISTIC, REPEATABLE_READ);
}
-
- utilityCache.put("2", "22");
-
- tx.commit();
- }
-
- checkTransactionsCommitted();
-
- checkEntries(CU.UTILITY_CACHE_NAME, 1, "11", 2, "22", 3, null);
- checkEntries(CU.MARSH_CACHE_NAME, 1, null, 2, "2", 3, "3");
+ }, IgniteException.class, null);
}
/**
[04/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-629-1
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f73436d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f73436d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f73436d
Branch: refs/heads/ignite-639
Commit: 2f73436dd412c789d3a3de19aa17f6b903f84b9d
Parents: 40d6b75 bca4198
Author: ivasilinets <va...@gmail.com>
Authored: Mon Mar 30 23:10:50 2015 +0300
Committer: ivasilinets <va...@gmail.com>
Committed: Mon Mar 30 23:10:50 2015 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 7 +++----
.../cache/IgniteCacheDynamicStopSelfTest.java | 19 +++++++++++--------
parent/pom.xml | 3 ++-
3 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[11/50] incubator-ignite git commit: # ignite-654
Posted by ak...@apache.org.
# ignite-654
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3821f002
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3821f002
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3821f002
Branch: refs/heads/ignite-639
Commit: 3821f002956b14f7404b8943e320909f3d6c0067
Parents: 768ca6a
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 10:20:51 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 10:38:54 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContextImpl.java | 6 +++---
.../org/apache/ignite/internal/IgniteKernal.java | 7 +++++++
.../internal/managers/GridManagerAdapter.java | 4 ++++
.../distributed/dht/GridPartitionedGetFuture.java | 3 ++-
.../cache/distributed/near/GridNearGetFuture.java | 3 ++-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +++++++++++++---
.../org/apache/ignite/spi/IgniteSpiContext.java | 5 +++++
.../communication/tcp/TcpCommunicationSpi.java | 13 ++++---------
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 14 +++++++++-----
.../cache/GridCacheAbstractFailoverSelfTest.java | 2 +-
.../ignite/testframework/GridSpiTestContext.java | 18 +++++++++---------
11 files changed, 59 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/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 0c3f41f..059a576 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
@@ -319,6 +319,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
* @param cfg Grid configuration.
* @param gw Kernal gateway.
* @param utilityCachePool Utility cache pool.
+ * @param marshCachePool Marshaller cache pool.
* @param execSvc Public executor service.
* @param sysExecSvc System executor service.
* @param p2pExecSvc P2P executor service.
@@ -387,6 +388,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/**
* @param comp Manager to add.
+ * @param addToList If {@code true} component is added to components list.
*/
public void add(GridComponent comp, boolean addToList) {
assert comp != null;
@@ -495,9 +497,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** {@inheritDoc} */
@Override public boolean isStopping() {
- GridKernalState state = gw.getState();
-
- return state == GridKernalState.STOPPING || state == GridKernalState.STOPPED;
+ return ((IgniteKernal)grid).isStopping();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/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 c9c3b8d..6899af9 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
@@ -1671,6 +1671,13 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
/**
+ * @return {@code True} if node started shutdown sequence.
+ */
+ public boolean isStopping() {
+ return stopGuard.get();
+ }
+
+ /**
* @param cancel Whether or not to cancel running jobs.
*/
private void stop0(boolean cancel) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index b965ea3..982ca86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -281,6 +281,10 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
for (final IgniteSpi spi : spis) {
try {
spi.onContextInitialized(new IgniteSpiContext() {
+ @Override public boolean isStopping() {
+ return ctx.isStopping();
+ }
+
@Override public Collection<ClusterNode> remoteNodes() {
return ctx.discovery().remoteNodes();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/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 9b23dd2..da2105d 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
@@ -607,7 +607,8 @@ 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);
- final AffinityTopologyVersion updTopVer = new AffinityTopologyVersion(cctx.discovery().topologyVersion());
+ final AffinityTopologyVersion updTopVer =
+ new AffinityTopologyVersion(Math.max(topVer.topologyVersion() + 1, cctx.discovery().topologyVersion()));
final GridFutureRemapTimeoutObject timeout = new GridFutureRemapTimeoutObject(this,
cctx.kernalContext().config().getNetworkTimeout(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/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 615d02e..b1017d8 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
@@ -725,7 +725,8 @@ 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);
- final AffinityTopologyVersion updTopVer = new AffinityTopologyVersion(cctx.discovery().topologyVersion());
+ final AffinityTopologyVersion updTopVer =
+ new AffinityTopologyVersion(Math.max(topVer.topologyVersion() + 1, cctx.discovery().topologyVersion()));
final GridFutureRemapTimeoutObject timeout = new GridFutureRemapTimeoutObject(this,
cctx.kernalContext().config().getNetworkTimeout(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 2235895..bb66872 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -62,7 +62,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
private String name;
/** Grid SPI context. */
- private volatile IgniteSpiContext spiCtx = new GridDummySpiContext(null);
+ private volatile IgniteSpiContext spiCtx = new GridDummySpiContext(null, false);
/** Discovery listener. */
private GridLocalEventListener paramsLsnr;
@@ -185,7 +185,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
ClusterNode locNode = spiCtx == null ? null : spiCtx.localNode();
// Set dummy no-op context.
- spiCtx = new GridDummySpiContext(locNode);
+ spiCtx = new GridDummySpiContext(locNode, true);
}
/**
@@ -523,13 +523,18 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
/** */
private final ClusterNode locNode;
+ /** */
+ private final boolean stopping;
+
/**
* Create temp SPI context.
*
* @param locNode Local node.
+ * @param stopping Node stopping flag.
*/
- GridDummySpiContext(ClusterNode locNode) {
+ GridDummySpiContext(ClusterNode locNode, boolean stopping) {
this.locNode = locNode;
+ this.stopping = stopping;
}
/** {@inheritDoc} */
@@ -688,5 +693,10 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
@Override public MessageFactory messageFactory() {
return null;
}
+
+ /** {@inheritDoc} */
+ @Override public boolean isStopping() {
+ return stopping;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
index cdc5492..75b637d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
@@ -346,4 +346,9 @@ public interface IgniteSpiContext {
* @return Message factory.
*/
public MessageFactory messageFactory();
+
+ /**
+ * @return {@code True} if node started shutdown sequence.
+ */
+ public boolean isStopping();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/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 01eb72f..0ab0cf2 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
@@ -257,7 +257,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
clients.remove(id, rmv)) {
rmv.forceClose();
- if (!stopping) {
+ if (!getSpiContext().isStopping()) {
GridNioRecoveryDescriptor recoveryData = ses.recoveryDescriptor();
if (recoveryData != null) {
@@ -695,9 +695,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** Context initialization latch. */
private final CountDownLatch ctxInitLatch = new CountDownLatch(1);
- /** Stopping flag. */
- private volatile boolean stopping;
-
/** metrics listener. */
private final GridNioMetricsListener metricsLsnr = new GridNioMetricsListener() {
@Override public void onBytesSent(int bytesCnt) {
@@ -1463,7 +1460,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public void spiStop() throws IgniteSpiException {
- assert stopping;
+ assert getSpiContext().isStopping();
unregisterMBean();
@@ -1498,8 +1495,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override protected void onContextDestroyed0() {
- stopping = true;
-
if (ctxInitLatch.getCount() > 0)
// Safety.
ctxInitLatch.countDown();
@@ -1624,8 +1619,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
GridCommunicationClient client = clients.get(nodeId);
if (client == null) {
- if (stopping)
- throw new IgniteSpiException("Grid is stopping.");
+ if (getSpiContext().isStopping())
+ throw new IgniteSpiException("Node is stopping.");
// Do not allow concurrent connects.
GridFutureAdapter<GridCommunicationClient> fut = new ConnectFuture();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/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 03cf665..02d373c 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
@@ -4695,14 +4695,18 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
// Ping.
if (msg instanceof TcpDiscoveryPingRequest) {
- TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg;
+ if (!getSpiContext().isStopping()) {
+ TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg;
- TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);
+ TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);
- if (req.clientNodeId() != null)
- res.clientExists(clientMsgWorkers.containsKey(req.clientNodeId()));
+ if (req.clientNodeId() != null)
+ res.clientExists(clientMsgWorkers.containsKey(req.clientNodeId()));
- writeToSocket(sock, res);
+ writeToSocket(sock, res);
+ }
+ else if (log.isDebugEnabled())
+ log.debug("Ignore ping request, node is stopping.");
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index 42b3293..4025265 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -46,7 +46,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
private static final int ENTRY_CNT = 100;
/** */
- private static final int TOP_CHANGE_CNT = 5;
+ private static final int TOP_CHANGE_CNT = 10;
/** */
private static final int TOP_CHANGE_THREAD_CNT = 3;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
index 80e5c42..a754910 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.direct.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.extensions.communication.*;
@@ -108,8 +107,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
}
/** {@inheritDoc} */
- @Nullable @Override
- public ClusterNode node(UUID nodeId) {
+ @Nullable @Override public ClusterNode node(UUID nodeId) {
if (locNode != null && locNode.id().equals(nodeId))
return locNode;
@@ -240,9 +238,8 @@ public class GridSpiTestContext implements IgniteSpiContext {
public void updateAllMetrics() {
notifyListener(new DiscoveryEvent(locNode, "Metrics updated", EVT_NODE_METRICS_UPDATED, locNode));
- for (ClusterNode node : rmtNodes) {
+ for (ClusterNode node : rmtNodes)
notifyListener(new DiscoveryEvent(locNode, "Metrics updated", EVT_NODE_METRICS_UPDATED, node));
- }
}
/**
@@ -290,9 +287,8 @@ public class GridSpiTestContext implements IgniteSpiContext {
*/
@SuppressWarnings("deprecation")
public void triggerMessage(ClusterNode node, Object msg) {
- for (GridMessageListener lsnr : msgLsnrs) {
+ for (GridMessageListener lsnr : msgLsnrs)
lsnr.onMessage(node.id(), msg);
- }
}
/** {@inheritDoc} */
@@ -333,9 +329,8 @@ public class GridSpiTestContext implements IgniteSpiContext {
assert typeSet != null;
if (types != null) {
- for (int type : types) {
+ for (int type : types)
typeSet.add(type);
- }
}
}
@@ -519,6 +514,11 @@ public class GridSpiTestContext implements IgniteSpiContext {
return factory;
}
+ /** {@inheritDoc} */
+ @Override public boolean isStopping() {
+ return false;
+ }
+
/**
* @param cacheName Cache name.
* @return Map representing cache.
[33/50] incubator-ignite git commit: # ignite-629-1
Posted by ak...@apache.org.
# ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79c76cd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79c76cd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79c76cd1
Branch: refs/heads/ignite-639
Commit: 79c76cd16d0a506a2775cb41f885bd3aff39f96e
Parents: 67bb43a
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 31 13:55:37 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 31 14:23:06 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 6 ++++--
.../cache/GridCacheConcurrentMap.java | 21 ++------------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
3 files changed, 7 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/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 8c6bfd6..02429b3 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
@@ -4091,7 +4091,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @return Distributed ignite cache iterator.
*/
public Iterator<Cache.Entry<K, V>> igniteIterator() {
- if (!ctx.isSwapOrOffheapEnabled() && ctx.kernalContext().discovery().size() == 1)
+ GridCacheContext ctx0 = ctx.isNear() ? ctx.near().dht().context() : ctx;
+
+ if (!ctx0.isSwapOrOffheapEnabled() && ctx0.kernalContext().discovery().size() == 1)
return localIteratorHonorExpirePolicy();
final GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall();
@@ -4371,7 +4373,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
OPTIMISTIC,
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
- !skipStore(),
+ !ctx.skipStore(),
0,
/** group lock keys */null,
/** partition lock */false
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index ba6a7f4..f45d00e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1744,12 +1744,7 @@ public class GridCacheConcurrentMap {
curVal = null;
try {
- CacheProjection prj = ctx.projectionPerCall();
-
- if (prj != null)
- prj.removex(e.key());
- else
- ((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key());
+ ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
}
catch (IgniteCheckedException ex) {
throw new IgniteException(ex);
@@ -1806,9 +1801,6 @@ public class GridCacheConcurrentMap {
/** */
private GridCacheProjectionImpl prjPerCall;
- /** */
- private boolean clone;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -2026,16 +2018,7 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public void remove() {
- GridCacheProjectionImpl<K, V> oldPrj = ctx.projectionPerCall();
-
- ctx.projectionPerCall(prjPerCall);
-
- try {
- it.remove();
- }
- finally {
- ctx.projectionPerCall(oldPrj);
- }
+ it.remove();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index d5c279b..1238565 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4266,7 +4266,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testWithSkipStore() throws Exception {
- if (gridCount() > 1)
+ if (gridCount() > 1) // TODO IGNITE-656 (test primary/backup/near keys with multiple nodes).
return;
IgniteCache<String, Integer> cache = grid(0).cache(null);
[05/50] incubator-ignite git commit: ignite-629: Skip store test run
only for one node.
Posted by ak...@apache.org.
ignite-629: Skip store test run only for one node.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/053d32cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/053d32cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/053d32cf
Branch: refs/heads/ignite-639
Commit: 053d32cfa79f0cc0ce6b47386471ba3b1786753d
Parents: 2f73436
Author: ivasilinets <va...@gmail.com>
Authored: Tue Mar 31 00:41:23 2015 +0300
Committer: ivasilinets <va...@gmail.com>
Committed: Tue Mar 31 00:41:23 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAbstractFullApiSelfTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/053d32cf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b3dd4f2..f543be0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4266,6 +4266,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testWithSkipStore() throws Exception {
+ if (gridCount() > 1)
+ return;
+
IgniteCache<String, Integer> cache = grid(0).cache(null);
IgniteCache<String, Integer> cacheSkipStore = cache.withSkipStore();