You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/02 14:35:16 UTC
[01/24] incubator-ignite git commit: # ignite-663 Fixed build.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10009-2 fd51341c0 -> f11129464
# ignite-663 Fixed build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/588cff34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/588cff34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/588cff34
Branch: refs/heads/ignite-gg-10009-2
Commit: 588cff346be3cb47e65f3aeea693c8e158001dd7
Parents: d297e06
Author: anovikov <an...@gridgain.com>
Authored: Wed Apr 1 17:12:54 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Wed Apr 1 17:12:54 2015 +0700
----------------------------------------------------------------------
DEVNOTES.txt | 2 ++
parent/pom.xml | 10 +++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/588cff34/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 2e8e431..3a712c7 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -8,6 +8,8 @@ With LGPL dependencies:
Look for ignite-fabric-<version>.zip in ./target directory.
+NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.
+
JCache TCK compliance
======================
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/588cff34/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f408434..f475b85 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -497,7 +497,14 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.7,)</version>
+ <!--Detected JDK Version: 1.8.0 is not in the allowed range [1.7,1.8),[1.8.0-40,).-->
+ <message>
+[INFO] ------------------------------------------------------------------------
+[ERROR] You are trying to compile Apache Ignite with inappropriate JDK version!
+[ERROR] Detected JDK Version: ${java.runtime.version}
+[ERROR] JDK version should be 1.7.0-* or >= 1.8.0-u40.
+ </message>
+ <version>[1.7,1.8),[1.8.0-40,)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -641,6 +648,7 @@
<id>release</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
[16/24] incubator-ignite git commit: # ignite-sprint-3 fixed test
Posted by sb...@apache.org.
# ignite-sprint-3 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/505a7bf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/505a7bf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/505a7bf2
Branch: refs/heads/ignite-gg-10009-2
Commit: 505a7bf227b1396ac3ff2f3b08258dbd58c32698
Parents: 69f5079
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 2 10:15:34 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 2 10:15:34 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheOnCopyFlagAbstractSelfTest.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/505a7bf2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
index b2906f8..538567c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
@@ -93,6 +93,8 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
c.setDiscoverySpi(spi);
+ c.setPeerClassLoadingEnabled(false);
+
c.getTransactionConfiguration().setTxSerializableEnabled(true);
return c;
@@ -388,13 +390,13 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
TestImmutableValue val0 = entry.rawGet().value(cctx.cacheObjectContext(), false);
- assertSame(val0, e.getValue());
+ assertNotSame(val0, e.getValue());
TestImmutableValue val1 = entry.rawGet().value(cctx.cacheObjectContext(), true);
- assertSame(val0, val1);
+ assertNotSame(val0, val1);
- assertSame(e.getValue(), cache.get(e.getKey()));
+ assertNotSame(e.getValue(), cache.get(e.getKey()));
}
}
@@ -410,7 +412,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
for (int i = 0; i < ITER_CNT; i++) {
String key = String.valueOf(i);
- Long val = (long)i;
+ Long val = Long.MAX_VALUE - i;
cache.put(key, val);
@@ -436,13 +438,13 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
Long val0 = entry.rawGet().value(cctx.cacheObjectContext(), false);
- assertSame(val0, e.getValue());
+ assertNotSame(val0, e.getValue());
Long val1 = entry.rawGet().value(cctx.cacheObjectContext(), true);
- assertSame(val0, val1);
+ assertNotSame(val0, val1);
- assertSame(e.getValue(), cache.get(e.getKey()));
+ assertNotSame(e.getValue(), cache.get(e.getKey()));
}
}
[05/24] incubator-ignite git commit: sprint-3 version fix
Posted by sb...@apache.org.
sprint-3 version fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63339663
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63339663
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63339663
Branch: refs/heads/ignite-gg-10009-2
Commit: 63339663676e21974048c0108d0386414d58a3e6
Parents: 6413426
Author: avinogradov <av...@gridgain.com>
Authored: Wed Apr 1 16:59:35 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed Apr 1 16:59:35 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 19 ++++++-------
examples/schema-import/pom.xml | 10 +++----
modules/aop/pom.xml | 6 ++--
modules/aws/pom.xml | 4 +--
modules/clients/pom.xml | 10 +++----
modules/codegen/pom.xml | 4 +--
modules/core/pom.xml | 8 +++---
modules/extdata/p2p/pom.xml | 4 +--
modules/extdata/uri/pom.xml | 4 +--
modules/geospatial/pom.xml | 4 +--
modules/hadoop/pom.xml | 8 +++---
modules/hibernate/pom.xml | 6 ++--
modules/indexing/pom.xml | 4 +--
modules/jcl/pom.xml | 4 +--
modules/jta/pom.xml | 4 +--
modules/log4j/pom.xml | 4 +--
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 10 +++----
modules/schedule/pom.xml | 4 +--
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 8 +++---
modules/ssh/pom.xml | 8 +++---
modules/urideploy/pom.xml | 6 ++--
modules/visor-console/pom.xml | 8 +++---
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 8 +++---
modules/yardstick/pom.xml | 6 ++--
pom.xml | 56 ++++++++++++++++++-------------------
29 files changed, 112 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 26b4c15..08f44eb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -41,37 +40,37 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-hibernate</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-schedule</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -89,7 +88,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -146,7 +145,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-scalar</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index 2af4978..d302606 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-schema-import-demo</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<dependencies>
<dependency>
@@ -44,25 +44,25 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 45912b33..917ccc6 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -80,14 +80,14 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 6a5bfb7..b738450 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index d3f87b9..29250f4 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -56,21 +56,21 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-rest-http</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 24a3859..2990330 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -43,13 +43,13 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 530fa23..5355e5a 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -270,12 +270,12 @@
<configuration>
<failOnError>false</failOnError>
<target>
- <exec executable="${git.exec}" outputproperty="ignite.build" >
- <arg line="log -1 --format=%ct"/>
+ <exec executable="${git.exec}" outputproperty="ignite.build">
+ <arg line="log -1 --format=%ct" />
</exec>
- <exec executable="${git.exec}" outputproperty="ignite.revision" >
- <arg line="log -1 --format=%H"/>
+ <exec executable="${git.exec}" outputproperty="ignite.revision">
+ <arg line="log -1 --format=%H" />
</exec>
<tstamp>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index f8b41bc..c8f0d63 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-tools</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 5c098cc..ed7bff5 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-tools</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 8c2128c..d0ae253 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 0f6fc80..69d5294 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -109,14 +109,14 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 6a45cf2..eba98b5 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-jta</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index f8f54e1..5851e66 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 06c6e67..c2d1851 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 87cf067..dbf4eac 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 23c628d..6f88587 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 51b9d5a..cbade02 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 391535a..83de256 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -57,14 +57,14 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-tools</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 927c6bd..af1f000 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 53487c8..9eb95c1 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index e8d4b1d..9feba39 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 9bc95ea..533c1f2 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -85,21 +85,21 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-urideploy</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 4d2ea73..1f70406 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -49,21 +49,21 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index b2b459f..d8a9aa1 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-tools</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 7284c22..bd1d20c 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -37,19 +37,19 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-ssh</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 45acbe8..a63289d 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index b5f5591..eeeec39 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -49,14 +49,14 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 1eb1e5b..0d2e81a 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -42,19 +42,19 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63339663/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bcff019..32da7eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,75 +208,75 @@
<configuration>
<target>
<replaceregexp byline="true">
- <regexp pattern='pushd "%~dp0"/\.\./\.\.(\s*&::.+)?'/>
- <substitution expression='pushd "%~dp0"/..'/>
+ <regexp pattern="pushd "%~dp0"/\.\./\.\.(\s*&::.+)?" />
+ <substitution expression="pushd "%~dp0"/.." />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
+ <include name="**/*.bat" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='IGNITE_HOME_TMP="\$\(dirname "\$\{IGNITE_HOME_TMP\}"\)"(\s*#.*)?'/>
- <substitution expression=""/>
+ <regexp pattern="IGNITE_HOME_TMP="\$\(dirname "\$\{IGNITE_HOME_TMP\}"\)"(\s*#.*)?" />
+ <substitution expression="" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
+ <include name="**/*.sh" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='set SCRIPTS_HOME=%IGNITE_HOME%\\bin(\s*&::.*)?'/>
- <substitution expression='set SCRIPTS_HOME=%IGNITE_HOME%\\\\bin'/>
+ <regexp pattern="set SCRIPTS_HOME=%IGNITE_HOME%\\bin(\s*&::.*)?" />
+ <substitution expression="set SCRIPTS_HOME=%IGNITE_HOME%\\\\bin" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
+ <include name="**/*.bat" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='SCRIPTS_HOME="\$\{IGNITE_HOME_TMP\}/bin"(\s*#.*)?'/>
- <substitution expression='SCRIPTS_HOME="$${IGNITE_HOME_TMP}/bin"'/>
+ <regexp pattern="SCRIPTS_HOME="\$\{IGNITE_HOME_TMP\}/bin"(\s*#.*)?" />
+ <substitution expression="SCRIPTS_HOME="$${IGNITE_HOME_TMP}/bin"" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
+ <include name="**/*.sh" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='\. "\$\{SCRIPTS_HOME\}"/include/target-classpath.sh(\s*#.*)?'/>
- <substitution expression=""/>
+ <regexp pattern="\. "\$\{SCRIPTS_HOME\}"/include/target-classpath.sh(\s*#.*)?" />
+ <substitution expression="" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
+ <include name="**/*.sh" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='call "%SCRIPTS_HOME%\\include\\target-classpath.bat"(\s*&::.*)?'/>
- <substitution expression=""/>
+ <regexp pattern="call "%SCRIPTS_HOME%\\include\\target-classpath.bat"(\s*&::.*)?" />
+ <substitution expression="" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
+ <include name="**/*.bat" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='ENABLE_ASSERTIONS=.*'/>
- <substitution expression="ENABLE_ASSERTIONS="0""/>
+ <regexp pattern="ENABLE_ASSERTIONS=.*" />
+ <substitution expression="ENABLE_ASSERTIONS="0"" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
+ <include name="**/*.sh" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='ENABLE_ASSERTIONS=.*'/>
- <substitution expression="ENABLE_ASSERTIONS=0"/>
+ <regexp pattern="ENABLE_ASSERTIONS=.*" />
+ <substitution expression="ENABLE_ASSERTIONS=0" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
+ <include name="**/*.bat" />
</fileset>
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern='-DIGNITE_UPDATE_NOTIFIER=false'/>
- <substitution expression=""/>
+ <regexp pattern="-DIGNITE_UPDATE_NOTIFIER=false" />
+ <substitution expression="" />
<fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
- <include name="**/*.bat"/>
+ <include name="**/*.sh" />
+ <include name="**/*.bat" />
</fileset>
</replaceregexp>
[20/24] incubator-ignite git commit: Merge branches 'ignite-gg-9942'
and 'ignite-sprint-3' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9942
Posted by sb...@apache.org.
Merge branches 'ignite-gg-9942' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9942
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/624eaf45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/624eaf45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/624eaf45
Branch: refs/heads/ignite-gg-10009-2
Commit: 624eaf454d68bb82ff3ecfedd1b2208db4a2e423
Parents: e2cbd21 9b23109
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 2 16:41:11 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 2 16:41:11 2015 +0700
----------------------------------------------------------------------
DEVNOTES.txt | 2 ++
.../apache/ignite/IgniteCacheAffinitySelfTest.java | 2 ++
.../cache/GridCacheOnCopyFlagAbstractSelfTest.java | 16 +++++++++-------
parent/pom.xml | 10 +++++++++-
4 files changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[06/24] incubator-ignite git commit: sp-3
Posted by sb...@apache.org.
sp-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/22688754
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22688754
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22688754
Branch: refs/heads/ignite-gg-10009-2
Commit: 226887545372403f1042f163360e0ee9066e2a12
Parents: 6413426
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Apr 1 17:44:38 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Apr 1 17:44:38 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22688754/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 74a070f..d5c05f7 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
@@ -1060,6 +1060,13 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
/**
+ * @return {@code True} if node is stopping.
+ */
+ private boolean isNodeStopping() {
+ return super.getSpiContext().isStopping();
+ }
+
+ /**
* @throws IgniteSpiException If any error occurs.
* @return {@code true} if IP finder contains local address.
*/
@@ -4695,7 +4702,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
// Ping.
if (msg instanceof TcpDiscoveryPingRequest) {
- if (ctxInitLatch.getCount() > 0 || !getSpiContext().isStopping()) {
+ if (!isNodeStopping()) {
TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg;
TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);
[08/24] incubator-ignite git commit: # GG-9989: API movement.
Posted by sb...@apache.org.
# GG-9989: API movement.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/57b75491
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57b75491
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57b75491
Branch: refs/heads/ignite-gg-10009-2
Commit: 57b754912f1722f25126a7628ca1bb5d05ecf0db
Parents: efd98ba
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Apr 1 18:09:20 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Apr 1 18:09:20 2015 +0300
----------------------------------------------------------------------
.../src/main/scala/org/apache/ignite/visor/visor.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57b75491/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 9005cfe..7b6d1b4 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -1515,7 +1515,7 @@ object visor extends VisorTag {
try
// Cache, IGFS, streamer and DR configurations should be excluded from daemon node config.
spring.loadConfigurations(url, "cacheConfiguration", "fileSystemConfiguration",
- "streamerConfiguration", "drSenderHubConfiguration", "drReceiverHubConfiguration").get1()
+ "streamerConfiguration", "drSenderConfiguration", "drReceiverConfiguration").get1()
finally {
if (log4jTup != null)
U.removeLog4jNoOpLogger(log4jTup)
[22/24] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@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/214a461e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/214a461e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/214a461e
Branch: refs/heads/ignite-gg-10009-2
Commit: 214a461e4da316ea92d92514327fdd6523ab451f
Parents: 71f201c ddb8e91
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 2 12:58:11 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 2 12:58:11 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +
ipc/shmem/README.txt | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 81 ++++++++------------
.../cache/VisorCacheNearConfiguration.java | 11 ++-
.../visor/node/VisorGridConfiguration.java | 28 ++++++-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../resources/META-INF/classnames.properties | 79 +++++--------------
.../GridUriDeploymentFileResourceLoader.java | 2 +-
parent/pom.xml | 10 ++-
9 files changed, 102 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
[23/24] incubator-ignite git commit: # ignite-670 removed defaultTtl
from configuration
Posted by sb...@apache.org.
# ignite-670 removed defaultTtl from configuration
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/93912fef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/93912fef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/93912fef
Branch: refs/heads/ignite-gg-10009-2
Commit: 93912fefab66605c2cbca4447753385b07c9cb1a
Parents: fd51341
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 2 15:22:47 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 2 15:22:47 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 29 -----------
.../processors/cache/GridCacheAdapter.java | 3 +-
.../processors/cache/GridCacheAttributes.java | 8 ---
.../cache/GridCacheConcurrentMap.java | 34 +++++--------
.../processors/cache/GridCacheMapEntry.java | 28 ++++++-----
.../cache/GridCacheMapEntryFactory.java | 2 -
.../processors/cache/GridCacheProcessor.java | 3 --
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java | 16 ++++--
.../distributed/dht/GridDhtCacheEntry.java | 4 +-
.../distributed/dht/GridNoStorageCacheMap.java | 11 +++--
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 5 +-
.../colocated/GridDhtColocatedCacheEntry.java | 4 +-
.../colocated/GridDhtDetachedCacheEntry.java | 5 +-
.../distributed/near/GridNearCacheAdapter.java | 3 +-
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../processors/cache/local/GridLocalCache.java | 3 +-
.../cache/local/GridLocalCacheEntry.java | 3 +-
.../local/atomic/GridLocalAtomicCache.java | 3 +-
.../cache/VisorCacheDefaultConfiguration.java | 11 -----
...idCacheConfigurationConsistencySelfTest.java | 3 --
.../GridCacheDhtEvictionsDisabledSelfTest.java | 8 +--
.../distributed/dht/GridCacheDhtTestUtils.java | 2 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 5 +-
.../IgniteCacheWithIndexingTestSuite.java | 51 ++++++++++++++++++++
.../IgniteH2IndexingSpiTestSuite.java | 18 -------
.../commands/cache/VisorCacheCommand.scala | 1 -
30 files changed, 121 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 8d5ba6c..22148ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -63,12 +63,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Time in milliseconds to wait between rebalance messages to avoid overloading CPU. */
public static final long DFLT_REBALANCE_THROTTLE = 0;
- /**
- * Default time to live. The value is <tt>0</tt> which means that
- * cached objects never expire based on time.
- */
- public static final long DFLT_TIME_TO_LIVE = 0;
-
/** Default number of backups. */
public static final int DFLT_BACKUPS = 0;
@@ -180,9 +174,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Rebalance timeout. */
private long rebalanceTimeout = DFLT_REBALANCE_TIMEOUT;
- /** Default time to live for cache entries. */
- private long ttl = DFLT_TIME_TO_LIVE;
-
/** Cache expiration policy. */
private EvictionPolicy evictPlc;
@@ -405,7 +396,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
storeFactory = cc.getCacheStoreFactory();
swapEnabled = cc.isSwapEnabled();
tmLookupClsName = cc.getTransactionManagerLookupClassName();
- ttl = cc.getDefaultTimeToLive();
typeMeta = cc.getTypeMetadata();
writeBehindBatchSize = cc.getWriteBehindBatchSize();
writeBehindEnabled = cc.isWriteBehindEnabled();
@@ -439,25 +429,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets time to live for all objects in cache. This value can be overridden for individual objects.
- * If not set, then value is {@code 0} which means that objects never expire.
- *
- * @return Time to live for all objects in cache.
- */
- public long getDefaultTimeToLive() {
- return ttl;
- }
-
- /**
- * Sets time to live for all objects in cache. This value can be override for individual objects.
- *
- * @param ttl Time to live for all objects in cache.
- */
- public void setDefaultTimeToLive(long ttl) {
- this.ttl = ttl;
- }
-
- /**
* Gets cache eviction policy. By default, returns {@code null}
* which means that evictions are disabled for cache.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/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 eb1a98f..1d53444 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
@@ -1121,8 +1121,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
*/
@Nullable private GridCacheEntryEx entry0(KeyCacheObject key, AffinityTopologyVersion topVer, boolean create,
boolean touch) {
- GridTriple<GridCacheMapEntry> t = map.putEntryIfObsoleteOrAbsent(topVer, key, null,
- ctx.config().getDefaultTimeToLive(), create);
+ GridTriple<GridCacheMapEntry> t = map.putEntryIfObsoleteOrAbsent(topVer, key, null, create);
GridCacheEntryEx cur = t.get1();
GridCacheEntryEx created = t.get2();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 496817e..755b89a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -198,14 +198,6 @@ public class GridCacheAttributes implements Serializable {
return ccfg.isSwapEnabled();
}
-
- /**
- * @return Default time to live for cache entries.
- */
- public long defaultTimeToLive() {
- return ccfg.getDefaultTimeToLive();
- }
-
/**
* @return Flag indicating whether eviction is synchronized.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/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 f45d00e..5e9c2da 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
@@ -461,24 +461,22 @@ public class GridCacheConcurrentMap {
* @param topVer Topology version.
* @param key Key.
* @param val Value.
- * @param ttl Time to live.
* @return Cache entry for corresponding key-value pair.
*/
- public GridCacheMapEntry putEntry(AffinityTopologyVersion topVer, KeyCacheObject key, @Nullable CacheObject val, long ttl) {
+ public GridCacheMapEntry putEntry(AffinityTopologyVersion topVer, KeyCacheObject key, @Nullable CacheObject val) {
assert key != null;
checkWeakQueue();
int hash = hash(key.hashCode());
- return segmentFor(hash).put(key, hash, val, topVer, ttl);
+ return segmentFor(hash).put(key, hash, val, topVer);
}
/**
* @param topVer Topology version.
* @param key Key.
* @param val Value.
- * @param ttl Time to live.
* @param create Create flag.
* @return Triple where the first element is current entry associated with the key,
* the second is created entry and the third is doomed (all may be null).
@@ -487,7 +485,6 @@ public class GridCacheConcurrentMap {
AffinityTopologyVersion topVer,
KeyCacheObject key,
@Nullable CacheObject val,
- long ttl,
boolean create)
{
assert key != null;
@@ -496,7 +493,7 @@ public class GridCacheConcurrentMap {
int hash = hash(key.hashCode());
- return segmentFor(hash).putIfObsolete(key, hash, val, topVer, ttl, create);
+ return segmentFor(hash).putIfObsolete(key, hash, val, topVer, create);
}
/**
@@ -505,12 +502,11 @@ public class GridCacheConcurrentMap {
* this map had for any of the keys currently in the specified map.
*
* @param m mappings to be stored in this map.
- * @param ttl Time to live.
* @throws NullPointerException If the specified map is null.
*/
- public void putAll(Map<KeyCacheObject, CacheObject> m, long ttl) {
+ public void putAll(Map<KeyCacheObject, CacheObject> m) {
for (Map.Entry<KeyCacheObject, CacheObject> e : m.entrySet())
- putEntry(AffinityTopologyVersion.NONE, e.getKey(), e.getValue(), ttl);
+ putEntry(AffinityTopologyVersion.NONE, e.getKey(), e.getValue());
}
/**
@@ -896,15 +892,14 @@ public class GridCacheConcurrentMap {
* @param hash Hash.
* @param val Value.
* @param topVer Topology version.
- * @param ttl TTL.
* @return Associated value.
*/
@SuppressWarnings({"unchecked"})
- GridCacheMapEntry put(KeyCacheObject key, int hash, @Nullable CacheObject val, AffinityTopologyVersion topVer, long ttl) {
+ GridCacheMapEntry put(KeyCacheObject key, int hash, @Nullable CacheObject val, AffinityTopologyVersion topVer) {
lock();
try {
- return put0(key, hash, val, topVer, ttl);
+ return put0(key, hash, val, topVer);
}
finally {
unlock();
@@ -916,11 +911,10 @@ public class GridCacheConcurrentMap {
* @param hash Hash.
* @param val Value.
* @param topVer Topology version.
- * @param ttl TTL.
* @return Associated value.
*/
@SuppressWarnings({"unchecked", "SynchronizationOnLocalVariableOrMethodParameter"})
- private GridCacheMapEntry put0(KeyCacheObject key, int hash, CacheObject val, AffinityTopologyVersion topVer, long ttl) {
+ private GridCacheMapEntry put0(KeyCacheObject key, int hash, CacheObject val, AffinityTopologyVersion topVer) {
try {
SegmentHeader hdr = this.hdr;
@@ -950,12 +944,12 @@ public class GridCacheConcurrentMap {
if (e != null) {
retVal = e;
- e.rawPut(val, ttl);
+ e.rawPut(val, 0);
}
else {
GridCacheMapEntry next = bin != null ? bin : null;
- GridCacheMapEntry newRoot = factory.create(ctx, topVer, key, hash, val, next, ttl, hdr.id());
+ GridCacheMapEntry newRoot = factory.create(ctx, topVer, key, hash, val, next, hdr.id());
// Avoiding delete (decrement) before creation (increment).
synchronized (newRoot) {
@@ -989,7 +983,6 @@ public class GridCacheConcurrentMap {
* @param hash Hash.
* @param val Value.
* @param topVer Topology version.
- * @param ttl TTL.
* @param create Create flag.
* @return Triple where the first element is current entry associated with the key,
* the second is created entry and the third is doomed (all may be null).
@@ -999,7 +992,6 @@ public class GridCacheConcurrentMap {
int hash,
@Nullable CacheObject val,
AffinityTopologyVersion topVer,
- long ttl,
boolean create)
{
lock();
@@ -1021,7 +1013,7 @@ public class GridCacheConcurrentMap {
if (bin == null) {
if (create)
- cur = created = put0(key, hash, val, topVer, ttl);
+ cur = created = put0(key, hash, val, topVer);
return new GridTriple<>(cur, created, doomed);
}
@@ -1036,13 +1028,13 @@ public class GridCacheConcurrentMap {
doomed = remove(key, hash, null);
if (create)
- cur = created = put0(key, hash, val, topVer, ttl);
+ cur = created = put0(key, hash, val, topVer);
}
else
cur = e;
}
else if (create)
- cur = created = put0(key, hash, val, topVer, ttl);
+ cur = created = put0(key, hash, val, topVer);
return new GridTriple<>(cur, created, doomed);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 58ff57f..78045d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -139,7 +139,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Header id.
*/
protected GridCacheMapEntry(GridCacheContext<?, ?> cctx,
@@ -147,7 +146,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
if (log == null)
@@ -161,8 +159,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
this.hash = hash;
this.cctx = cctx;
- ttlAndExpireTimeExtras(ttl, CU.toExpireTime(ttl));
-
val = cctx.kernalContext().cacheObjects().prepareForCache(val, cctx);
synchronized (this) {
@@ -3515,19 +3511,25 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
boolean expired = checkExpired();
if (expired) {
- if (cctx.deferredDelete() && !detached() && !isInternal()) {
- if (!deletedUnlocked()) {
- update(null, 0L, 0L, ver);
+ if (!obsolete()) {
+ if (cctx.deferredDelete() && !detached() && !isInternal()) {
+ if (!deletedUnlocked()) {
+ update(null, 0L, 0L, ver);
- deletedUnlocked(true);
+ deletedUnlocked(true);
- deferred = true;
+ deferred = true;
+ }
+ }
+ else {
+ if (markObsolete0(obsoleteVer, true))
+ obsolete = true; // Success, will return "true".
}
}
- else {
- if (markObsolete0(obsoleteVer, true))
- obsolete = true; // Success, will return "true".
- }
+
+ clearIndex(saveValueForIndexUnlocked());
+
+ releaseSwap();
if (cctx.events().isRecordable(EVT_CACHE_OBJECT_EXPIRED)) {
cctx.events().addEvent(partition(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
index 1e56674..2c7c28d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
@@ -31,7 +31,6 @@ public interface GridCacheMapEntryFactory {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Header id.
* @return New cache entry.
*/
@@ -41,6 +40,5 @@ public interface GridCacheMapEntryFactory {
int hash,
CacheObject val,
@Nullable GridCacheMapEntry next,
- long ttl,
int hdrId);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/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 00852fc..91c35f4 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
@@ -1967,9 +1967,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "defaultLockTimeout",
"Default lock timeout", locAttr.defaultLockTimeout(), rmtAttr.defaultLockTimeout(), false);
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "defaultTimeToLive",
- "Default time to live", locAttr.defaultTimeToLive(), rmtAttr.defaultTimeToLive(), false);
-
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "preloadBatchSize",
"Preload batch size", locAttr.rebalanceBatchSize(), rmtAttr.rebalanceBatchSize(), false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index a1d83d5..0947a8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -42,7 +42,6 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Cache map header ID.
*/
public GridDistributedCacheEntry(GridCacheContext ctx,
@@ -50,10 +49,9 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
- super(ctx, key, hash, val, next, ttl, hdrId);
+ super(ctx, key, hash, val, next, hdrId);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 6c27566..5594feb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -94,9 +94,15 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
@Override protected void init() {
map.setEntryFactory(new GridCacheMapEntryFactory() {
/** {@inheritDoc} */
- @Override public GridCacheMapEntry create(GridCacheContext ctx, AffinityTopologyVersion topVer, KeyCacheObject key, int hash,
- CacheObject val, GridCacheMapEntry next, long ttl, int hdrId) {
- return new GridDhtCacheEntry(ctx, topVer, key, hash, val, next, ttl, hdrId);
+ @Override public GridCacheMapEntry create(GridCacheContext ctx,
+ AffinityTopologyVersion topVer,
+ KeyCacheObject key,
+ int hash,
+ CacheObject val,
+ GridCacheMapEntry next,
+ int hdrId)
+ {
+ return new GridDhtCacheEntry(ctx, topVer, key, hash, val, next, hdrId);
}
});
}
@@ -346,14 +352,14 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
public GridCacheEntryEx entryExx(KeyCacheObject key, AffinityTopologyVersion topVer, boolean allowDetached, boolean touch) {
try {
return allowDetached && !ctx.affinity().localNode(key, topVer) ?
- new GridDhtDetachedCacheEntry(ctx, key, key.hashCode(), null, null, 0, 0) :
+ new GridDhtDetachedCacheEntry(ctx, key, key.hashCode(), null, null, 0) :
entryEx(key, touch);
}
catch (GridDhtInvalidPartitionException e) {
if (!allowDetached)
throw e;
- return new GridDhtDetachedCacheEntry(ctx, key, key.hashCode(), null, null, 0, 0);
+ return new GridDhtDetachedCacheEntry(ctx, key, key.hashCode(), null, null, 0);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index 7195d1c..35ac08b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -63,7 +63,6 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Header id.
*/
public GridDhtCacheEntry(GridCacheContext ctx,
@@ -72,10 +71,9 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
- super(ctx, key, hash, val, next, ttl, hdrId);
+ super(ctx, key, hash, val, next, hdrId);
// Record this entry with partition.
locPart = ctx.dht().topology().onAdded(topVer, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
index 7bcc5c3..8da4da5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
@@ -71,7 +71,10 @@ public class GridNoStorageCacheMap extends GridCacheConcurrentMap {
}
/** {@inheritDoc} */
- @Override public GridCacheMapEntry putEntry(AffinityTopologyVersion topVer, KeyCacheObject key, @Nullable CacheObject val, long ttl) {
+ @Override public GridCacheMapEntry putEntry(AffinityTopologyVersion topVer,
+ KeyCacheObject key,
+ @Nullable CacheObject val)
+ {
throw new AssertionError();
}
@@ -80,12 +83,10 @@ public class GridNoStorageCacheMap extends GridCacheConcurrentMap {
AffinityTopologyVersion topVer,
KeyCacheObject key,
@Nullable CacheObject val,
- long ttl,
boolean create)
{
if (create) {
- GridCacheMapEntry entry = new GridDhtCacheEntry(ctx, topVer, key, hash(key.hashCode()), val,
- null, 0, 0);
+ GridCacheMapEntry entry = new GridDhtCacheEntry(ctx, topVer, key, hash(key.hashCode()), val, null, 0);
return new GridTriple<>(entry, null, null);
}
@@ -94,7 +95,7 @@ public class GridNoStorageCacheMap extends GridCacheConcurrentMap {
}
/** {@inheritDoc} */
- @Override public void putAll(Map<KeyCacheObject, CacheObject> m, long ttl) {
+ @Override public void putAll(Map<KeyCacheObject, CacheObject> m) {
throw new AssertionError();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index c376fa0..6e7c17f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -133,10 +133,9 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
- return new GridDhtAtomicCacheEntry(ctx, topVer, key, hash, val, next, ttl, hdrId);
+ return new GridDhtAtomicCacheEntry(ctx, topVer, key, hash, val, next, hdrId);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
index c918e1e..9ded1f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
@@ -33,7 +33,6 @@ public class GridDhtAtomicCacheEntry extends GridDhtCacheEntry {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Header id.
*/
public GridDhtAtomicCacheEntry(GridCacheContext ctx,
@@ -42,10 +41,9 @@ public class GridDhtAtomicCacheEntry extends GridDhtCacheEntry {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
- super(ctx, topVer, key, hash, val, next, ttl, hdrId);
+ super(ctx, topVer, key, hash, val, next, hdrId);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index eb6d9a6..77224ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -87,10 +87,9 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
- return new GridDhtColocatedCacheEntry(ctx, topVer, key, hash, val, next, ttl, hdrId);
+ return new GridDhtColocatedCacheEntry(ctx, topVer, key, hash, val, next, hdrId);
}
});
}
@@ -130,7 +129,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
boolean allowDetached
) {
return allowDetached && !ctx.affinity().primary(ctx.localNode(), key, topVer) ?
- new GridDhtDetachedCacheEntry(ctx, key, key.hashCode(), null, null, 0, 0) : entryExx(key, topVer);
+ new GridDhtDetachedCacheEntry(ctx, key, key.hashCode(), null, null, 0) : entryExx(key, topVer);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
index 1ccc0da..fab9605 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
@@ -33,7 +33,6 @@ public class GridDhtColocatedCacheEntry extends GridDhtCacheEntry {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Header id.
*/
public GridDhtColocatedCacheEntry(GridCacheContext ctx,
@@ -42,10 +41,9 @@ public class GridDhtColocatedCacheEntry extends GridDhtCacheEntry {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId
) {
- super(ctx, topVer, key, hash, val, next, ttl, hdrId);
+ super(ctx, topVer, key, hash, val, next, hdrId);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
index 77547db..5c4dd13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
@@ -34,12 +34,11 @@ public class GridDhtDetachedCacheEntry extends GridDistributedCacheEntry {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Header ID.
*/
public GridDhtDetachedCacheEntry(GridCacheContext ctx, KeyCacheObject key, int hash, CacheObject val,
- GridCacheMapEntry next, long ttl, int hdrId) {
- super(ctx, key, hash, val, next, ttl, hdrId);
+ GridCacheMapEntry next, int hdrId) {
+ super(ctx, key, hash, val, next, hdrId);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 75c8978..846efff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -75,12 +75,11 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId
) {
// Can't hold any locks here - this method is invoked when
// holding write-lock on the whole cache map.
- return new GridNearCacheEntry(ctx, key, hash, val, next, ttl, hdrId);
+ return new GridNearCacheEntry(ctx, key, hash, val, next, hdrId);
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
index ce80ad9..13089aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
@@ -58,7 +58,6 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry {
* @param hash Key hash value.
* @param val Entry value.
* @param next Next entry in the linked list.
- * @param ttl Time to live.
* @param hdrId Header id.
*/
public GridNearCacheEntry(GridCacheContext ctx,
@@ -66,10 +65,9 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
- super(ctx, key, hash, val, next, ttl, hdrId);
+ super(ctx, key, hash, val, next, hdrId);
part = ctx.affinity().partition(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
index 272dca6..5780144 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
@@ -79,10 +79,9 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId
) {
- return new GridLocalCacheEntry(ctx, key, hash, val, next, ttl, hdrId);
+ return new GridLocalCacheEntry(ctx, key, hash, val, next, hdrId);
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
index db8038d..d05d1bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
@@ -43,10 +43,9 @@ public class GridLocalCacheEntry extends GridCacheMapEntry {
int hash,
CacheObject val,
GridCacheMapEntry next,
- long ttl,
int hdrId)
{
- super(ctx, key, hash, val, next, ttl, hdrId);
+ super(ctx, key, hash, val, next, hdrId);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/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 a9a6f23..d276501 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
@@ -81,10 +81,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
int hash,
CacheObject val,
@Nullable GridCacheMapEntry next,
- long ttl,
int hdrId
) {
- return new GridLocalCacheEntry(ctx, key, hash, val, next, ttl, hdrId);
+ return new GridLocalCacheEntry(ctx, key, hash, val, next, hdrId);
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
index 858ba75..a0d9990 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -29,9 +29,6 @@ public class VisorCacheDefaultConfiguration implements Serializable {
/** */
private static final long serialVersionUID = 0L;
- /** TTL value. */
- private long ttl;
-
/** Default transaction timeout. */
private long txLockTimeout;
@@ -45,20 +42,12 @@ public class VisorCacheDefaultConfiguration implements Serializable {
public static VisorCacheDefaultConfiguration from(CacheConfiguration ccfg) {
VisorCacheDefaultConfiguration cfg = new VisorCacheDefaultConfiguration();
- cfg.ttl = ccfg.getDefaultTimeToLive();
cfg.txLockTimeout = ccfg.getDefaultLockTimeout();
return cfg;
}
/**
- * @return TTL value.
- */
- public long timeToLive() {
- return ttl;
- }
-
- /**
* @return Default transaction timeout.
*/
public long txLockTimeout() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index 3737f46..44171a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -576,7 +576,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
cfg.setDefaultLockTimeout(1000);
- cfg.setDefaultTimeToLive(1000);
return null;
}
@@ -590,7 +589,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
cfg.setDefaultLockTimeout(2 * 1000);
- cfg.setDefaultTimeToLive(2 * 1000);
return null;
}
@@ -601,7 +599,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
String log = strLog.toString();
assertTrue(log.contains("Default lock timeout"));
- assertTrue(log.contains("Default time to live"));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
index c35f106..6662413 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -26,6 +25,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
* Test cache closure execution.
@@ -54,9 +55,8 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes
CacheConfiguration cc = defaultCacheConfiguration();
cc.setName("test");
- cc.setCacheMode(CacheMode.PARTITIONED);
- cc.setDefaultTimeToLive(0);
- cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ cc.setCacheMode(PARTITIONED);
+ cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setAtomicityMode(TRANSACTIONAL);
cc.setNearConfiguration(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
index 51a3d1c..765fd0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
@@ -71,7 +71,7 @@ public class GridCacheDhtTestUtils {
for (int i = 0; i < keyCnt; i++) {
KeyCacheObject cacheKey = ctx.toCacheKeyObject(i);
- cacheMap.putEntry(AffinityTopologyVersion.NONE, cacheKey, ctx.toCacheKeyObject("value" + i), 0);
+ cacheMap.putEntry(AffinityTopologyVersion.NONE, cacheKey, ctx.toCacheKeyObject("value" + i));
dht.preloader().request(Collections.singleton(cacheKey), AffinityTopologyVersion.NONE);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
index 00ee851..de85025 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
@@ -80,7 +80,7 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest {
Integer val = i++;
map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key),
- key.hashCode(), ctx.toCacheObject(val), null, 0, 1) {
+ key.hashCode(), ctx.toCacheObject(val), null, 1) {
@Override public boolean tmLock(IgniteInternalTx tx, long timeout) {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
index 552e2ea..ebe6f16 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
+import javax.cache.configuration.*;
import javax.cache.expiry.*;
import java.util.*;
@@ -58,10 +59,12 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest {
cache.setAtomicityMode(atomicityMode());
cache.setMemoryMode(memoryMode());
cache.setOffHeapMaxMemory(0);
- cache.setDefaultTimeToLive(DEFAULT_TIME_TO_LIVE);
cache.setEvictionPolicy(new LruEvictionPolicy(MAX_CACHE_SIZE));
cache.setIndexedTypes(Integer.class, Integer.class);
+ cache.setExpiryPolicyFactory(
+ FactoryBuilder.factoryOf(new TouchedExpiryPolicy(new Duration(MILLISECONDS, DEFAULT_TIME_TO_LIVE))));
+
cfg.setCacheConfiguration(cache);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
new file mode 100644
index 0000000..ba6fe36
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
@@ -0,0 +1,51 @@
+/*
+ * 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.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.ttl.*;
+
+/**
+ * Cache tests using indexing.
+ */
+public class IgniteCacheWithIndexingTestSuite extends TestSuite {
+ /**
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite() throws Exception {
+ TestSuite suite = new TestSuite("Ignite Cache With Indexing Test Suite");
+
+ suite.addTestSuite(GridCacheOffHeapAndSwapSelfTest.class);
+ suite.addTestSuite(GridIndexingWithNoopSwapSelfTest.class);
+ suite.addTestSuite(GridCacheSwapSelfTest.class);
+ suite.addTestSuite(GridCacheOffHeapSelfTest.class);
+
+ suite.addTestSuite(CacheTtlOffheapAtomicLocalSelfTest.class);
+ suite.addTestSuite(CacheTtlOffheapAtomicPartitionedSelfTest.class);
+ suite.addTestSuite(CacheTtlOffheapTransactionalLocalSelfTest.class);
+ suite.addTestSuite(CacheTtlOffheapTransactionalPartitionedSelfTest.class);
+ suite.addTestSuite(CacheTtlOnheapTransactionalLocalSelfTest.class);
+ suite.addTestSuite(CacheTtlOnheapTransactionalPartitionedSelfTest.class);
+ suite.addTestSuite(CacheTtlOnheapAtomicLocalSelfTest.class);
+ suite.addTestSuite(CacheTtlOnheapAtomicPartitionedSelfTest.class);
+
+ return suite;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java
index 21076bd..3aff923 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java
@@ -18,8 +18,6 @@
package org.apache.ignite.testsuites;
import junit.framework.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.ttl.*;
import org.apache.ignite.internal.processors.query.h2.*;
import org.apache.ignite.internal.processors.query.h2.opt.*;
@@ -46,22 +44,6 @@ public class IgniteH2IndexingSpiTestSuite extends TestSuite {
// Index rebuilding.
suite.addTest(new TestSuite(GridH2IndexRebuildTest.class));
- // Tests moved to this suite since they require GridH2IndexingSpi.
- suite.addTestSuite(GridCacheOffHeapAndSwapSelfTest.class);
- suite.addTestSuite(GridIndexingWithNoopSwapSelfTest.class);
- suite.addTestSuite(GridCacheSwapSelfTest.class);
- suite.addTestSuite(GridCacheOffHeapSelfTest.class);
-
- //ttl
- suite.addTestSuite(CacheTtlOffheapAtomicLocalSelfTest.class);
- suite.addTestSuite(CacheTtlOffheapAtomicPartitionedSelfTest.class);
- suite.addTestSuite(CacheTtlOffheapTransactionalLocalSelfTest.class);
- suite.addTestSuite(CacheTtlOffheapTransactionalPartitionedSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapTransactionalLocalSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapTransactionalPartitionedSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapAtomicLocalSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapAtomicPartitionedSelfTest.class);
-
return suite;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/93912fef/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 eb6e040..4365364 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
@@ -766,7 +766,6 @@ object VisorCacheCommand {
cacheT += ("Statistic Enabled", bool2Str(cfg.statisticsEnabled()))
cacheT += ("Management Enabled", bool2Str(cfg.managementEnabled()))
- cacheT += ("Time To Live", defaultCfg.timeToLive())
cacheT += ("Time To Live Eager Flag", cfg.eagerTtl)
cacheT += ("Write Synchronization Mode", safe(cfg.writeSynchronizationMode))
[02/24] incubator-ignite git commit: # GG-9942 Fixed Visor logic
after DR was reworked.
Posted by sb...@apache.org.
# GG-9942 Fixed Visor logic after DR was reworked.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c8428a45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c8428a45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c8428a45
Branch: refs/heads/ignite-gg-10009-2
Commit: c8428a453bdee6da2fa0a6221d53c41f157f4e45
Parents: b05b06f
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 1 18:12:43 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 1 18:12:43 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheConfiguration.java | 81 ++++++++------------
.../visor/node/VisorGridConfiguration.java | 28 ++++++-
2 files changed, 58 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8428a45/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..923fedd 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
@@ -121,56 +121,37 @@ public class VisorCacheConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for cache configuration properties.
*/
- public static VisorCacheConfiguration from(Ignite ignite, CacheConfiguration ccfg) {
- VisorCacheConfiguration cfg = new VisorCacheConfiguration();
-
- cfg.name = ccfg.getName();
- cfg.mode = ccfg.getCacheMode();
- cfg.atomicityMode = ccfg.getAtomicityMode();
- cfg.atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode();
- cfg.eagerTtl = ccfg.isEagerTtl();
- cfg.writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
- cfg.swapEnabled = ccfg.isSwapEnabled();
- cfg.invalidate = ccfg.isInvalidate();
- cfg.startSize = ccfg.getStartSize();
- cfg.tmLookupClsName = ccfg.getTransactionManagerLookupClassName();
- cfg.offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
- cfg.maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
- cfg.memoryMode = ccfg.getMemoryMode();
- cfg.interceptor = compactClass(ccfg.getInterceptor());
- cfg.typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata());
- cfg.statisticsEnabled = ccfg.isStatisticsEnabled();
- cfg.mgmtEnabled = ccfg.isManagementEnabled();
- cfg.ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
- cfg.writerFactory = compactClass(ccfg.getCacheWriterFactory());
- cfg.expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
-
- cfg.affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
- cfg.rebalanceCfg = VisorCacheRebalanceConfiguration.from(ccfg);
- cfg.evictCfg = VisorCacheEvictionConfiguration.from(ccfg);
- cfg.nearCfg = VisorCacheNearConfiguration.from(ccfg);
- cfg.dfltCfg = VisorCacheDefaultConfiguration.from(ccfg);
- cfg.storeCfg = VisorCacheStoreConfiguration.from(ignite, ccfg);
- cfg.qryCfg = VisorCacheQueryConfiguration.from(ccfg);
-
- return cfg;
- }
-
- /**
- * @param ignite Grid.
- * @param caches Cache configurations.
- * @return Data transfer object for cache configurations properties.
- */
- public static Iterable<VisorCacheConfiguration> list(Ignite ignite, CacheConfiguration[] caches) {
- if (caches == null)
- return Collections.emptyList();
-
- final Collection<VisorCacheConfiguration> cfgs = new ArrayList<>(caches.length);
-
- for (CacheConfiguration cache : caches)
- cfgs.add(from(ignite, cache));
-
- return cfgs;
+ public VisorCacheConfiguration from(Ignite ignite, CacheConfiguration ccfg) {
+ name = ccfg.getName();
+ mode = ccfg.getCacheMode();
+ atomicityMode = ccfg.getAtomicityMode();
+ atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode();
+ eagerTtl = ccfg.isEagerTtl();
+ writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
+ swapEnabled = ccfg.isSwapEnabled();
+ invalidate = ccfg.isInvalidate();
+ startSize = ccfg.getStartSize();
+ tmLookupClsName = ccfg.getTransactionManagerLookupClassName();
+ offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
+ maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
+ memoryMode = ccfg.getMemoryMode();
+ interceptor = compactClass(ccfg.getInterceptor());
+ typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata());
+ statisticsEnabled = ccfg.isStatisticsEnabled();
+ mgmtEnabled = ccfg.isManagementEnabled();
+ ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
+ writerFactory = compactClass(ccfg.getCacheWriterFactory());
+ expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
+
+ affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
+ rebalanceCfg = VisorCacheRebalanceConfiguration.from(ccfg);
+ evictCfg = VisorCacheEvictionConfiguration.from(ccfg);
+ nearCfg = VisorCacheNearConfiguration.from(ccfg);
+ dfltCfg = VisorCacheDefaultConfiguration.from(ccfg);
+ storeCfg = VisorCacheStoreConfiguration.from(ignite, ccfg);
+ qryCfg = VisorCacheQueryConfiguration.from(ccfg);
+
+ return this;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8428a45/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index f6243c1..6548d07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -106,7 +106,7 @@ public class VisorGridConfiguration implements Serializable {
inclEvtTypes = c.getIncludeEventTypes();
rest = VisorRestConfiguration.from(c);
userAttrs = c.getUserAttributes();
- caches = VisorCacheConfiguration.list(ignite, c.getCacheConfiguration());
+ caches = collectCaches(ignite, c.getCacheConfiguration());
igfss = VisorIgfsConfiguration.list(c.getFileSystemConfiguration());
env = new HashMap<>(System.getenv());
sysProps = IgniteSystemProperties.snapshot();
@@ -194,6 +194,32 @@ public class VisorGridConfiguration implements Serializable {
}
/**
+ * @return List of data transfer objects for caches.
+ */
+ private Iterable<VisorCacheConfiguration> collectCaches(IgniteEx ignite, CacheConfiguration[] ccfgs) {
+ if (ccfgs == null)
+ return Collections.emptyList();
+
+ final Collection<VisorCacheConfiguration> res = new ArrayList<>(ccfgs.length);
+
+ for (CacheConfiguration ccfg : ccfgs)
+ res.add(collectCache(ignite, ccfg));
+
+ return res;
+ }
+
+ /**
+ * Create data transfer object for cache configuration.
+ *
+ * @param ignite Ignite instance.
+ * @param ccfg Cache configuration.
+ * @return Data transfer objects for cache
+ */
+ protected VisorCacheConfiguration collectCache(IgniteEx ignite, CacheConfiguration ccfg) {
+ return new VisorCacheConfiguration().from(ignite, ccfg);
+ }
+
+ /**
* @return Caches.
*/
public Iterable<VisorCacheConfiguration> caches() {
[24/24] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-gg-10009-2
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-10009-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1112946
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1112946
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1112946
Branch: refs/heads/ignite-gg-10009-2
Commit: f111294648e856b6a68c78cdf753a50e81d800f5
Parents: 93912fe 214a461
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 2 15:23:42 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 2 15:23:42 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +
examples/pom.xml | 19 +-
examples/schema-import/pom.xml | 10 +-
ipc/shmem/README.txt | 2 +-
modules/aop/pom.xml | 6 +-
modules/aws/pom.xml | 4 +-
modules/clients/pom.xml | 10 +-
modules/codegen/pom.xml | 4 +-
modules/core/pom.xml | 8 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 16 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../IgniteCacheObjectProcessorImpl.java | 173 +++++++----
.../visor/cache/VisorCacheConfiguration.java | 81 ++---
.../cache/VisorCacheNearConfiguration.java | 11 +-
.../visor/node/VisorGridConfiguration.java | 28 +-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +-
.../resources/META-INF/classnames.properties | 79 ++---
.../ignite/IgniteCacheAffinitySelfTest.java | 2 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 16 +-
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 +++
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++
...maryWriteOrderNearEnabledStoreValueTest.java | 31 ++
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 ++
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 ++++
.../IgniteCacheStoreValueAbstractTest.java | 311 +++++++++++++++++++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +++
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++
.../cache/IgniteCacheTxStoreValueTest.java | 49 +++
.../processors/igfs/IgsfStartCacheTest.java | 115 +++++++
.../junits/common/GridCommonAbstractTest.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 9 +
modules/extdata/p2p/pom.xml | 4 +-
modules/extdata/uri/pom.xml | 4 +-
modules/geospatial/pom.xml | 4 +-
modules/hadoop/pom.xml | 8 +-
modules/hibernate/pom.xml | 6 +-
modules/indexing/pom.xml | 4 +-
modules/jcl/pom.xml | 4 +-
modules/jta/pom.xml | 4 +-
modules/log4j/pom.xml | 4 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 10 +-
modules/schedule/pom.xml | 4 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 8 +-
modules/ssh/pom.xml | 8 +-
modules/urideploy/pom.xml | 6 +-
.../GridUriDeploymentFileResourceLoader.java | 2 +-
modules/visor-console/pom.xml | 8 +-
.../scala/org/apache/ignite/visor/visor.scala | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 8 +-
modules/yardstick/pom.xml | 6 +-
parent/pom.xml | 10 +-
pom.xml | 56 ++--
61 files changed, 1138 insertions(+), 318 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1112946/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
[14/24] incubator-ignite git commit: # GG-9942 Fixed near cache
configuration.
Posted by sb...@apache.org.
# GG-9942 Fixed near cache configuration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2cbd217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2cbd217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2cbd217
Branch: refs/heads/ignite-gg-10009-2
Commit: e2cbd2178a9a4b7a4db171386fda0143b0a025ef
Parents: d47b66a
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 2 11:38:54 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 2 11:38:54 2015 +0700
----------------------------------------------------------------------
.../cache/VisorCacheNearConfiguration.java | 11 ++-
.../resources/META-INF/classnames.properties | 79 ++++++--------------
2 files changed, 29 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2cbd217/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
index 2a5e781..a968f4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
@@ -53,9 +53,14 @@ public class VisorCacheNearConfiguration implements Serializable {
VisorCacheNearConfiguration cfg = new VisorCacheNearConfiguration();
cfg.nearEnabled = GridCacheUtils.isNearEnabled(ccfg);
-// cfg.nearStartSize = ccfg.getNearStartSize(); TODO IGNTIE-45
-// cfg.nearEvictPlc = compactClass(ccfg.getNearEvictionPolicy());
-// cfg.nearEvictMaxSize = evictionPolicyMaxSize(ccfg.getNearEvictionPolicy());
+
+ if (cfg.nearEnabled) {
+ NearCacheConfiguration nccfg = ccfg.getNearConfiguration();
+
+ cfg.nearStartSize = nccfg.getNearStartSize();
+ cfg.nearEvictPlc = compactClass(nccfg.getNearEvictionPolicy());
+ cfg.nearEvictMaxSize = evictionPolicyMaxSize(nccfg.getNearEvictionPolicy());
+ }
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2cbd217/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index ccc6aae..55c1f9d 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -25,8 +25,9 @@ org.apache.ignite.IgniteState
org.apache.ignite.cache.CacheAtomicUpdateTimeoutException
org.apache.ignite.cache.CacheAtomicWriteOrderMode
org.apache.ignite.cache.CacheAtomicityMode
-org.apache.ignite.internal.processors.cache.CacheDistributionMode
+org.apache.ignite.cache.CacheEntryEventSerializableFilter
org.apache.ignite.cache.CacheEntryProcessor
+org.apache.ignite.cache.CacheExistsException
org.apache.ignite.cache.CacheInterceptor
org.apache.ignite.cache.CacheInterceptorAdapter
org.apache.ignite.cache.CacheMemoryMode
@@ -34,6 +35,9 @@ org.apache.ignite.cache.CacheMode
org.apache.ignite.cache.CachePartialUpdateException
org.apache.ignite.cache.CachePeekMode
org.apache.ignite.cache.CacheRebalanceMode
+org.apache.ignite.cache.CacheServerNotFoundException
+org.apache.ignite.cache.CacheTypeFieldMetadata
+org.apache.ignite.cache.CacheTypeMetadata
org.apache.ignite.cache.CacheWriteSynchronizationMode
org.apache.ignite.cache.affinity.AffinityFunction
org.apache.ignite.cache.affinity.AffinityKey
@@ -213,10 +217,10 @@ org.apache.ignite.internal.cluster.ClusterGroupAdapter$AttributeFilter
org.apache.ignite.internal.cluster.ClusterGroupAdapter$CachesFilter
org.apache.ignite.internal.cluster.ClusterGroupAdapter$DaemonFilter
org.apache.ignite.internal.cluster.ClusterGroupAdapter$OthersFilter
-org.apache.ignite.internal.cluster.ClusterGroupAdapter$StreamersFilter
org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
org.apache.ignite.internal.cluster.ClusterNodeLocalMapImpl
org.apache.ignite.internal.cluster.ClusterTopologyCheckedException
+org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException
org.apache.ignite.internal.cluster.IgniteClusterAsyncImpl
org.apache.ignite.internal.cluster.IgniteClusterImpl
org.apache.ignite.internal.cluster.IgniteClusterImpl$1
@@ -252,9 +256,9 @@ org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager$1
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
org.apache.ignite.internal.processors.affinity.GridAffinityMessage
-org.apache.ignite.internal.processors.affinity.GridAffinityProcessor$2
org.apache.ignite.internal.processors.affinity.GridAffinityUtils$AffinityJob
org.apache.ignite.internal.processors.cache.CacheAtomicUpdateTimeoutCheckedException
+org.apache.ignite.internal.processors.cache.CacheDistributionMode
org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection
org.apache.ignite.internal.processors.cache.CacheEntryPredicate
org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter
@@ -263,8 +267,6 @@ org.apache.ignite.internal.processors.cache.CacheEntryPredicateHasValue
org.apache.ignite.internal.processors.cache.CacheEntryPredicateNoValue
org.apache.ignite.internal.processors.cache.CacheEntrySerializablePredicate
org.apache.ignite.internal.processors.cache.CacheEvictionEntry
-org.apache.ignite.internal.processors.cache.CacheFlag
-org.apache.ignite.internal.processors.cache.CacheFlagException
org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult
org.apache.ignite.internal.processors.cache.CacheInvokeEntry$Operation
org.apache.ignite.internal.processors.cache.CacheInvokeResult
@@ -319,7 +321,6 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdatePutAndGetTime
org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdatePutTimeStatClosure
org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdateRemoveTimeStatClosure
org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdateTimeStatClosure
-org.apache.ignite.internal.processors.cache.GridCacheAtomicVersionComparator
org.apache.ignite.internal.processors.cache.GridCacheAttributes
org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$1
org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$2
@@ -334,8 +335,7 @@ org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Set0
org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$ValueIterator
org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Values
org.apache.ignite.internal.processors.cache.GridCacheContext
-org.apache.ignite.internal.processors.cache.GridCacheContext$2
-org.apache.ignite.internal.processors.cache.GridCacheContext$5
+org.apache.ignite.internal.processors.cache.GridCacheContext$4
org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper
org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$1
org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$2
@@ -404,6 +404,7 @@ org.apache.ignite.internal.processors.cache.GridCacheSwapManager$5
org.apache.ignite.internal.processors.cache.GridCacheSwapManager$6
org.apache.ignite.internal.processors.cache.GridCacheSwapManager$7
org.apache.ignite.internal.processors.cache.GridCacheSwapManager$IteratorWrapper
+org.apache.ignite.internal.processors.cache.GridCacheTryPutFailedException
org.apache.ignite.internal.processors.cache.GridCacheUtilityKey
org.apache.ignite.internal.processors.cache.GridCacheUtils$10
org.apache.ignite.internal.processors.cache.GridCacheUtils$11
@@ -435,8 +436,6 @@ org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1
org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StatefulValue
org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StoreOperation
org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$ValueStatus
-org.apache.ignite.internal.processors.cache.GridPartitionLockKey
-org.apache.ignite.cache.CacheExistsException
org.apache.ignite.internal.processors.cache.IgniteCacheProxy
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$1
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2
@@ -483,9 +482,10 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$1
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$2
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$3
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$3
+org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$4
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$1
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$2
+org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$3
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState
@@ -520,7 +520,8 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest
org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$1
org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$2
org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$1$1
+org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$2
+org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$2$1
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$10
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$11
@@ -656,7 +657,6 @@ org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManag
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$4
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$5
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$6
-org.apache.ignite.internal.processors.cache.query.GridCacheQueriesImpl
org.apache.ignite.internal.processors.cache.query.GridCacheQueriesProxy
org.apache.ignite.internal.processors.cache.query.GridCacheQueryAdapter$1
org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$1
@@ -695,6 +695,7 @@ org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery
org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEvent
+org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$2
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$DeployableObject
@@ -766,9 +767,9 @@ org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry
org.apache.ignite.internal.processors.cache.version.GridCacheVersion
org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext$State
org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx
-org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$1
-org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$2
-org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$IgniteCacheObjectImpl
+org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectByteArrayImpl
+org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectImpl
+org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl
org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage
org.apache.ignite.internal.processors.clock.GridClockDeltaVersion
org.apache.ignite.internal.processors.closure.GridClosurePolicy
@@ -1008,21 +1009,6 @@ org.apache.ignite.internal.processors.service.GridServiceProxy
org.apache.ignite.internal.processors.service.GridServiceProxy$ServiceProxyCallable
org.apache.ignite.internal.processors.service.ServiceContextImpl
org.apache.ignite.internal.processors.service.ServiceDescriptorImpl
-org.apache.ignite.internal.processors.streamer.GridStreamerAttributes
-org.apache.ignite.internal.processors.streamer.GridStreamerCancelRequest
-org.apache.ignite.internal.processors.streamer.GridStreamerExecutionBatch
-org.apache.ignite.internal.processors.streamer.GridStreamerExecutionRequest
-org.apache.ignite.internal.processors.streamer.GridStreamerResponse
-org.apache.ignite.internal.processors.streamer.GridStreamerRouteFailedException
-org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl
-org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl$3
-org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl$StreamerPda
-org.apache.ignite.internal.processors.streamer.task.GridStreamerBroadcastTask
-org.apache.ignite.internal.processors.streamer.task.GridStreamerBroadcastTask$StreamerBroadcastJob
-org.apache.ignite.internal.processors.streamer.task.GridStreamerQueryTask
-org.apache.ignite.internal.processors.streamer.task.GridStreamerQueryTask$QueryJob
-org.apache.ignite.internal.processors.streamer.task.GridStreamerReduceTask
-org.apache.ignite.internal.processors.streamer.task.GridStreamerReduceTask$ReduceJob
org.apache.ignite.internal.processors.task.GridTaskProcessor$1
org.apache.ignite.internal.processors.task.GridTaskThreadContextKey
org.apache.ignite.internal.processors.task.GridTaskWorker$3
@@ -1420,7 +1406,6 @@ org.apache.ignite.internal.visor.event.VisorGridDiscoveryEvent
org.apache.ignite.internal.visor.event.VisorGridEvent
org.apache.ignite.internal.visor.event.VisorGridEventsLost
org.apache.ignite.internal.visor.event.VisorGridJobEvent
-org.apache.ignite.internal.visor.event.VisorGridSecuritySessionEvent
org.apache.ignite.internal.visor.event.VisorGridTaskEvent
org.apache.ignite.internal.visor.file.VisorFileBlock
org.apache.ignite.internal.visor.file.VisorFileBlockTask
@@ -1501,14 +1486,6 @@ org.apache.ignite.internal.visor.query.VisorQueryTask
org.apache.ignite.internal.visor.query.VisorQueryTask$VisorFutureResultSetHolder
org.apache.ignite.internal.visor.query.VisorQueryTask$VisorQueryArg
org.apache.ignite.internal.visor.query.VisorQueryTask$VisorQueryJob
-org.apache.ignite.internal.visor.streamer.VisorStreamer
-org.apache.ignite.internal.visor.streamer.VisorStreamerConfiguration
-org.apache.ignite.internal.visor.streamer.VisorStreamerMetrics
-org.apache.ignite.internal.visor.streamer.VisorStreamerMetricsResetTask
-org.apache.ignite.internal.visor.streamer.VisorStreamerMetricsResetTask$VisorStreamerMetricsResetJob
-org.apache.ignite.internal.visor.streamer.VisorStreamerResetTask
-org.apache.ignite.internal.visor.streamer.VisorStreamerResetTask$VisorStreamerResetJob
-org.apache.ignite.internal.visor.streamer.VisorStreamerStageMetrics
org.apache.ignite.internal.visor.util.VisorEventMapper
org.apache.ignite.internal.visor.util.VisorTaskUtils$4
org.apache.ignite.lang.IgniteBiClosure
@@ -1530,6 +1507,7 @@ org.apache.ignite.lifecycle.LifecycleEventType
org.apache.ignite.marshaller.jdk.JdkMarshallerDummySerializable
org.apache.ignite.marshaller.optimized.OptimizedFieldType
org.apache.ignite.messaging.MessagingListenActor
+org.apache.ignite.plugin.CachePluginConfiguration
org.apache.ignite.plugin.PluginNotFoundException
org.apache.ignite.plugin.PluginValidationException
org.apache.ignite.plugin.extensions.communication.Message
@@ -1600,15 +1578,9 @@ org.apache.ignite.startup.cmdline.AboutDialog
org.apache.ignite.startup.cmdline.AboutDialog$1
org.apache.ignite.stream.StreamReceiver
org.apache.ignite.stream.StreamTransformer
-org.apache.ignite.streamer.index.StreamerIndexPolicy
-org.apache.ignite.streamer.index.StreamerIndexProviderAdapter$1
-org.apache.ignite.streamer.index.StreamerIndexProviderAdapter$2
-org.apache.ignite.streamer.window.StreamerBoundedSizeBatchWindow$Batch
-org.apache.ignite.streamer.window.StreamerBoundedSizeBatchWindow$QueueHolder
-org.apache.ignite.streamer.window.StreamerBoundedSizeWindowAdapter$WindowHolder
-org.apache.ignite.streamer.window.StreamerBoundedTimeBatchWindow$Batch
-org.apache.ignite.streamer.window.StreamerBoundedTimeBatchWindow$WindowHolder
-org.apache.ignite.streamer.window.StreamerBoundedTimeWindow$WindowHolder
+org.apache.ignite.stream.StreamTransformer$1
+org.apache.ignite.stream.StreamVisitor
+org.apache.ignite.stream.StreamVisitor$1
org.apache.ignite.transactions.TransactionConcurrency
org.apache.ignite.transactions.TransactionHeuristicException
org.apache.ignite.transactions.TransactionIsolation
@@ -1617,12 +1589,3 @@ org.apache.ignite.transactions.TransactionOptimisticException
org.apache.ignite.transactions.TransactionRollbackException
org.apache.ignite.transactions.TransactionState
org.apache.ignite.transactions.TransactionTimeoutException
-org.jdk8.backport.ConcurrentHashMap8
-org.jdk8.backport.ConcurrentHashMap8$KeySetView
-org.jdk8.backport.ConcurrentHashMap8$Segment
-org.jdk8.backport.ConcurrentLinkedHashMap$QueuePolicy
-org.jdk8.backport.ConcurrentLinkedHashMap$Segment
-org.jdk8.backport.ConcurrentLinkedHashMap$WriteThroughEntry
-org.jdk8.backport.LongAdder8
-org.jdk8.backport.Striped64_8
-org.jdk8.backport.ThreadLocalRandom8
[21/24] incubator-ignite git commit: Merge branch 'ignite-gg-9942'
into ignite-sprint-3
Posted by sb...@apache.org.
Merge branch 'ignite-gg-9942' 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/ddb8e91a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ddb8e91a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ddb8e91a
Branch: refs/heads/ignite-gg-10009-2
Commit: ddb8e91ad4a7dd2dd5b6e7e8d603e8927fdae6c6
Parents: 0e297a6 624eaf4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 2 16:51:16 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 2 16:51:16 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheConfiguration.java | 81 ++++++++------------
.../cache/VisorCacheNearConfiguration.java | 11 ++-
.../visor/node/VisorGridConfiguration.java | 28 ++++++-
.../resources/META-INF/classnames.properties | 79 +++++--------------
4 files changed, 87 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
[13/24] incubator-ignite git commit: Merge branches 'ignite-gg-9942'
and 'ignite-sprint-3' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9942
Posted by sb...@apache.org.
Merge branches 'ignite-gg-9942' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9942
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d47b66a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d47b66a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d47b66a2
Branch: refs/heads/ignite-gg-10009-2
Commit: d47b66a2177367e3e86e1ffba9217589783d27d1
Parents: c8428a4 ed6632a
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 2 08:51:46 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 2 08:51:46 2015 +0700
----------------------------------------------------------------------
examples/pom.xml | 19 +-
examples/schema-import/pom.xml | 10 +-
modules/aop/pom.xml | 6 +-
modules/aws/pom.xml | 4 +-
modules/clients/pom.xml | 10 +-
modules/codegen/pom.xml | 4 +-
modules/core/pom.xml | 8 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 16 +-
.../continuous/CacheContinuousQueryManager.java | 28 ++
.../IgniteCacheObjectProcessorImpl.java | 173 +++++++----
.../processors/igfs/IgfsDataManager.java | 11 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +-
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 +++
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++
...maryWriteOrderNearEnabledStoreValueTest.java | 31 ++
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 ++
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 ++++
.../IgniteCacheStoreValueAbstractTest.java | 311 +++++++++++++++++++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +++
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++
.../cache/IgniteCacheTxStoreValueTest.java | 49 +++
.../junits/common/GridCommonAbstractTest.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 9 +
modules/extdata/p2p/pom.xml | 4 +-
modules/extdata/uri/pom.xml | 4 +-
modules/geospatial/pom.xml | 4 +-
modules/hadoop/pom.xml | 8 +-
modules/hibernate/pom.xml | 6 +-
modules/indexing/pom.xml | 4 +-
modules/jcl/pom.xml | 4 +-
modules/jta/pom.xml | 4 +-
modules/log4j/pom.xml | 4 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 10 +-
modules/schedule/pom.xml | 4 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 8 +-
modules/ssh/pom.xml | 8 +-
modules/urideploy/pom.xml | 6 +-
modules/visor-console/pom.xml | 8 +-
.../scala/org/apache/ignite/visor/visor.scala | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 8 +-
modules/yardstick/pom.xml | 6 +-
pom.xml | 56 ++--
52 files changed, 947 insertions(+), 221 deletions(-)
----------------------------------------------------------------------
[03/24] incubator-ignite git commit: # ignite-662
Posted by sb...@apache.org.
# ignite-662
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5caa1078
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5caa1078
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5caa1078
Branch: refs/heads/ignite-gg-10009-2
Commit: 5caa107806fde27487a15b6c8f6ca3769dbb959b
Parents: 35d05e9
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 1 13:49:48 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 1 15:33:57 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 16 +-
.../IgniteCacheObjectProcessorImpl.java | 14 +-
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 ++++
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++
...maryWriteOrderNearEnabledStoreValueTest.java | 31 +++
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 +++
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 ++++
.../IgniteCacheStoreValueAbstractTest.java | 277 +++++++++++++++++++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 ++++
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++
.../cache/IgniteCacheTxStoreValueTest.java | 49 ++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 9 +
15 files changed, 651 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index 5c1b5ae..e85a04a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -40,7 +40,7 @@ public class CacheObjectContext {
private boolean cpyOnGet;
/** */
- private boolean unmarshalVals;
+ private boolean storeVal;
/** */
private boolean p2pEnabled;
@@ -49,17 +49,17 @@ public class CacheObjectContext {
* @param kernalCtx Kernal context.
* @param dfltAffMapper Default affinity mapper.
* @param cpyOnGet Copy on get flag.
- * @param unmarshalVals Unmarshal values flag.
+ * @param storeVal {@code True} if should store unmarshalled value in cache.
*/
public CacheObjectContext(GridKernalContext kernalCtx,
AffinityKeyMapper dfltAffMapper,
boolean cpyOnGet,
- boolean unmarshalVals) {
+ boolean storeVal) {
this.kernalCtx = kernalCtx;
this.p2pEnabled = kernalCtx.config().isPeerClassLoadingEnabled();
this.dfltAffMapper = dfltAffMapper;
this.cpyOnGet = cpyOnGet;
- this.unmarshalVals = unmarshalVals;
+ this.storeVal = storeVal;
proc = kernalCtx.cacheObjects();
}
@@ -79,10 +79,10 @@ public class CacheObjectContext {
}
/**
- * @return Unmarshal values flag.
+ * @return {@code True} if should store unmarshalled value in cache.
*/
- public boolean unmarshalValues() {
- return unmarshalVals;
+ public boolean storeValue() {
+ return storeVal;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
index b131535..33a747d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
@@ -67,13 +67,17 @@ public class CacheObjectImpl extends CacheObjectAdapter {
assert valBytes != null;
- val = ctx.processor().unmarshal(ctx, valBytes, ctx.kernalContext().config().getClassLoader());
+ Object val = ctx.processor().unmarshal(ctx, valBytes, ctx.kernalContext().config().getClassLoader());
+
+ if (ctx.storeValue())
+ this.val = val;
+
+ return (T)val;
}
catch (IgniteCheckedException e) {
throw new IgniteException("Failed to unmarshal object.", e);
}
- return (T)val;
}
/** {@inheritDoc} */
@@ -96,7 +100,7 @@ public class CacheObjectImpl extends CacheObjectAdapter {
@Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException {
assert val != null || valBytes != null;
- if (val == null && ctx.unmarshalValues())
+ if (val == null && ctx.storeValue())
val = ctx.processor().unmarshal(ctx, valBytes, ldr);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 58ff57f..d7fbde9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -3674,7 +3674,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
try {
GridCacheQueryManager qryMgr = cctx.queries();
- if (qryMgr != null) {
+ if (qryMgr != null && qryMgr.enabled()) {
qryMgr.store(key.value(cctx.cacheObjectContext(), false),
null,
CU.value(val, cctx, false),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 145fb9c..6c8cf9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -91,6 +91,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/** Event listener. */
private GridLocalEventListener lsnr;
+ /** */
+ private boolean enabled;
+
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
qryProc = cctx.kernalContext().query();
@@ -135,6 +138,15 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
};
cctx.events().addListener(lsnr, EVT_NODE_LEFT, EVT_NODE_FAILED);
+
+ enabled = GridQueryProcessor.isEnabled(cctx.config());
+ }
+
+ /**
+ * @return {@code True} if indexing is enabled for cache.
+ */
+ public boolean enabled() {
+ return enabled;
}
/** {@inheritDoc} */
@@ -334,8 +346,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
throws IgniteCheckedException {
assert key != null;
assert val != null || valBytes != null;
+ assert enabled();
- if (!GridQueryProcessor.isEnabled(cctx.config()) && !(key instanceof GridCacheInternal))
+ if (key instanceof GridCacheInternal)
return; // No-op.
if (!enterBusy())
@@ -356,6 +369,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/**
* @param key Key.
+ * @param val Value.
* @throws IgniteCheckedException Thrown in case of any errors.
*/
@SuppressWarnings("SimplifiableIfStatement")
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index c0be7c9..a9b7c00 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -233,10 +233,14 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
if (ccfg != null) {
CacheMemoryMode memMode = ccfg.getMemoryMode();
+ boolean storeVal = ctx.config().isPeerClassLoadingEnabled() ||
+ GridQueryProcessor.isEnabled(ccfg) ||
+ !ccfg.isCopyOnRead();
+
return new CacheObjectContext(ctx,
new GridCacheDefaultAffinityKeyMapper(),
ccfg.isCopyOnRead() && memMode == ONHEAP_TIERED,
- ctx.config().isPeerClassLoadingEnabled() || GridQueryProcessor.isEnabled(ccfg));
+ storeVal);
}
else
return new CacheObjectContext(
@@ -323,7 +327,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
}
/**
- *
+ * @param val Value.
+ * @param valBytes Value bytes.
*/
public IgniteCacheObjectImpl(Object val, byte[] valBytes) {
super(val, valBytes);
@@ -341,7 +346,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
if (valBytes == null)
valBytes = ctx.processor().marshal(ctx, val);
- if (ctx.unmarshalValues()) {
+ if (ctx.storeValue()) {
ClassLoader ldr = ctx.p2pEnabled() ?
IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader();
@@ -355,7 +360,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
catch (IgniteCheckedException e) {
throw new IgniteException("Failed to marshal object: " + val, e);
}
- } else
+ }
+ else
return new CacheObjectImpl(val, valBytes);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalStoreValueTest.java
new file mode 100644
index 0000000..c547ae0
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalStoreValueTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheAtomicLocalStoreValueTest extends IgniteCacheStoreValueAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return LOCAL;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return ATOMIC;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledStoreValueTest.java
new file mode 100644
index 0000000..a86c50c
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledStoreValueTest.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.configuration.*;
+
+/**
+ *
+ */
+public class IgniteCacheAtomicNearEnabledStoreValueTest extends IgniteCacheAtomicStoreValueTest {
+ /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return new NearCacheConfiguration();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java
new file mode 100644
index 0000000..a759ea3
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.configuration.*;
+
+/**
+ *
+ */
+public class IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest
+ extends IgniteCacheAtomicPrimaryWriteOrderStoreValueTest {
+ /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return new NearCacheConfiguration();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
new file mode 100644
index 0000000..17ae2bd
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheAtomicPrimaryWriteOrderStoreValueTest extends IgniteCacheAtomicStoreValueTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
+ return PRIMARY;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
new file mode 100644
index 0000000..9b8f0b1
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheAtomicStoreValueTest extends IgniteCacheStoreValueAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 4;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return ATOMIC;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
+ return CLOCK;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
new file mode 100644
index 0000000..9fa24cc
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
@@ -0,0 +1,277 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.store.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.*;
+
+import javax.cache.*;
+import javax.cache.integration.*;
+import javax.cache.processor.*;
+import java.io.*;
+import java.lang.ref.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
+/**
+ *
+ */
+public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ cfg.setPeerClassLoadingEnabled(false);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration ccfg = super.cacheConfiguration(gridName);
+
+ if (ccfg.getCacheMode() != CacheMode.LOCAL)
+ assertEquals(1, ccfg.getBackups());
+
+ assertTrue(ccfg.isCopyOnRead());
+
+ assertEquals(FULL_SYNC, ccfg.getWriteSynchronizationMode());
+
+ ccfg.setCacheStoreFactory(singletonFactory(new CacheStoreAdapter() {
+ @Override public void loadCache(IgniteBiInClosure clo, Object... args) {
+ clo.apply(new TestKey(1), new TestValue());
+ }
+
+ @Override public Object load(Object key) throws CacheLoaderException {
+ return null;
+ }
+
+ @Override public void write(Cache.Entry entry) throws CacheWriterException {
+ // No-op.
+ }
+
+ @Override public void delete(Object key) throws CacheWriterException {
+ // No-op.
+ }
+ }));
+
+ ccfg.setInterceptor(new TestInterceptor());
+
+ return ccfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected boolean swapEnabled() {
+ return true;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testValueNotStored() throws Exception {
+ IgniteCache<TestKey, TestValue> cache = grid(0).cache(null);
+
+ Affinity<Object> aff = grid(0).affinity(null);
+
+ final List<WeakReference<Object>> refs = new ArrayList<>();
+
+ for (int i = 0; i < 1000; i++) {
+ TestKey key = new TestKey(i);
+ TestValue val = new TestValue();
+
+ refs.add(new WeakReference<Object>(val));
+
+ cache.put(key, val);
+
+ checkNoValue(aff, key);
+
+ for (int g = 0; g < gridCount(); g++)
+ assertNotNull(grid(g).cache(null).get(key));
+
+ checkNoValue(aff, key);
+
+ cache.invoke(key, new CacheEntryProcessor<TestKey, TestValue, Object>() {
+ @Override public Object process(MutableEntry<TestKey, TestValue> entry, Object... args) {
+ assertNotNull(entry.getValue());
+
+ entry.setValue(new TestValue());
+
+ return new TestValue();
+ }
+ });
+
+ checkNoValue(aff, key);
+
+ for (int g = 0; g < gridCount(); g++)
+ assertNotNull(grid(g).cache(null).get(key));
+
+ checkNoValue(aff, key);
+
+ cache.remove(key);
+
+ for (int g = 0; g < gridCount(); g++)
+ assertNull(grid(g).cache(null).get(key));
+
+ try (IgniteDataStreamer streamer = grid(0).dataStreamer(null)) {
+ streamer.addData(key, val);
+ }
+
+ checkNoValue(aff, key);
+
+ if (aff.isPrimaryOrBackup(grid(0).localNode(), key)) {
+ cache.localEvict(Collections.singleton(key));
+
+ assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
+
+ cache.localPromote(Collections.singleton(key));
+
+ assertNotNull(cache.localPeek(key, CachePeekMode.ONHEAP));
+
+ checkNoValue(aff, key);
+ }
+ }
+
+ cache.loadCache(null); // Should load TestKey(1).
+
+ TestKey key = new TestKey(1);
+
+ checkNoValue(aff, key);
+
+ for (int g = 0; g < gridCount(); g++)
+ assertNotNull(grid(g).cache(null).get(key));
+
+ checkNoValue(aff, key);
+
+// boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
+// @Override public boolean apply() {
+// System.gc();
+//
+// boolean pass = true;
+//
+// for (Iterator<WeakReference<Object>> it = refs.iterator(); it.hasNext();) {
+// WeakReference<Object> ref = it.next();
+//
+// if (ref.get() == null)
+// it.remove();
+// else
+// pass = false;
+// }
+//
+// return pass;
+// }
+// }, 10_000);
+//
+// assertTrue("Failed to wait for when values are collected", wait);
+ }
+
+ /**
+ * @param aff Affinity.
+ * @param key Key.
+ */
+ private void checkNoValue(Affinity<Object> aff, Object key) {
+ for (int g = 0; g < gridCount(); g++) {
+ GridCacheAdapter cache0 = internalCache(grid(g), null);
+
+ GridCacheEntryEx e = cache0.peekEx(key);
+
+ if (e == null && cache0.isNear())
+ e = ((GridNearCacheAdapter)cache0).dht().peekEx(key);
+
+ if (e != null) {
+ CacheObject obj = e.rawGet();
+
+ if (obj != null) {
+ assertNotNull(obj);
+ assertEquals(CacheObjectImpl.class, obj.getClass());
+
+ assertNull("Unexpected value, node: " + g,
+ GridTestUtils.getFieldValue(obj, CacheObjectAdapter.class, "val"));
+
+ assertNotNull(obj.value(cache0.context().cacheObjectContext(), true));
+
+ assertNull("Unexpected value after value() requested1: " + g,
+ GridTestUtils.getFieldValue(obj, CacheObjectAdapter.class, "val"));
+
+ assertNotNull(obj.value(cache0.context().cacheObjectContext(), false));
+
+ assertNull("Unexpected value after value() requested2: " + g,
+ GridTestUtils.getFieldValue(obj, CacheObjectAdapter.class, "val"));
+ }
+ else
+ assertFalse(aff.isPrimaryOrBackup(grid(g).localNode(), key));
+ }
+ else
+ assertFalse("Entry not found, node: " + g, aff.isPrimaryOrBackup(grid(g).localNode(), key));
+ }
+ }
+
+ /**
+ *
+ */
+ static class TestKey implements Serializable {
+ /** */
+ private int key;
+
+ /**
+ * @param key Key.
+ */
+ public TestKey(int key) {
+ this.key = key;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ TestKey that = (TestKey)o;
+
+ return key == that.key;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return key;
+ }
+ }
+
+ /**
+ *
+ */
+ static class TestValue implements Serializable {
+ // No-op.
+ }
+
+ /**
+ *
+ */
+ static class TestInterceptor extends CacheInterceptorAdapter {
+ // No-op.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalStoreValueTest.java
new file mode 100644
index 0000000..c9a0cdd
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalStoreValueTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheTxLocalStoreValueTest extends IgniteCacheStoreValueAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return LOCAL;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return TRANSACTIONAL;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledStoreValueTest.java
new file mode 100644
index 0000000..29b8307
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledStoreValueTest.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.configuration.*;
+
+/**
+ *
+ */
+public class IgniteCacheTxNearEnabledStoreValueTest extends IgniteCacheTxStoreValueTest {
+ /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return new NearCacheConfiguration();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxStoreValueTest.java
new file mode 100644
index 0000000..390224f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxStoreValueTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheTxStoreValueTest extends IgniteCacheStoreValueAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 4;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return TRANSACTIONAL;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5caa1078/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 e3fefc8..9e50565 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
@@ -415,6 +415,15 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheMarshallingNodeJoinSelfTest.class);
+ suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
+
return suite;
}
}
[04/24] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-662
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-662
Conflicts:
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.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/1a9de867
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a9de867
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a9de867
Branch: refs/heads/ignite-gg-10009-2
Commit: 1a9de86780567eb99d82b7c9a08d32fd6462264e
Parents: 5caa107 dc62822
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 1 15:52:05 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 1 15:52:05 2015 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheQueryExample.java | 12 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../ignite/internal/GridCachePluginContext.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../cache/DynamicCacheDescriptor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 66 +++++------
.../continuous/CacheContinuousQueryManager.java | 28 +++++
.../processors/igfs/IgfsDataManager.java | 11 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +---
.../processors/igfs/IgfsHelperImpl.java | 3 +-
.../processors/plugin/CachePluginManager.java | 2 +-
.../ignite/plugin/CachePluginConfiguration.java | 5 +-
.../ignite/plugin/CachePluginContext.java | 2 +-
.../ignite/plugin/CachePluginProvider.java | 3 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +++++++++
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 +++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +++++++++
.../testsuites/IgniteHibernateTestSuite.java | 2 +
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
.../ant/beautifier/GridJavadocAntTask.java | 8 +-
27 files changed, 341 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9de867/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 9e50565,6fdaa00..a4553c4
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@@ -415,15 -415,8 +415,17 @@@ public class IgniteCacheTestSuite exten
suite.addTestSuite(GridCacheMarshallingNodeJoinSelfTest.class);
+ suite.addTestSuite(IgniteCacheJdbcBlobStoreNodeRestartTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
+
return suite;
}
}
[10/24] incubator-ignite git commit: # ignite-sprint-3 minor (fixed
test, use static classes in CacheObjectProcessor)
Posted by sb...@apache.org.
# ignite-sprint-3 minor (fixed test, use static classes in CacheObjectProcessor)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8a86e387
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8a86e387
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8a86e387
Branch: refs/heads/ignite-gg-10009-2
Commit: 8a86e387be58d670acfdf06e4d9e83fe657106c9
Parents: b7659f3
Author: sboikov <se...@inria.fr>
Authored: Wed Apr 1 22:11:37 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Wed Apr 1 22:19:58 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheObjectProcessorImpl.java | 165 ++++++++++++-------
.../IgniteCacheStoreValueAbstractTest.java | 92 +++++++----
.../junits/common/GridCommonAbstractTest.java | 2 +-
3 files changed, 167 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a86e387/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index a9b7c00..f65b7bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
@@ -114,34 +113,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
if (!userObj)
return new KeyCacheObjectImpl(obj, null);
- return new KeyCacheObjectImpl(obj, null) {
- @Nullable @Override public <T> T value(CacheObjectContext ctx, boolean cpy) {
- return super.value(ctx, false); // Do not need copy since user value is not in cache.
- }
-
- @Override public CacheObject prepareForCache(CacheObjectContext ctx) {
- try {
- if (!ctx.processor().immutable(val)) {
- if (valBytes == null)
- valBytes = ctx.processor().marshal(ctx, val);
-
- ClassLoader ldr = ctx.p2pEnabled() ?
- IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader();
-
- Object val = ctx.processor().unmarshal(ctx,
- valBytes,
- ldr);
-
- return new KeyCacheObjectImpl(val, valBytes);
- }
-
- return new KeyCacheObjectImpl(val, valBytes);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException("Failed to marshal object: " + val, e);
- }
- }
- };
+ return new UserKeyCacheObjectImpl(obj);
}
/** {@inheritDoc} */
@@ -208,23 +180,13 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
if (!userObj)
return new CacheObjectByteArrayImpl((byte[])obj);
- return new CacheObjectByteArrayImpl((byte[]) obj) {
- @Nullable @Override public <T> T value(CacheObjectContext ctx, boolean cpy) {
- return super.value(ctx, false); // Do not need copy since user value is not in cache.
- }
-
- @Override public CacheObject prepareForCache(CacheObjectContext ctx) {
- byte[] valCpy = Arrays.copyOf(val, val.length);
-
- return new CacheObjectByteArrayImpl(valCpy);
- }
- };
+ return new UserCacheObjectByteArrayImpl((byte[])obj);
}
if (!userObj)
return new CacheObjectImpl(obj, null);
- return new IgniteCacheObjectImpl(obj, null);
+ return new UserCacheObjectImpl(obj, null);
}
/** {@inheritDoc} */
@@ -313,16 +275,65 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
}
/**
- *
+ * Wraps key provided by user, must be serialized before stored in cache.
*/
- private static class IgniteCacheObjectImpl extends CacheObjectImpl {
+ private static class UserKeyCacheObjectImpl extends KeyCacheObjectImpl {
/** */
private static final long serialVersionUID = 0L;
/**
*
*/
- public IgniteCacheObjectImpl() {
+ public UserKeyCacheObjectImpl() {
+ //No-op.
+ }
+
+ /**
+ * @param key Key.
+ */
+ UserKeyCacheObjectImpl(Object key) {
+ super(key, null);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public <T> T value(CacheObjectContext ctx, boolean cpy) {
+ return super.value(ctx, false); // Do not need copy since user value is not in cache.
+ }
+
+ /** {@inheritDoc} */
+ @Override public CacheObject prepareForCache(CacheObjectContext ctx) {
+ try {
+ if (!ctx.processor().immutable(val)) {
+ if (valBytes == null)
+ valBytes = ctx.processor().marshal(ctx, val);
+
+ ClassLoader ldr = ctx.p2pEnabled() ?
+ IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader();
+
+ Object val = ctx.processor().unmarshal(ctx, valBytes, ldr);
+
+ return new KeyCacheObjectImpl(val, valBytes);
+ }
+
+ return new KeyCacheObjectImpl(val, valBytes);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException("Failed to marshal object: " + val, e);
+ }
+ }
+ }
+
+ /**
+ * Wraps value provided by user, must be serialized before stored in cache.
+ */
+ private static class UserCacheObjectImpl extends CacheObjectImpl {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ *
+ */
+ public UserCacheObjectImpl() {
//No-op.
}
@@ -330,7 +341,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
* @param val Value.
* @param valBytes Value bytes.
*/
- public IgniteCacheObjectImpl(Object val, byte[] valBytes) {
+ public UserCacheObjectImpl(Object val, byte[] valBytes) {
super(val, valBytes);
}
@@ -341,28 +352,58 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
/** {@inheritDoc} */
@Override public CacheObject prepareForCache(CacheObjectContext ctx) {
- if (!ctx.processor().immutable(val)) {
- try {
- if (valBytes == null)
- valBytes = ctx.processor().marshal(ctx, val);
+ try {
+ if (valBytes == null)
+ valBytes = ctx.processor().marshal(ctx, val);
- if (ctx.storeValue()) {
- ClassLoader ldr = ctx.p2pEnabled() ?
- IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader();
+ if (ctx.storeValue()) {
+ ClassLoader ldr = ctx.p2pEnabled() ?
+ IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader();
- Object val = ctx.processor().unmarshal(ctx, valBytes, ldr);
+ Object val = ctx.processor().unmarshal(ctx, valBytes, ldr);
- return new CacheObjectImpl(val, valBytes);
- }
-
- return new CacheObjectImpl(null, valBytes);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException("Failed to marshal object: " + val, e);
+ return new CacheObjectImpl(val, valBytes);
}
+
+ return new CacheObjectImpl(null, valBytes);
}
- else
- return new CacheObjectImpl(val, valBytes);
+ catch (IgniteCheckedException e) {
+ throw new IgniteException("Failed to marshal object: " + val, e);
+ }
+ }
+ }
+
+ /**
+ * Wraps value provided by user, must be copied before stored in cache.
+ */
+ private static class UserCacheObjectByteArrayImpl extends CacheObjectByteArrayImpl {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ *
+ */
+ public UserCacheObjectByteArrayImpl() {
+ // No-op.
+ }
+
+ /**
+ * @param val Value.
+ */
+ public UserCacheObjectByteArrayImpl(byte[] val) {
+ super(val);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public <T> T value(CacheObjectContext ctx, boolean cpy) {
+ return super.value(ctx, false); // Do not need copy since user value is not in cache.
+ }
+
+ /** {@inheritDoc} */
+ @Override public CacheObject prepareForCache(CacheObjectContext ctx) {
+ byte[] valCpy = Arrays.copyOf(val, val.length);
+
+ return new CacheObjectByteArrayImpl(valCpy);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a86e387/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
index 9fa24cc..9552258 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
@@ -62,7 +62,7 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
ccfg.setCacheStoreFactory(singletonFactory(new CacheStoreAdapter() {
@Override public void loadCache(IgniteBiInClosure clo, Object... args) {
- clo.apply(new TestKey(1), new TestValue());
+ clo.apply(new TestKey(100_000), new TestValue(30_000));
}
@Override public Object load(Object key) throws CacheLoaderException {
@@ -88,6 +88,11 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
return true;
}
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return 2 * 60_000;
+ }
+
/**
* @throws Exception If failed.
*/
@@ -98,9 +103,9 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
final List<WeakReference<Object>> refs = new ArrayList<>();
- for (int i = 0; i < 1000; i++) {
+ for (int i = 0; i < 100; i++) {
TestKey key = new TestKey(i);
- TestValue val = new TestValue();
+ TestValue val = new TestValue(i);
refs.add(new WeakReference<Object>(val));
@@ -117,9 +122,9 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
@Override public Object process(MutableEntry<TestKey, TestValue> entry, Object... args) {
assertNotNull(entry.getValue());
- entry.setValue(new TestValue());
+ entry.setValue(new TestValue(10_000));
- return new TestValue();
+ return new TestValue(20_000);
}
});
@@ -135,7 +140,19 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
for (int g = 0; g < gridCount(); g++)
assertNull(grid(g).cache(null).get(key));
- try (IgniteDataStreamer streamer = grid(0).dataStreamer(null)) {
+ try (IgniteDataStreamer<TestKey, TestValue> streamer = grid(0).dataStreamer(null)) {
+ streamer.addData(key, val);
+ }
+
+ checkNoValue(aff, key);
+
+ cache.remove(key);
+
+ atomicClockModeDelay(cache);
+
+ try (IgniteDataStreamer<TestKey, TestValue> streamer = grid(0).dataStreamer(null)) {
+ streamer.allowOverwrite(true);
+
streamer.addData(key, val);
}
@@ -154,9 +171,9 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
}
}
- cache.loadCache(null); // Should load TestKey(1).
+ cache.loadCache(null); // Should load TestKey(100_000).
- TestKey key = new TestKey(1);
+ TestKey key = new TestKey(100_000);
checkNoValue(aff, key);
@@ -165,26 +182,29 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
checkNoValue(aff, key);
-// boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
-// @Override public boolean apply() {
-// System.gc();
-//
-// boolean pass = true;
-//
-// for (Iterator<WeakReference<Object>> it = refs.iterator(); it.hasNext();) {
-// WeakReference<Object> ref = it.next();
-//
-// if (ref.get() == null)
-// it.remove();
-// else
-// pass = false;
-// }
-//
-// return pass;
-// }
-// }, 10_000);
-//
-// assertTrue("Failed to wait for when values are collected", wait);
+ boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ System.gc();
+
+ boolean pass = true;
+
+ for (Iterator<WeakReference<Object>> it = refs.iterator(); it.hasNext();) {
+ WeakReference<Object> ref = it.next();
+
+ if (ref.get() == null)
+ it.remove();
+ else {
+ pass = false;
+
+ log.info("Not collected value: " + ref.get());
+ }
+ }
+
+ return pass;
+ }
+ }, 60_000);
+
+ assertTrue("Failed to wait for when values are collected", wait);
}
/**
@@ -265,7 +285,21 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
*
*/
static class TestValue implements Serializable {
- // No-op.
+ /** */
+ private int val;
+
+ /**
+ *
+ * @param val Value.
+ */
+ public TestValue(int val) {
+ this.val = val;
+ }
+
+ /** {@inheritDoc} */
+ public String toString() {
+ return "TestValue [val=" + val + ']';
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a86e387/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 9dd40d0..be13228 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -769,6 +769,6 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
if (ccfg.getCacheMode() != LOCAL &&
ccfg.getAtomicityMode() == CacheAtomicityMode.ATOMIC &&
ccfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK)
- U.sleep(100);
+ U.sleep(50);
}
}
[18/24] incubator-ignite git commit: # ignite-sprint-3 added test
Posted by sb...@apache.org.
# ignite-sprint-3 added 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/71f201cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71f201cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71f201cb
Branch: refs/heads/ignite-gg-10009-2
Commit: 71f201cb203f68a497a404731091c254072fd10e
Parents: 505a7bf
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 2 12:08:36 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 2 12:08:36 2015 +0300
----------------------------------------------------------------------
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../processors/igfs/IgsfStartCacheTest.java | 115 +++++++++++++++++++
2 files changed, 117 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f201cb/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 9d7f332..f2407ce 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
@@ -3080,8 +3080,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
"(cache configurations are not compatible) [" +
"activeCaches=[" + cacheNames + "]" +
", cacheName=" + cacheCtx.name() +
- ", txSystem=" + system() +
- ", cacheSystem=" + cacheCtx.system() + ']');
+ ", cacheSystem=" + cacheCtx.system() +
+ ", txSystem=" + system() + ']');
}
else
activeCacheIds.add(cacheId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f201cb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgsfStartCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgsfStartCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgsfStartCacheTest.java
new file mode 100644
index 0000000..e2eedbe
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgsfStartCacheTest.java
@@ -0,0 +1,115 @@
+/*
+ * 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.igfs;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.igfs.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+
+import java.io.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.igfs.IgfsMode.*;
+
+/**
+ *
+ */
+public class IgsfStartCacheTest extends IgfsCommonAbstractTest {
+ /** IP finder. */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /**
+ * @param igfs If {@code true} created IGFS configuration.
+ * @param idx Node index.
+ * @return Configuration
+ */
+ private IgniteConfiguration config(boolean igfs, int idx) {
+ IgniteConfiguration cfg = new IgniteConfiguration();
+
+ TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+
+ discoSpi.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(discoSpi);
+
+ if (igfs) {
+ FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
+
+ igfsCfg.setDataCacheName("dataCache");
+ igfsCfg.setMetaCacheName("metaCache");
+ igfsCfg.setName("igfs");
+ igfsCfg.setDefaultMode(PRIMARY);
+ igfsCfg.setFragmentizerEnabled(false);
+
+ CacheConfiguration dataCacheCfg = new CacheConfiguration();
+
+ dataCacheCfg.setName("dataCache");
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(1));
+
+ CacheConfiguration metaCacheCfg = new CacheConfiguration();
+
+ metaCacheCfg.setName("metaCache");
+ metaCacheCfg.setCacheMode(REPLICATED);
+ metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+
+ cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
+ cfg.setFileSystemConfiguration(igfsCfg);
+ }
+
+ cfg.setGridName("node-" + idx);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCacheStart() throws Exception {
+ Ignite g0 = G.start(config(true, 0));
+
+ G.start(config(false, 1));
+
+ IgniteFileSystem igfs = g0.fileSystem("igfs");
+
+ igfs.mkdirs(new IgfsPath("/test"));
+
+ try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(igfs.create(
+ new IgfsPath("/test/test.file"), true)))) {
+
+ for (int i = 0; i < 1000; i++)
+ bw.write("test-" + i);
+ }
+ }
+}
[09/24] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-662' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-662' 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/b7659f39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7659f39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7659f39
Branch: refs/heads/ignite-gg-10009-2
Commit: b7659f39787da4fd6808a3205a05692c9518db32
Parents: 57b7549 1a9de86
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 1 18:25:11 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 1 18:25:11 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 16 +-
.../IgniteCacheObjectProcessorImpl.java | 14 +-
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 ++++
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++
...maryWriteOrderNearEnabledStoreValueTest.java | 31 +++
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 +++
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 ++++
.../IgniteCacheStoreValueAbstractTest.java | 277 +++++++++++++++++++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 ++++
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++
.../cache/IgniteCacheTxStoreValueTest.java | 49 ++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 9 +
15 files changed, 651 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[11/24] incubator-ignite git commit: # sprint-3 - updated exception
Posted by sb...@apache.org.
# sprint-3 - updated exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3bc3b07b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3bc3b07b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3bc3b07b
Branch: refs/heads/ignite-gg-10009-2
Commit: 3bc3b07b3705d66169284b99acab6d1fea3298fa
Parents: b7659f3
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Apr 1 12:34:18 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Apr 1 12:34:18 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/cache/CachingProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bc3b07b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
index ae02792..9782bbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
@@ -239,7 +239,7 @@ public class CachingProvider implements javax.cache.spi.CachingProvider {
uriMap.remove(mgr.getURI());
}
catch (IgniteCheckedException e) {
- CU.convertToCacheException(e);
+ throw CU.convertToCacheException(e);
}
}
}
[07/24] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@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/efd98ba0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/efd98ba0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/efd98ba0
Branch: refs/heads/ignite-gg-10009-2
Commit: efd98ba01b0d1683281cc077dfa55cee0973151d
Parents: 2268875 6333966
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Apr 1 17:44:52 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Apr 1 17:44:52 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 19 ++++++-------
examples/schema-import/pom.xml | 10 +++----
modules/aop/pom.xml | 6 ++--
modules/aws/pom.xml | 4 +--
modules/clients/pom.xml | 10 +++----
modules/codegen/pom.xml | 4 +--
modules/core/pom.xml | 8 +++---
modules/extdata/p2p/pom.xml | 4 +--
modules/extdata/uri/pom.xml | 4 +--
modules/geospatial/pom.xml | 4 +--
modules/hadoop/pom.xml | 8 +++---
modules/hibernate/pom.xml | 6 ++--
modules/indexing/pom.xml | 4 +--
modules/jcl/pom.xml | 4 +--
modules/jta/pom.xml | 4 +--
modules/log4j/pom.xml | 4 +--
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 10 +++----
modules/schedule/pom.xml | 4 +--
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 8 +++---
modules/ssh/pom.xml | 8 +++---
modules/urideploy/pom.xml | 6 ++--
modules/visor-console/pom.xml | 8 +++---
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 8 +++---
modules/yardstick/pom.xml | 6 ++--
pom.xml | 56 ++++++++++++++++++-------------------
29 files changed, 112 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
[19/24] incubator-ignite git commit: # GG-8774 Review.
Posted by sb...@apache.org.
# GG-8774 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/0e297a6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e297a6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e297a6e
Branch: refs/heads/ignite-gg-10009-2
Commit: 0e297a6e97af1a284a1be676763bf49922e91215
Parents: 9b23109
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 2 16:31:05 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 2 16:31:05 2015 +0700
----------------------------------------------------------------------
ipc/shmem/README.txt | 2 +-
.../org/apache/ignite/internal/visor/util/VisorMimeTypes.java | 4 ++--
.../spi/deployment/uri/GridUriDeploymentFileResourceLoader.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e297a6e/ipc/shmem/README.txt
----------------------------------------------------------------------
diff --git a/ipc/shmem/README.txt b/ipc/shmem/README.txt
index 854e1d9..e11360b 100644
--- a/ipc/shmem/README.txt
+++ b/ipc/shmem/README.txt
@@ -26,7 +26,7 @@ Usage with Apache Ignite
-------------------
Copy compiled library to folder that already listed in 'java.library.path'
-with name in form: 'libigniteshmem-<ignite-version>.<extention>'.
+with name in form: 'libigniteshmem-<ignite-version>.<extension>'.
Note: Ignite should be restarted.
**************************************************************************************
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e297a6e/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
index acd56a9..0a76f98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
@@ -1009,9 +1009,9 @@ public class VisorMimeTypes {
int lastIdx = name.lastIndexOf('.');
if (lastIdx != -1) {
- String extention = name.substring(lastIdx + 1).toLowerCase();
+ String extension = name.substring(lastIdx + 1).toLowerCase();
- return mimeTypes.get(extention);
+ return mimeTypes.get(extension);
}
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e297a6e/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileResourceLoader.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileResourceLoader.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileResourceLoader.java
index 0e065c8..a0102f6 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileResourceLoader.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileResourceLoader.java
@@ -66,7 +66,7 @@ class GridUriDeploymentFileResourceLoader {
// Replace separators.
str = str.replaceAll("\\/|\\\\", ".");
- // Strip off '.class' extention.
+ // Strip off '.class' extension.
str = str.substring(0, str.indexOf(".class"));
try {
[15/24] incubator-ignite git commit: # ignite-sprint-3 disabled
hanging test
Posted by sb...@apache.org.
# ignite-sprint-3 disabled hanging 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/69f50791
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/69f50791
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/69f50791
Branch: refs/heads/ignite-gg-10009-2
Commit: 69f50791818eb21bbc99e9568c54fb27bd732956
Parents: ed6632a
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 2 10:04:28 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 2 10:04:28 2015 +0300
----------------------------------------------------------------------
.../test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69f50791/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..e5b7d68 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -90,6 +90,8 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest {
* @throws Exception if failed.
*/
public void testAffinity() throws Exception {
+ fail("Enable when https://issues.apache.org/jira/browse/IGNITE-647 is fixed.");
+
checkAffinity();
stopGrid(gridCount() - 1);
[17/24] incubator-ignite git commit: Merge branch 'ignite-663' into
ignite-sprint-3
Posted by sb...@apache.org.
Merge branch 'ignite-663' 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/9b231090
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b231090
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b231090
Branch: refs/heads/ignite-gg-10009-2
Commit: 9b2310902503b05833c909d53d5099f3603665d9
Parents: 505a7bf 588cff3
Author: anovikov <an...@gridgain.com>
Authored: Thu Apr 2 14:49:28 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Thu Apr 2 14:49:28 2015 +0700
----------------------------------------------------------------------
DEVNOTES.txt | 2 ++
parent/pom.xml | 10 +++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[12/24] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@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/ed6632ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed6632ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed6632ae
Branch: refs/heads/ignite-gg-10009-2
Commit: ed6632aed467c5dbb74eb7d235c7e062f94344ed
Parents: 3bc3b07 8a86e38
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Apr 1 12:34:30 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Apr 1 12:34:30 2015 -0700
----------------------------------------------------------------------
.../IgniteCacheObjectProcessorImpl.java | 165 ++++++++++++-------
.../IgniteCacheStoreValueAbstractTest.java | 92 +++++++----
.../junits/common/GridCommonAbstractTest.java | 2 +-
3 files changed, 167 insertions(+), 92 deletions(-)
----------------------------------------------------------------------