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/07/08 16:53:02 UTC
[01/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-929 bf6fba8dc -> b6c7eaee3
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b92f1cd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b92f1cd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b92f1cd4
Branch: refs/heads/ignite-929
Commit: b92f1cd4a9b02bb69e528764d6773ba327a06149
Parents: af8aaca 1b0b998
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Wed Mar 25 11:32:22 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Wed Mar 25 11:32:22 2015 -0700
----------------------------------------------------------------------
NOTICE.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b92f1cd4/NOTICE.txt
----------------------------------------------------------------------
diff --cc NOTICE.txt
index 25d1463,9340c6f..2b4606a
mode 100644,100755..100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
[14/50] incubator-ignite git commit: # IGNITE-591 Comment broken test
Posted by sb...@apache.org.
# IGNITE-591 Comment broken 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/e54f5729
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e54f5729
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e54f5729
Branch: refs/heads/ignite-929
Commit: e54f5729b710c04d4a72b2ffabcc5c08cf21aaa2
Parents: 006209c
Author: sevdokimov <se...@jetbrains.com>
Authored: Sat Jul 4 17:34:58 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sat Jul 4 17:34:58 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheJtaSelfTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e54f5729/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
index 29836ef..7302f7e 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -193,7 +193,12 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
assertEquals(1, (int)cache2.get("key"));
}
+ /**
+ *
+ */
public void testUncompatibleTmLookup() {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1094");
+
final IgniteEx ignite = grid(0);
final CacheConfiguration cacheCfg = new CacheConfiguration();
[42/50] incubator-ignite git commit: Fixed notes
Posted by sb...@apache.org.
Fixed notes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a6948e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a6948e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a6948e8
Branch: refs/heads/ignite-929
Commit: 1a6948e8778d0e6379ffc0c99fee0d83d8bbebd7
Parents: 82f4992
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jul 8 13:04:31 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jul 8 13:04:31 2015 +0300
----------------------------------------------------------------------
.../config/benchmark-index-put.properties | 64 --------
.../config/benchmark-put-indexed-val.properties | 64 ++++++++
.../cache/IgnitePutIndex1Benchmark.java | 42 -----
.../cache/IgnitePutIndex2Benchmark.java | 42 -----
.../cache/IgnitePutIndexedValue1Benchmark.java | 42 +++++
.../cache/IgnitePutIndexedValue2Benchmark.java | 42 +++++
.../cache/IgnitePutIndexedValue8Benchmark.java | 2 +-
.../ignite/yardstick/cache/model/Person1.java | 29 +---
.../ignite/yardstick/cache/model/Person2.java | 45 +-----
.../ignite/yardstick/cache/model/Person8.java | 155 ++-----------------
10 files changed, 167 insertions(+), 360 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/config/benchmark-index-put.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-index-put.properties b/modules/yardstick/config/benchmark-index-put.properties
deleted file mode 100644
index fb73656..0000000
--- a/modules/yardstick/config/benchmark-index-put.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Contains benchmarks for SQL queries.
-#
-
-# JVM options.
-# JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
-
-# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
-JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" \
- -XX:+UseParNewGC \
- -XX:+UseConcMarkSweepGC \
- -XX:+UseTLAB \
- -XX:NewSize=128m \
- -XX:MaxNewSize=128m \
- -XX:MaxTenuringThreshold=0 \
- -XX:SurvivorRatio=1024 \
- -XX:+UseCMSInitiatingOccupancyOnly \
- -XX:CMSInitiatingOccupancyFraction=60 \
-"
-
-# List of default probes.
-# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux).
-BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
-
-# Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
-
-# Probe point writer class name.
-# BENCHMARK_WRITER=
-
-# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default.
-SERVER_HOSTS=localhost,localhost
-
-# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default.
-DRIVER_HOSTS=localhost
-
-# Remote username.
-# REMOTE_USER=
-
-# Number of nodes, used to wait for the specified number of nodes to start.
-nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
-
-# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
-CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex1Benchmark -sn IgniteNode -ds atomic-indexed1-put,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex2Benchmark -sn IgniteNode -ds atomic-indexed2-put,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex8Benchmark -sn IgniteNode -ds atomic-indexed8-put\
-"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/config/benchmark-put-indexed-val.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-put-indexed-val.properties b/modules/yardstick/config/benchmark-put-indexed-val.properties
new file mode 100644
index 0000000..8f3a505
--- /dev/null
+++ b/modules/yardstick/config/benchmark-put-indexed-val.properties
@@ -0,0 +1,64 @@
+# 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.
+
+#
+# Contains benchmarks for SQL queries.
+#
+
+# JVM options.
+# JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
+
+# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
+JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" \
+ -XX:+UseParNewGC \
+ -XX:+UseConcMarkSweepGC \
+ -XX:+UseTLAB \
+ -XX:NewSize=128m \
+ -XX:MaxNewSize=128m \
+ -XX:MaxTenuringThreshold=0 \
+ -XX:SurvivorRatio=1024 \
+ -XX:+UseCMSInitiatingOccupancyOnly \
+ -XX:CMSInitiatingOccupancyFraction=60 \
+"
+
+# List of default probes.
+# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux).
+BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
+
+# Packages where the specified benchmark is searched by reflection mechanism.
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+
+# Probe point writer class name.
+# BENCHMARK_WRITER=
+
+# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default.
+SERVER_HOSTS=localhost,localhost
+
+# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default.
+DRIVER_HOSTS=localhost
+
+# Remote username.
+# REMOTE_USER=
+
+# Number of nodes, used to wait for the specified number of nodes to start.
+nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+
+# Run configuration.
+# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+CONFIGS="\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue1Benchmark -sn IgniteNode -ds atomic-put-indexed-val-1,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue2Benchmark -sn IgniteNode -ds atomic-put-indexed-val-2,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue8Benchmark -sn IgniteNode -ds atomic-put-indexed-val-8\
+"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java
deleted file mode 100644
index 65dd39a..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.yardstick.cache.model.*;
-
-import java.util.*;
-
-/**
- * Ignite benchmark that performs put operations for entity with indexed fields.
- */
-public class IgnitePutIndex1Benchmark extends IgniteCacheAbstractBenchmark {
- /** {@inheritDoc} */
- @Override public boolean test(Map<Object, Object> ctx) throws Exception {
- int key = nextRandom(args.range());
-
- cache.put(key, new Person1(key));
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-index");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java
deleted file mode 100644
index b4cf86f..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.yardstick.cache.model.*;
-
-import java.util.*;
-
-/**
- * Ignite benchmark that performs put operations for entity with indexed fields.
- */
-public class IgnitePutIndex2Benchmark extends IgniteCacheAbstractBenchmark {
- /** {@inheritDoc} */
- @Override public boolean test(Map<Object, Object> ctx) throws Exception {
- int key = nextRandom(args.range());
-
- cache.put(key, new Person2(key, key + 1));
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-index");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java
new file mode 100644
index 0000000..68de785
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java
@@ -0,0 +1,42 @@
+/*
+ * 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.yardstick.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.yardstick.cache.model.*;
+
+import java.util.*;
+
+/**
+ * Ignite benchmark that performs put operations for entity with indexed fields.
+ */
+public class IgnitePutIndexedValue1Benchmark extends IgniteCacheAbstractBenchmark {
+ /** {@inheritDoc} */
+ @Override public boolean test(Map<Object, Object> ctx) throws Exception {
+ int key = nextRandom(args.range());
+
+ cache.put(key, new Person1(key));
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteCache<Integer, Object> cache() {
+ return ignite().cache("atomic-index");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java
new file mode 100644
index 0000000..3256ee3
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java
@@ -0,0 +1,42 @@
+/*
+ * 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.yardstick.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.yardstick.cache.model.*;
+
+import java.util.*;
+
+/**
+ * Ignite benchmark that performs put operations for entity with indexed fields.
+ */
+public class IgnitePutIndexedValue2Benchmark extends IgniteCacheAbstractBenchmark {
+ /** {@inheritDoc} */
+ @Override public boolean test(Map<Object, Object> ctx) throws Exception {
+ int key = nextRandom(args.range());
+
+ cache.put(key, new Person2(key));
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteCache<Integer, Object> cache() {
+ return ignite().cache("atomic-index");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java
index b51ff34..42aa67d 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java
@@ -30,7 +30,7 @@ public class IgnitePutIndexedValue8Benchmark extends IgniteCacheAbstractBenchmar
@Override public boolean test(Map<Object, Object> ctx) throws Exception {
int key = nextRandom(args.range());
- cache.put(key, new Person8(key, key + 1, key + 2, key + 3, key + 4, key + 5, key + 6, key + 7));
+ cache.put(key, new Person8(key));
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java
index 0b2a0bf..91d1ccc 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java
@@ -30,35 +30,12 @@ public class Person1 implements Serializable {
private int val1;
/**
- * Empty constructor.
- */
- public Person1() {
- // No-op.
- }
-
- /**
* Constructs.
*
- * @param val1 Indexed value.
- */
- public Person1(int val1) {
- this.val1 = val1;
- }
-
- /**
- * @return Get value.
- */
- public int getVal1() {
- return val1;
- }
-
- /**
- * Set value.
- *
- * @param val1 Value.
+ * @param val Indexed value.
*/
- public void setVal1(int val1) {
- this.val1 = val1;
+ public Person1(int val) {
+ this.val1 = val;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java
index 3b1cb9e..dc5729c 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java
@@ -34,50 +34,13 @@ public class Person2 implements Serializable {
private int val2;
/**
- * Empty constructor.
- */
- public Person2() {
- // No-op.
- }
-
- /**
* Constructs.
- */
- public Person2(int val1, int val2) {
- this.val1 = val1;
- this.val2 = val2;
- }
-
- /**
- * @return Get value.
- */
- public int getVal1() {
- return val1;
- }
-
- /**
- * Set value.
- *
- * @param val1 Value.
- */
- public void setVal1(int val1) {
- this.val1 = val1;
- }
-
- /**
- * @return Get value.
- */
- public int getVal2() {
- return val2;
- }
-
- /**
- * Set value.
*
- * @param val2 Value.
+ * @param val Value.
*/
- public void setVal2(int val2) {
- this.val2 = val2;
+ public Person2(int val) {
+ this.val1 = val;
+ this.val2 = val + 1;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java
index b8e3f7c..92d65ac 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java
@@ -58,152 +58,19 @@ public class Person8 implements Serializable {
private int val8;
/**
- * Empty constructor.
- */
- public Person8() {
- // No-op.
- }
-
- /**
* Constructs.
- */
- public Person8(int val1, int val2, int val3, int val4, int val5, int val6, int val7, int val8) {
- this.val1 = val1;
- this.val2 = val2;
- this.val3 = val3;
- this.val4 = val4;
- this.val5 = val5;
- this.val6 = val6;
- this.val7 = val7;
- this.val8 = val8;
- }
-
- /**
- * @return Get value.
- */
- public int getVal1() {
- return val1;
- }
-
- /**
- * Set value.
- *
- * @param val1 Value.
- */
- public void setVal1(int val1) {
- this.val1 = val1;
- }
-
- /**
- * @return Get value.
- */
- public int getVal2() {
- return val2;
- }
-
- /**
- * Set value.
- *
- * @param val2 Value.
- */
- public void setVal2(int val2) {
- this.val2 = val2;
- }
-
- /**
- * @return Get value.
- */
- public int getVal3() {
- return val3;
- }
-
- /**
- * Set value.
- *
- * @param val3 Value.
- */
- public void setVal3(int val3) {
- this.val3 = val3;
- }
-
- /**
- * @return Get value.
- */
- public int getVal4() {
- return val4;
- }
-
- /**
- * Set value.
- *
- * @param val4 Value.
- */
- public void setVal4(int val4) {
- this.val4 = val4;
- }
-
- /**
- * @return Get value.
- */
- public int getVal5() {
- return val5;
- }
-
- /**
- * Set value.
- *
- * @param val5 Value.
- */
- public void setVal5(int val5) {
- this.val5 = val5;
- }
-
- /**
- * @return Get value.
- */
- public int getVal6() {
- return val6;
- }
-
- /**
- * Set value.
*
- * @param val6 Value.
- */
- public void setVal6(int val6) {
- this.val6 = val6;
- }
-
- /**
- * @return Get value.
- */
- public int getVal7() {
- return val7;
- }
-
- /**
- * Set value.
- *
- * @param val7 Value.
- */
- public void setVal7(int val7) {
- this.val7 = val7;
- }
-
- /**
- * @return Get value.
- */
- public int getVal8() {
- return val8;
- }
-
- /**
- * Set value.
- *
- * @param val8 Value.
- */
- public void setVal8(int val8) {
- this.val8 = val8;
+ * @param val Indexed value.
+ */
+ public Person8(int val) {
+ this.val1 = val;
+ this.val2 = val + 1;
+ this.val3 = val + 2;
+ this.val4 = val + 3;
+ this.val5 = val + 4;
+ this.val6 = val + 5;
+ this.val7 = val + 6;
+ this.val8 = val + 7;
}
/** {@inheritDoc} */
[36/50] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a51cdf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a51cdf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a51cdf8
Branch: refs/heads/ignite-929
Commit: 9a51cdf8d051dd0a6c0159fe1a2bc4bf56201da7
Parents: bc29797 0f1b31a
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue Jul 7 19:09:30 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue Jul 7 19:09:30 2015 -0700
----------------------------------------------------------------------
dev-tools/slurp.sh | 2 +-
.../internal/interop/InteropIgnition.java | 17 +-
.../internal/interop/InteropProcessor.java | 7 +
.../cache/query/GridCacheQueryAdapter.java | 35 ++++-
.../processors/query/GridQueryProcessor.java | 5 +
.../CacheAbstractQueryMetricsSelfTest.java | 157 ++++++++++++++++++-
.../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++++
...titionedQueryMetricsDistributedSelfTest.java | 33 ++++
...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++++
.../CachePartitionedQueryMetricsSelfTest.java | 32 ----
...plicatedQueryMetricsDistributedSelfTest.java | 33 ++++
...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++++
.../CacheReplicatedQueryMetricsSelfTest.java | 32 ----
.../IgniteCacheQuerySelfTestSuite.java | 7 +-
scripts/git-patch-prop.sh | 2 +-
15 files changed, 386 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
[35/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f1b31a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f1b31a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f1b31a5
Branch: refs/heads/ignite-929
Commit: 0f1b31a5b89f7406bfe44e488a9a832567ee1ccb
Parents: 17ee8a6 4f46ee8
Author: ashutak <as...@gridgain.com>
Authored: Tue Jul 7 20:39:42 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Jul 7 20:39:42 2015 +0300
----------------------------------------------------------------------
.../internal/interop/InteropIgnition.java | 17 +-
.../internal/interop/InteropProcessor.java | 7 +
.../cache/query/GridCacheQueryAdapter.java | 35 ++++-
.../processors/query/GridQueryProcessor.java | 5 +
.../CacheAbstractQueryMetricsSelfTest.java | 157 ++++++++++++++++++-
.../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++++
...titionedQueryMetricsDistributedSelfTest.java | 33 ++++
...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++++
.../CachePartitionedQueryMetricsSelfTest.java | 32 ----
...plicatedQueryMetricsDistributedSelfTest.java | 33 ++++
...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++++
.../CacheReplicatedQueryMetricsSelfTest.java | 32 ----
.../IgniteCacheQuerySelfTestSuite.java | 7 +-
13 files changed, 384 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
[38/50] incubator-ignite git commit: # review
Posted by sb...@apache.org.
# 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/839fe79f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/839fe79f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/839fe79f
Branch: refs/heads/ignite-929
Commit: 839fe79fa5ff0ee91b528b43d6a7834aa1ea719f
Parents: cd01e4c
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Jul 8 06:16:48 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Jul 8 06:16:48 2015 +0300
----------------------------------------------------------------------
.../processors/cache/jta/CacheJtaManager.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/839fe79f/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
index 09d856b..ace5fe7 100644
--- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
+++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
@@ -35,7 +35,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
private final ThreadLocal<GridCacheXAResource> xaRsrc = new ThreadLocal<>();
/** */
- private volatile TransactionManager jtaTm;
+ private TransactionManager jtaTm;
/** */
private final AtomicReference<CacheTmLookup> tmLookupRef = new AtomicReference<>();
@@ -46,7 +46,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
if (cctx.txConfig() != null) {
String txLookupClsName = cctx.txConfig().getTxManagerLookupClassName();
-
+
if (txLookupClsName != null)
tmLookupRef.set(createTmLookup(txLookupClsName));
}
@@ -55,7 +55,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
/** {@inheritDoc} */
@Override protected void stop0(boolean cancel) {
CacheTmLookup tmLookup = tmLookupRef.get();
-
+
if (tmLookup instanceof LifecycleAware)
((LifecycleAware)tmLookup).stop();
}
@@ -70,10 +70,10 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
CacheTmLookup res = (CacheTmLookup)cls.newInstance();
cctx.kernalContext().resource().injectGeneric(res);
-
+
if (res instanceof LifecycleAware)
((LifecycleAware)res).start();
-
+
return res;
}
catch (Exception e) {
@@ -86,10 +86,10 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
if (jtaTm == null) {
try {
CacheTmLookup tmLookup = tmLookupRef.get();
-
+
if (tmLookup == null)
return;
-
+
jtaTm = tmLookup.getTm();
}
catch (Exception e) {
@@ -144,23 +144,23 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
/** {@inheritDoc} */
@Override public void registerCache(CacheConfiguration<?, ?> cfg) throws IgniteCheckedException {
String cacheLookupClsName = cfg.getTransactionManagerLookupClassName();
-
+
if (cacheLookupClsName != null) {
CacheTmLookup tmLookup = tmLookupRef.get();
-
+
if (tmLookup == null) {
tmLookup = createTmLookup(cacheLookupClsName);
-
+
if (tmLookupRef.compareAndSet(null, tmLookup))
return;
-
+
tmLookup = tmLookupRef.get();
}
if (!cacheLookupClsName.equals(tmLookup.getClass().getName()))
throw new IgniteCheckedException("Failed to start cache with CacheTmLookup that specified in cache " +
"configuration, because node uses another CacheTmLookup [cache" + cfg.getName() +
- ", tmLookupClassName=" + cacheLookupClsName + ", tmLookupUsedByNode="
+ ", tmLookupClassName=" + cacheLookupClsName + ", tmLookupUsedByNode="
+ tmLookup.getClass().getName() + ']');
}
}
[26/50] incubator-ignite git commit: Merge branches 'ignite-591' and
'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-591
Posted by sb...@apache.org.
Merge branches 'ignite-591' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5dc2d2bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5dc2d2bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5dc2d2bc
Branch: refs/heads/ignite-929
Commit: 5dc2d2bc41bf04d0b7c538dd1a37b3cbc67c45e6
Parents: e54f572 44506c3
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 7 14:23:41 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 7 14:23:41 2015 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 4 +-
.../internal/interop/InteropIgnition.java | 31 ++--
.../processors/cache/CacheObjectImpl.java | 1 -
.../dht/GridPartitionedGetFuture.java | 13 +-
.../ignite/internal/util/IgniteUtils.java | 6 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 26 +++
.../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++++++++++++
.../GridCachePartitionedNodeRestartTest.java | 5 -
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
.../GridCacheReplicatedFailoverSelfTest.java | 5 -
.../GridCacheReplicatedNodeRestartSelfTest.java | 5 -
...acheAtomicReplicatedNodeRestartSelfTest.java | 10 ++
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 +++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
modules/mesos/pom.xml | 1 -
modules/rest-http/pom.xml | 14 +-
modules/urideploy/pom.xml | 8 +-
modules/web/pom.xml | 6 +-
parent/pom.xml | 1 +
20 files changed, 343 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
[06/50] incubator-ignite git commit: IGNITE-591 Make
GridCacheXAResource shared.
Posted by sb...@apache.org.
IGNITE-591 Make GridCacheXAResource shared.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4b06e77c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4b06e77c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4b06e77c
Branch: refs/heads/ignite-929
Commit: 4b06e77c8e770f9b9ef8b34b59a69ec47da615c7
Parents: 1a21477
Author: sevdokimov <se...@jetbrains.com>
Authored: Wed Jul 1 10:08:13 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Wed Jul 1 10:08:13 2015 +0300
----------------------------------------------------------------------
.../processors/cache/jta/CacheJtaManager.java | 4 ++--
.../processors/cache/jta/GridCacheXAResource.java | 16 ++++++----------
.../processors/cache/GridCacheJtaSelfTest.java | 2 --
3 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b06e77c/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
index 9af29d6..2a078dc 100644
--- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
+++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
@@ -30,7 +30,7 @@ import javax.transaction.*;
*/
public class CacheJtaManager extends CacheJtaManagerAdapter {
/** */
- private final ThreadLocal<GridCacheXAResource> xaRsrc = new ThreadLocal<>();
+ private final static ThreadLocal<GridCacheXAResource> xaRsrc = new ThreadLocal<>();
/** */
private TransactionManager jtaTm;
@@ -89,7 +89,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
);
}
- rsrc = new GridCacheXAResource(tx, cctx);
+ rsrc = new GridCacheXAResource(tx, cctx.kernalContext());
if (!jtaTx.enlistResource(rsrc))
throw new IgniteCheckedException("Failed to enlist XA resource to JTA user transaction.");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b06e77c/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
index 442cdde..ad233e5 100644
--- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
+++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.cache.jta;
import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.transactions.*;
@@ -41,9 +41,6 @@ public final class GridCacheXAResource implements XAResource {
/** */
private static final Xid[] NO_XID = new Xid[] {};
- /** Context. */
- private GridCacheContext cctx;
-
/** Cache transaction. */
private IgniteInternalTx cacheTx;
@@ -52,17 +49,16 @@ public final class GridCacheXAResource implements XAResource {
/**
* @param cacheTx Cache jta.
- * @param cctx Cache context.
+ * @param ctx Kernal context.
*/
- public GridCacheXAResource(IgniteInternalTx cacheTx, GridCacheContext cctx) {
+ public GridCacheXAResource(IgniteInternalTx cacheTx, GridKernalContext ctx) {
assert cacheTx != null;
- assert cctx != null;
+ assert ctx != null;
- this.cctx = cctx;
this.cacheTx = cacheTx;
if (log == null)
- log = U.logger(cctx.kernalContext(), logRef, GridCacheXAResource.class);
+ log = U.logger(ctx, logRef, GridCacheXAResource.class);
}
/** {@inheritDoc} */
@@ -229,7 +225,7 @@ public final class GridCacheXAResource implements XAResource {
GridCacheXAResource other = (GridCacheXAResource)xar;
- return cctx == other.cctx;
+ return cacheTx == other.cacheTx;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b06e77c/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
index b299f8d..37e9ed2 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -151,8 +151,6 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
*/
@SuppressWarnings("ConstantConditions")
public void testJtaTwoCaches() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-591");
-
UserTransaction jtaTx = jotm.getUserTransaction();
IgniteEx ignite = grid(0);
[50/50] incubator-ignite git commit: # ignite-929
Posted by sb...@apache.org.
# ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6c7eaee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6c7eaee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6c7eaee
Branch: refs/heads/ignite-929
Commit: b6c7eaee3f7f637e75db8fa9ce43822b7bff93bb
Parents: 5e5be0c
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 8 17:15:04 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 8 17:50:38 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCache.java | 6 +--
.../processors/cache/GridCacheProcessor.java | 12 +++--
.../GridDhtPartitionsExchangeFuture.java | 9 +++-
.../affinity/IgniteClientNodeAffinityTest.java | 16 ++++--
...cheStoreSessionListenerAbstractSelfTest.java | 55 ++++++++++++--------
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 1 +
.../cache/CacheOffheapMapEntrySelfTest.java | 21 ++++----
.../cache/CacheStopAndDestroySelfTest.java | 23 ++++----
.../cache/IgniteDynamicCacheStartSelfTest.java | 28 ++++++----
...teCacheClientNodePartitionsExchangeTest.java | 5 ++
.../DataStreamerMultinodeCreateCacheTest.java | 1 +
11 files changed, 115 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index ba996d4..1090fe2 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -546,14 +546,14 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* Closes cache.
* For local cache equivalent to {@link #destroy()}.
* For distributed caches, if called on clients, closes client cache, if called on a server node,
- * do nothing.
+ * does nothing.
*/
- @Override void close();
+ @Override public void close();
/**
* Completely deletes the cache with all its data from the system on all cluster nodes.
*/
- void destroy();
+ public void destroy();
/**
* This cache node to re-balance its partitions. This method is usually used when
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/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 88a7dcf..e494cd4 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
@@ -1394,6 +1394,12 @@ public class GridCacheProcessor extends GridProcessorAdapter {
DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName()));
if (desc != null) {
+ if (req.close()) {
+ assert req.initiatingNodeId() != null : req;
+
+ return true;
+ }
+
if (desc.deploymentId().equals(req.deploymentId())) {
if (req.start())
return !desc.cancelled();
@@ -1526,7 +1532,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param req Request.
*/
private void stopGateway(DynamicCacheChangeRequest req) {
- assert req.stop() || req.close();
+ assert req.stop() || req.close() : req;
// Break the proxy before exchange future is done.
IgniteCacheProxy<?, ?> proxy = jCacheProxies.remove(maskNull(req.cacheName()));
@@ -1539,7 +1545,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param req Stop request.
*/
public void prepareCacheStop(DynamicCacheChangeRequest req) {
- assert req.stop() || req.close();
+ assert req.stop() || req.close() : req;
GridCacheAdapter<?, ?> cache = caches.remove(maskNull(req.cacheName()));
@@ -2230,8 +2236,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
prepareCacheStop(req);
}
- // Renew deployment id to have no race condition with start after stop.
- desc.deploymentId(IgniteUuid.randomUuid());
ctx.discovery().onClientCacheClose(req.cacheName(), req.initiatingNodeId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index a3b870c..bae55ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -510,7 +510,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
ClusterNode node = discoEvt.eventNode();
// Client need to initialize affinity for local join event or for stated client caches.
- if (!node.isLocal()) {
+ if (!node.isLocal() || clientCacheClose()) {
for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
if (cacheCtx.isLocal())
continue;
@@ -840,6 +840,13 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
}
/**
+ * @return {@code True} if exchange initiated for client cache close.
+ */
+ private boolean clientCacheClose() {
+ return reqs != null && reqs.size() == 1 && reqs.iterator().next().close();
+ }
+
+ /**
*
*/
private void dumpPendingObjects() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
index 4244cae..da27fb2 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
@@ -127,17 +127,23 @@ public class IgniteClientNodeAffinityTest extends GridCommonAbstractTest {
ccfg.setNodeFilter(new TestNodesFilter());
- IgniteCache<Integer, Integer> cache = client.createCache(ccfg);
+ IgniteCache<Integer, Integer> cache = client.createCache(ccfg);
+ try {
checkCache(null, 1);
-
- cache.destroy();
+ }
+ finally {
+ cache.destroy();
+ }
cache = client.createCache(ccfg, new NearCacheConfiguration());
+ try {
checkCache(null, 1);
-
- cache.destroy();
+ }
+ finally {
+ cache.destroy();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
index 2b0d270..19b8dc2 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
@@ -114,12 +114,16 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(null, CacheAtomicityMode.ATOMIC);
IgniteCache<Integer, Integer> cache = ignite(0).createCache(cfg);
- cache.loadCache(null);
- cache.get(1);
- cache.put(1, 1);
- cache.remove(1);
- cache.destroy();
+ try {
+ cache.loadCache(null);
+ cache.get(1);
+ cache.put(1, 1);
+ cache.remove(1);
+ }
+ finally {
+ cache.destroy();
+ }
assertEquals(3, loadCacheCnt.get());
assertEquals(1, loadCnt.get());
@@ -135,12 +139,16 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(null, CacheAtomicityMode.TRANSACTIONAL);
IgniteCache<Integer, Integer> cache = ignite(0).createCache(cfg);
- cache.loadCache(null);
- cache.get(1);
- cache.put(1, 1);
- cache.remove(1);
- cache.destroy();
+ try {
+ cache.loadCache(null);
+ cache.get(1);
+ cache.put(1, 1);
+ cache.remove(1);
+ }
+ finally {
+ cache.destroy();
+ }
assertEquals(3, loadCacheCnt.get());
assertEquals(1, loadCnt.get());
@@ -157,6 +165,7 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(null, CacheAtomicityMode.TRANSACTIONAL);
IgniteCache<Integer, Integer> cache = ignite(0).createCache(cfg);
+
try (Transaction tx = ignite(0).transactions().txStart()) {
cache.put(1, 1);
cache.put(2, 2);
@@ -165,8 +174,9 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
tx.commit();
}
-
- cache.destroy();
+ finally {
+ cache.destroy();
+ }
assertEquals(2, writeCnt.get());
assertEquals(2, deleteCnt.get());
@@ -191,9 +201,10 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
tx.commit();
}
-
- cache1.destroy();
- cache2.destroy();
+ finally {
+ cache1.destroy();
+ cache2.destroy();
+ }
assertEquals(2, writeCnt.get());
assertEquals(2, deleteCnt.get());
@@ -218,9 +229,10 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
tx.commit();
}
-
- cache1.destroy();
- cache2.destroy();
+ finally {
+ cache1.destroy();
+ cache2.destroy();
+ }
try (Connection conn = DriverManager.getConnection(URL)) {
checkTable(conn, 1, false);
@@ -256,9 +268,10 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
assertEquals("Expected failure.", we.getMessage());
}
-
- cache1.destroy();
- cache2.destroy();
+ finally {
+ cache1.destroy();
+ cache2.destroy();
+ }
try (Connection conn = DriverManager.getConnection(URL)) {
checkTable(conn, 1, true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
index eae07f9..bc6b443 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
@@ -117,6 +117,7 @@ public class GridCacheTxLoadFromStoreOnLockSelfTest extends GridCommonAbstractTe
assertEquals(0, cache.size());
}
}
+
cache.destroy();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
index 7630582..f4d7607 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
@@ -151,20 +151,23 @@ public class CacheOffheapMapEntrySelfTest extends GridCacheAbstractSelfTest {
IgniteCache jcache = grid(0).getOrCreateCache(cfg);
- GridCacheAdapter<Integer, String> cache = ((IgniteKernal)grid(0)).internalCache(jcache.getName());
+ try {
+ GridCacheAdapter<Integer, String> cache = ((IgniteKernal)grid(0)).internalCache(jcache.getName());
- Integer key = primaryKey(grid(0).cache(null));
+ Integer key = primaryKey(grid(0).cache(null));
- cache.put(key, "val");
+ cache.put(key, "val");
- GridCacheEntryEx entry = cache.entryEx(key);
+ GridCacheEntryEx entry = cache.entryEx(key);
- entry.unswap(true);
+ entry.unswap(true);
- assertNotNull(entry);
+ assertNotNull(entry);
- assertEquals(entry.getClass(), entryCls);
-
- jcache.destroy();
+ assertEquals(entry.getClass(), entryCls);
+ }
+ finally {
+ jcache.destroy();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 79aa563..536ddc3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -121,9 +121,11 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
*/
private CacheConfiguration getDhtConfig() {
CacheConfiguration cfg = defaultCacheConfiguration();
+
cfg.setName(CACHE_NAME_DHT);
cfg.setCacheMode(CacheMode.PARTITIONED);
cfg.setNearConfiguration(null);
+
return cfg;
}
@@ -132,9 +134,11 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
*/
private CacheConfiguration getClientConfig() {
CacheConfiguration cfg = defaultCacheConfiguration();
+
cfg.setName(CACHE_NAME_CLIENT);
cfg.setCacheMode(CacheMode.PARTITIONED);
cfg.setNearConfiguration(null);
+
return cfg;
}
@@ -143,9 +147,11 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
*/
private CacheConfiguration getNearConfig() {
CacheConfiguration cfg = defaultCacheConfiguration();
+
cfg.setName(CACHE_NAME_NEAR);
cfg.setCacheMode(CacheMode.PARTITIONED);
cfg.setNearConfiguration(new NearCacheConfiguration());
+
return cfg;
}
@@ -154,9 +160,11 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
*/
private CacheConfiguration getLocalConfig() {
CacheConfiguration cfg = defaultCacheConfiguration();
+
cfg.setName(CACHE_NAME_LOC);
cfg.setCacheMode(CacheMode.LOCAL);
cfg.setNearConfiguration(null);
+
return cfg;
}
@@ -535,6 +543,8 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
assert cache1.get(KEY_VAL).equals(curVal);
assert cache2.get(KEY_VAL).equals(curVal);
}
+
+ awaitPartitionMapExchange();
}
}
@@ -730,10 +740,9 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
/**
* Tests concurrent close.
*
- * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException
- * @throws InterruptedException
+ * @throws Exception If failed.
*/
- public void testConcurrentCloseSetWithTry() throws IgniteInterruptedCheckedException, InterruptedException {
+ public void _testConcurrentCloseSetWithTry() throws Exception {
final AtomicInteger a1 = new AtomicInteger();
final AtomicInteger a2 = new AtomicInteger();
final AtomicInteger a3 = new AtomicInteger();
@@ -742,25 +751,21 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
Thread t1 = new Thread(new Runnable() {
@Override public void run() {
closeWithTry(a1, 0);
-
}
});
Thread t2 = new Thread(new Runnable() {
@Override public void run() {
closeWithTry(a2, 0);
-
}
});
Thread t3 = new Thread(new Runnable() {
@Override public void run() {
closeWithTry(a3, 2);
-
}
});
Thread t4 = new Thread(new Runnable() {
@Override public void run() {
closeWithTry(a4, 2);
-
}
});
@@ -825,7 +830,8 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
mgr.destroyCache(cacheName);
- Cache cache = mgr.createCache(cacheName, new MutableConfiguration<Integer, String>().setTypes(Integer.class, String.class));
+ Cache cache = mgr.createCache(cacheName,
+ new MutableConfiguration<Integer, String>().setTypes(Integer.class, String.class));
cache.close();
@@ -837,7 +843,6 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
catch (IllegalStateException e) {
// No-op;
}
-
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index ba3adb8..0143be4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@ -648,10 +648,13 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
IgniteCache<Object, Object> cache = ignite(0).createCache(cfg);
- for (CountDownLatch start : starts)
- start.await();
-
- cache.destroy();
+ try {
+ for (CountDownLatch start : starts)
+ start.await();
+ }
+ finally {
+ cache.destroy();
+ }
for (CountDownLatch stop : stops)
stop.await();
@@ -696,6 +699,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
}
finally {
cache.destroy();
+
stopGrid(nodeCount() + 1);
}
}
@@ -1019,14 +1023,18 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
CacheConfiguration cfg = new CacheConfiguration(DYNAMIC_CACHE_NAME);
IgniteCache cache = ignite(0).createCache(cfg);
- for (int i = 0; i < 100; i++) {
- assertFalse(ignite(0).affinity(DYNAMIC_CACHE_NAME).mapKeyToPrimaryAndBackups(i)
- .contains(dNode.cluster().localNode()));
- cache.put(i, i);
- }
+ try {
+ for (int i = 0; i < 100; i++) {
+ assertFalse(ignite(0).affinity(DYNAMIC_CACHE_NAME).mapKeyToPrimaryAndBackups(i)
+ .contains(dNode.cluster().localNode()));
- cache.destroy();
+ cache.put(i, i);
+ }
+ }
+ finally {
+ cache.destroy();
+ }
}
finally {
stopGrid(nodeCount());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
index 5f352e8..801a75b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.apache.ignite.resources.*;
@@ -536,10 +537,14 @@ public class IgniteCacheClientNodePartitionsExchangeTest extends GridCommonAbstr
AffinityTopologyVersion topVer;
if (!srvNode) {
+ log.info("Close client cache: " + CACHE_NAME1);
+
ignite2.cache(CACHE_NAME1).close();
assertNull(((IgniteKernal)ignite2).context().cache().context().cache().internalCache(CACHE_NAME1));
+ waitForTopologyUpdate(3, new AffinityTopologyVersion(3, 2));
+
assertEquals(0, spi0.partitionsSingleMessages());
assertEquals(0, spi0.partitionsFullMessages());
assertEquals(0, spi1.partitionsSingleMessages());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6c7eaee/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
index 52f3cb7..470ac79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
@@ -77,6 +77,7 @@ public class DataStreamerMultinodeCreateCacheTest extends GridCommonAbstractTest
String cacheName = "cache-" + threadIdx + "-" + (iter % 10);
IgniteCache<Integer, String> cache = ignite.getOrCreateCache(cacheName);
+
try (IgniteDataStreamer<Object, Object> stmr = ignite.dataStreamer(cacheName)) {
((DataStreamerImpl<Object, Object>)stmr).maxRemapCount(0);
[27/50] incubator-ignite git commit: ignite-1070 Zombie entries in
cache with SortedEvictionPolicy
Posted by sb...@apache.org.
ignite-1070 Zombie entries in cache with SortedEvictionPolicy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d0aa6f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d0aa6f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d0aa6f1
Branch: refs/heads/ignite-929
Commit: 9d0aa6f1244e13187b64dec81b8d33d94f3db2af
Parents: 44506c3
Author: agura <ag...@gridgain.com>
Authored: Tue Jul 7 14:49:13 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Tue Jul 7 14:49:13 2015 +0300
----------------------------------------------------------------------
.../cache/eviction/fifo/FifoEvictionPolicy.java | 5 -----
.../cache/eviction/lru/LruEvictionPolicy.java | 5 -----
.../eviction/sorted/SortedEvictionPolicy.java | 19 +++++--------------
...cheConcurrentEvictionConsistencySelfTest.java | 15 +++++++++++++--
4 files changed, 18 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d0aa6f1/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
index 221bc39..1e06ffd 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
@@ -216,11 +216,6 @@ public class FifoEvictionPolicy<K, V> implements EvictionPolicy<K, V>, FifoEvict
// If node was unlinked by concurrent shrink() call, we must repeat the whole cycle.
else if (!entry.removeMeta(node))
return false;
- else {
- memSize.add(-entry.size());
-
- return true;
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d0aa6f1/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
index 0be26c8..ba6f88a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
@@ -200,11 +200,6 @@ public class LruEvictionPolicy<K, V> implements EvictionPolicy<K, V>, LruEvictio
// If node was unlinked by concurrent shrink() call, we must repeat the whole cycle.
else if (!entry.removeMeta(node))
return false;
- else {
- memSize.add(-entry.size());
-
- return true;
- }
}
}
else if (queue.unlinkx(node)) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d0aa6f1/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
index b8b82fa..d99b3b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
@@ -224,21 +224,17 @@ public class SortedEvictionPolicy<K, V> implements EvictionPolicy<K, V>, SortedE
private boolean touch(EvictableEntry<K, V> entry) {
Holder<K, V> holder = entry.meta();
- // Entry has not been add yet to backed queue..
+ // Entry has not been added yet to backed queue.
if (holder == null) {
while (true) {
holder = new Holder<>(entry, orderCnt.incrementAndGet());
- set.add(holder);
+ if (entry.putMetaIfAbsent(holder) != null)
+ return false; // Set has not been changed.
- if (entry.putMetaIfAbsent(holder) != null) {
- // Was concurrently added, need to remove it from queue.
- removeHolder(holder);
+ set.add(holder);
- // Set has not been changed.
- return false;
- }
- else if (holder.order > 0) {
+ if (holder.order > 0) {
if (!entry.isCached()) {
// Was concurrently evicted, need to remove it from queue.
removeHolder(holder);
@@ -253,11 +249,6 @@ public class SortedEvictionPolicy<K, V> implements EvictionPolicy<K, V>, SortedE
// If holder was removed by concurrent shrink() call, we must repeat the whole cycle.
else if (!entry.removeMeta(holder))
return false;
- else {
- memSize.add(-entry.size());
-
- return true;
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d0aa6f1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index 921422e..91e9ecc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.cache.eviction.lru.*;
import org.apache.ignite.cache.eviction.sorted.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -273,15 +274,25 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
info("Test results [threadCnt=" + threadCnt + ", iterCnt=" + ITERATION_CNT + ", cacheSize=" + cache.size() +
", internalQueueSize" + queue.size() + ", duration=" + (System.currentTimeMillis() - start) + ']');
+ boolean detached = false;
+
for (Cache.Entry<Integer, Integer> e : queue) {
Integer rmv = cache.getAndRemove(e.getKey());
- if (rmv == null)
- fail("Eviction policy contains key that is not present in cache: " + e);
+ CacheEvictableEntryImpl unwrapped = e.unwrap(CacheEvictableEntryImpl.class);
+
+ if (rmv == null && (unwrapped.meta() != null || unwrapped.isCached())) {
+ U.warn(log, "Detached entry: " + e);
+
+ detached = true;
+ }
else
info("Entry removed: " + rmv);
}
+ if (detached)
+ fail("Eviction policy contains keys that are not present in cache");
+
if (!(cache.localSize() == 0)) {
boolean zombies = false;
[10/50] incubator-ignite git commit: ignite-1091
Posted by sb...@apache.org.
ignite-1091
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bdc5e948
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdc5e948
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdc5e948
Branch: refs/heads/ignite-929
Commit: bdc5e94842bab81ce1f8b8df14482be0d255c537
Parents: beb697a
Author: Anton <av...@gridgain.com>
Authored: Fri Jul 3 16:45:23 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Fri Jul 3 16:45:23 2015 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 4 ++--
modules/mesos/pom.xml | 1 -
modules/rest-http/pom.xml | 12 ++++++------
modules/urideploy/pom.xml | 8 ++++----
modules/web/pom.xml | 4 ++--
parent/pom.xml | 1 +
6 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdc5e948/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index c7cb953..6c5af02 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -85,14 +85,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdc5e948/modules/mesos/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index 491667d..328e5b8 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -34,7 +34,6 @@
<version>1.2.1-SNAPSHOT</version>
<properties>
- <jetty.version>9.2.10.v20150310</jetty.version>
<mesos.version>0.22.0</mesos.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdc5e948/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index c4cb62d..406585d 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -55,37 +55,37 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdc5e948/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 76a862b..7e19578 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -113,28 +113,28 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdc5e948/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index f109880..be946d7 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -63,14 +63,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.0.5.v20130815</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdc5e948/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b167932..bfa9f62 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
<maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format>
<doxygen.exec>doxygen</doxygen.exec>
<git.exec>git</git.exec>
+ <jetty.version>9.2.11.v20150529</jetty.version>
</properties>
<groupId>org.apache.ignite</groupId>
[05/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-6'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-6'
# Conflicts:
# examples/pom.xml
# modules/aop/pom.xml
# modules/aws/pom.xml
# modules/clients/pom.xml
# modules/cloud/pom.xml
# modules/codegen/pom.xml
# modules/core/pom.xml
# modules/extdata/p2p/pom.xml
# modules/extdata/uri/pom.xml
# modules/gce/pom.xml
# modules/geospatial/pom.xml
# modules/hadoop/pom.xml
# modules/hibernate/pom.xml
# modules/indexing/pom.xml
# modules/jcl/pom.xml
# modules/jta/pom.xml
# modules/log4j/pom.xml
# modules/rest-http/pom.xml
# modules/scalar/pom.xml
# modules/schedule/pom.xml
# modules/schema-import/pom.xml
# modules/slf4j/pom.xml
# modules/spring/pom.xml
# modules/ssh/pom.xml
# modules/tools/pom.xml
# modules/urideploy/pom.xml
# modules/visor-console/pom.xml
# modules/visor-plugins/pom.xml
# modules/web/pom.xml
# modules/yardstick/pom.xml
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9fe9996
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9fe9996
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9fe9996
Branch: refs/heads/ignite-929
Commit: f9fe99963fd3defab639e9700dffc965cdd39bb1
Parents: 8a6a7cb 285d790
Author: Andrey <an...@gridgain.com>
Authored: Wed Jun 24 18:00:24 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Jun 24 18:00:24 2015 +0700
----------------------------------------------------------------------
.gitignore | 3 +-
DEVNOTES.txt | 73 +-
RELEASE_NOTES.txt | 12 +
assembly/dependencies-fabric.xml | 1 +
assembly/dependencies-visor-console.xml | 3 +
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/functions.sh | 2 +-
dev-tools/.gitignore | 2 +
dev-tools/build.gradle | 54 +
.../gradle/wrapper/gradle-wrapper.properties | 20 +
dev-tools/gradlew | 233 +
dev-tools/slurp.sh | 76 +
dev-tools/src/main/groovy/jiraslurp.groovy | 544 ++
examples/config/example-cache.xml | 2 +
examples/pom.xml | 36 +-
.../hibernate/CacheHibernatePersonStore.java | 202 +-
.../hibernate/CacheHibernateStoreExample.java | 17 +
.../store/jdbc/CacheJdbcPersonStore.java | 180 +-
.../store/jdbc/CacheJdbcStoreExample.java | 13 +
.../store/spring/CacheSpringPersonStore.java | 128 +
.../store/spring/CacheSpringStoreExample.java | 143 +
.../datagrid/store/spring/package-info.java | 22 +
.../client/memcache/MemcacheRestExample.java | 32 +-
.../streaming/StreamTransformerExample.java | 4 +-
.../streaming/StreamVisitorExample.java | 4 +-
.../ignite/examples/streaming/package-info.java | 1 -
.../streaming/wordcount/CacheConfig.java | 2 +-
.../streaming/wordcount/QueryWords.java | 12 +-
.../streaming/wordcount/StreamWords.java | 12 +-
.../streaming/wordcount/package-info.java | 1 -
.../socket/WordsSocketStreamerClient.java | 82 +
.../socket/WordsSocketStreamerServer.java | 124 +
.../wordcount/socket/package-info.java | 21 +
idea/ignite_codeStyle.xml | 147 +
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
.../s3/S3CheckpointManagerSelfTest.java | 2 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 +-
.../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +-
.../s3/S3SessionCheckpointSelfTest.java | 2 +-
.../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +-
modules/clients/pom.xml | 2 +-
.../ClientAbstractConnectivitySelfTest.java | 14 +
.../client/router/TcpSslRouterSelfTest.java | 5 +
.../client/suite/IgniteClientTestSuite.java | 3 +-
modules/cloud/pom.xml | 4 +-
.../cloud/TcpDiscoveryCloudIpFinder.java | 25 +-
.../TcpDiscoveryCloudIpFinderSelfTest.java | 5 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 3 +-
.../src/main/java/org/apache/ignite/Ignite.java | 8 +-
.../java/org/apache/ignite/IgniteCache.java | 41 +-
.../java/org/apache/ignite/IgniteServices.java | 5 +-
.../apache/ignite/IgniteSystemProperties.java | 6 +
.../main/java/org/apache/ignite/Ignition.java | 18 +-
.../org/apache/ignite/cache/CacheMetrics.java | 187 +-
.../ignite/cache/eviction/EvictableEntry.java | 7 +
.../ignite/cache/eviction/EvictionPolicy.java | 2 +
.../cache/eviction/fifo/FifoEvictionPolicy.java | 117 +-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 22 +
.../cache/eviction/lru/LruEvictionPolicy.java | 135 +-
.../eviction/lru/LruEvictionPolicyMBean.java | 38 +
.../eviction/random/RandomEvictionPolicy.java | 10 +-
.../eviction/sorted/SortedEvictionPolicy.java | 141 +-
.../sorted/SortedEvictionPolicyMBean.java | 22 +
.../apache/ignite/cache/query/QueryMetrics.java | 6 +-
.../apache/ignite/cache/query/ScanQuery.java | 48 +-
.../apache/ignite/cache/store/CacheStore.java | 2 +
.../ignite/cache/store/CacheStoreSession.java | 22 +
.../cache/store/CacheStoreSessionListener.java | 133 +
.../cache/store/jdbc/CacheJdbcBlobStore.java | 22 +-
.../store/jdbc/CacheJdbcBlobStoreFactory.java | 290 +
.../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +-
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 148 +
.../jdbc/CacheJdbcStoreSessionListener.java | 141 +
.../org/apache/ignite/cluster/ClusterNode.java | 24 +-
.../configuration/CacheConfiguration.java | 70 +-
.../configuration/IgniteConfiguration.java | 48 +-
.../org/apache/ignite/igfs/IgfsUserContext.java | 119 +
.../igfs/secondary/IgfsSecondaryFileSystem.java | 7 +
.../ignite/internal/ClusterMetricsSnapshot.java | 14 +
.../internal/GridEventConsumeHandler.java | 126 +-
.../ignite/internal/GridKernalContext.java | 5 +
.../ignite/internal/GridKernalContextImpl.java | 10 +-
.../ignite/internal/GridPluginContext.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 99 +-
.../ignite/internal/IgniteNodeAttributes.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 166 +-
.../internal/MarshallerContextAdapter.java | 82 +-
.../ignite/internal/MarshallerContextImpl.java | 38 +-
.../client/GridClientConfiguration.java | 2 +-
.../GridClientOptimizedMarshaller.java | 26 +
.../impl/GridTcpRouterNioListenerAdapter.java | 2 +-
.../internal/direct/DirectByteBufferStream.java | 4 +-
.../internal/events/DiscoveryCustomEvent.java | 18 +-
.../internal/igfs/common/IgfsMarshaller.java | 35 +-
.../igfs/common/IgfsPathControlRequest.java | 22 +
.../interop/InteropAwareEventFilter.java | 37 +
.../internal/interop/InteropBootstrap.java | 35 +
.../interop/InteropBootstrapFactory.java | 39 +
.../internal/interop/InteropException.java | 71 +
.../internal/interop/InteropIgnition.java | 217 +
.../interop/InteropLocalEventListener.java | 28 +
.../interop/InteropNoCallbackException.java | 50 +
.../internal/interop/InteropProcessor.java | 44 +
.../internal/managers/GridManagerAdapter.java | 76 +-
.../checkpoint/GridCheckpointManager.java | 52 +-
.../managers/communication/GridIoManager.java | 129 +-
.../GridLifecycleAwareMessageFilter.java | 5 +-
.../managers/discovery/CustomEventListener.java | 31 +
.../discovery/CustomMessageWrapper.java | 63 +
.../discovery/DiscoveryCustomMessage.java | 54 +
.../discovery/GridDiscoveryManager.java | 313 +-
.../eventstorage/GridEventStorageManager.java | 29 +-
.../managers/indexing/GridIndexingManager.java | 4 -
.../affinity/AffinityTopologyVersion.java | 7 -
.../affinity/GridAffinityAssignment.java | 12 +
.../affinity/GridAffinityAssignmentCache.java | 40 +-
.../affinity/GridAffinityProcessor.java | 23 +-
.../cache/CacheEvictableEntryImpl.java | 31 +
.../processors/cache/CacheMetricsImpl.java | 367 +-
.../cache/CacheMetricsMXBeanImpl.java | 100 +
.../processors/cache/CacheMetricsSnapshot.java | 380 +-
.../cache/DynamicCacheChangeBatch.java | 29 +-
.../cache/DynamicCacheDescriptor.java | 19 +
.../processors/cache/GridCacheAdapter.java | 238 +-
.../cache/GridCacheAffinityManager.java | 14 +
.../cache/GridCacheConcurrentMap.java | 21 +-
.../processors/cache/GridCacheContext.java | 29 +-
.../processors/cache/GridCacheEntryEx.java | 6 +
.../cache/GridCacheEvictionManager.java | 2 +-
.../processors/cache/GridCacheGateway.java | 2 +-
.../processors/cache/GridCacheIoManager.java | 386 +-
.../processors/cache/GridCacheMapEntry.java | 172 +-
.../processors/cache/GridCacheMessage.java | 59 +-
.../processors/cache/GridCacheMvccManager.java | 36 +-
.../GridCachePartitionExchangeManager.java | 172 +-
.../processors/cache/GridCachePreloader.java | 6 +-
.../cache/GridCachePreloaderAdapter.java | 11 +-
.../processors/cache/GridCacheProcessor.java | 178 +-
.../processors/cache/GridCacheProxyImpl.java | 50 +-
.../cache/GridCacheSharedContext.java | 48 +-
.../processors/cache/GridCacheSwapManager.java | 368 +-
.../processors/cache/GridCacheTtlManager.java | 9 +-
.../processors/cache/GridCacheUtils.java | 295 +-
.../processors/cache/IgniteCacheProxy.java | 49 +-
.../processors/cache/IgniteInternalCache.java | 70 +-
.../processors/cache/KeyCacheObjectImpl.java | 11 +-
.../processors/cache/QueryCursorImpl.java | 23 +-
.../cache/affinity/GridCacheAffinityImpl.java | 10 +-
.../CacheDataStructuresManager.java | 2 +-
.../distributed/GridCacheTxRecoveryRequest.java | 26 +-
.../GridCacheTxRecoveryResponse.java | 14 +-
.../distributed/GridDistributedBaseMessage.java | 77 +-
.../GridDistributedCacheAdapter.java | 210 +-
.../distributed/GridDistributedCacheEntry.java | 7 -
.../distributed/GridDistributedLockRequest.java | 123 +-
.../GridDistributedLockResponse.java | 14 +-
.../GridDistributedTxFinishRequest.java | 90 +-
.../distributed/GridDistributedTxMapping.java | 22 +-
.../GridDistributedTxPrepareRequest.java | 128 +-
.../GridDistributedTxPrepareResponse.java | 64 +-
.../GridDistributedTxRemoteAdapter.java | 30 +-
.../GridDistributedUnlockRequest.java | 6 +-
.../dht/GridClientPartitionTopology.java | 10 +-
.../dht/GridDhtAssignmentFetchFuture.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java | 49 +-
.../distributed/dht/GridDhtCacheEntry.java | 6 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 11 +-
.../distributed/dht/GridDhtLocalPartition.java | 63 +-
.../distributed/dht/GridDhtLockFuture.java | 12 +-
.../distributed/dht/GridDhtLockRequest.java | 101 +-
.../distributed/dht/GridDhtLockResponse.java | 18 +-
.../dht/GridDhtOffHeapCacheEntry.java | 63 +
.../dht/GridDhtPartitionTopologyImpl.java | 42 +-
.../dht/GridDhtPartitionsReservation.java | 292 +
.../dht/GridDhtTransactionalCacheAdapter.java | 239 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 3 -
.../distributed/dht/GridDhtTxFinishRequest.java | 43 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 38 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 103 +-
.../cache/distributed/dht/GridDhtTxMapping.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 103 +-
.../dht/GridDhtTxPrepareRequest.java | 60 +-
.../dht/GridDhtTxPrepareResponse.java | 22 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 8 +-
.../distributed/dht/GridDhtUnlockRequest.java | 6 +-
.../distributed/dht/GridNoStorageCacheMap.java | 4 +-
.../cache/distributed/dht/GridReservable.java | 35 +
.../dht/atomic/GridDhtAtomicCache.java | 58 +-
.../atomic/GridDhtAtomicOffHeapCacheEntry.java | 63 +
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 8 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 118 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 134 +-
.../atomic/GridNearAtomicUpdateResponse.java | 18 +-
.../dht/colocated/GridDhtColocatedCache.java | 17 +-
.../colocated/GridDhtColocatedLockFuture.java | 212 +-
.../GridDhtColocatedOffHeapCacheEntry.java | 63 +
.../colocated/GridDhtDetachedCacheEntry.java | 4 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 50 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 54 +-
.../preloader/GridDhtPartitionDemandPool.java | 26 +-
.../dht/preloader/GridDhtPartitionMap.java | 28 +-
.../preloader/GridDhtPartitionSupplyPool.java | 29 +-
.../GridDhtPartitionsExchangeFuture.java | 493 +-
.../preloader/GridDhtPartitionsFullMessage.java | 4 +-
.../GridDhtPartitionsSingleMessage.java | 33 +-
.../dht/preloader/GridDhtPreloader.java | 41 +-
.../preloader/GridDhtPreloaderAssignments.java | 3 +-
.../distributed/near/GridNearAtomicCache.java | 5 +
.../distributed/near/GridNearCacheAdapter.java | 15 +-
.../distributed/near/GridNearCacheEntry.java | 6 +-
.../distributed/near/GridNearGetFuture.java | 2 +-
.../distributed/near/GridNearGetResponse.java | 8 +-
.../distributed/near/GridNearLockFuture.java | 280 +-
.../distributed/near/GridNearLockRequest.java | 91 +-
.../distributed/near/GridNearLockResponse.java | 30 +-
.../near/GridNearOffHeapCacheEntry.java | 60 +
.../near/GridNearOptimisticTxPrepareFuture.java | 815 ++
.../GridNearPessimisticTxPrepareFuture.java | 350 +
.../near/GridNearTransactionalCache.java | 8 +-
.../near/GridNearTxFinishRequest.java | 28 +-
.../cache/distributed/near/GridNearTxLocal.java | 152 +-
.../near/GridNearTxPrepareFuture.java | 1050 ---
.../near/GridNearTxPrepareFutureAdapter.java | 231 +
.../near/GridNearTxPrepareRequest.java | 86 +-
.../near/GridNearTxPrepareResponse.java | 94 +-
.../distributed/near/GridNearTxRemote.java | 24 +-
.../distributed/near/GridNearUnlockRequest.java | 2 +-
.../processors/cache/local/GridLocalCache.java | 14 +-
.../cache/local/GridLocalCacheEntry.java | 18 +
.../local/atomic/GridLocalAtomicCache.java | 58 +-
.../processors/cache/query/CacheQuery.java | 2 +-
.../query/GridCacheDistributedQueryManager.java | 3 +
.../cache/query/GridCacheQueryAdapter.java | 165 +-
.../cache/query/GridCacheQueryErrorFuture.java | 2 +
.../cache/query/GridCacheQueryManager.java | 254 +-
.../cache/query/GridCacheQueryRequest.java | 47 +-
.../cache/query/GridCacheTwoStepQuery.java | 22 +-
.../processors/cache/query/QueryCursorEx.java | 8 +
.../continuous/CacheContinuousQueryHandler.java | 8 +
.../continuous/CacheContinuousQueryManager.java | 28 +-
.../cache/store/CacheOsStoreManager.java | 1 -
.../cache/store/CacheStoreManager.java | 7 +-
.../store/GridCacheStoreManagerAdapter.java | 202 +-
.../cache/transactions/IgniteInternalTx.java | 19 +-
.../transactions/IgniteTransactionsImpl.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 116 +-
.../cache/transactions/IgniteTxEntry.java | 48 +-
.../cache/transactions/IgniteTxHandler.java | 225 +-
.../transactions/IgniteTxLocalAdapter.java | 357 +-
.../cache/transactions/IgniteTxLocalEx.java | 21 +-
.../cache/transactions/IgniteTxManager.java | 101 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 14 +-
.../IgniteCacheObjectProcessorImpl.java | 14 +-
.../continuous/AbstractContinuousMessage.java | 63 +
.../continuous/GridContinuousMessageType.java | 12 -
.../continuous/GridContinuousProcessor.java | 853 +--
.../processors/continuous/StartRequestData.java | 267 +
.../StartRoutineAckDiscoveryMessage.java | 63 +
.../StartRoutineDiscoveryMessage.java | 85 +
.../StopRoutineAckDiscoveryMessage.java | 49 +
.../continuous/StopRoutineDiscoveryMessage.java | 49 +
.../datastreamer/DataStreamerCacheUpdaters.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 102 +-
.../datastructures/DataStructuresProcessor.java | 174 +-
.../datastructures/GridCacheSetImpl.java | 4 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java | 7 +-
.../internal/processors/hadoop/HadoopJob.java | 2 +-
.../processors/hadoop/HadoopTaskContext.java | 14 +-
.../processors/igfs/IgfsDeleteWorker.java | 4 +
.../ignite/internal/processors/igfs/IgfsEx.java | 8 +-
.../internal/processors/igfs/IgfsImpl.java | 8 +-
.../processors/igfs/IgfsIpcHandler.java | 184 +-
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../igfs/IgfsSecondaryFileSystemImpl.java | 9 +-
.../internal/processors/igfs/IgfsServer.java | 4 +-
.../internal/processors/igfs/IgfsUtils.java | 16 +
.../offheap/GridOffHeapProcessor.java | 36 +-
.../plugin/IgnitePluginProcessor.java | 16 +-
.../portable/GridPortableInputStream.java | 10 +
.../processors/query/GridQueryIndexing.java | 34 +-
.../processors/query/GridQueryProcessor.java | 432 +-
.../messages/GridQueryNextPageResponse.java | 35 +-
.../h2/twostep/messages/GridQueryRequest.java | 111 +-
.../processors/resource/GridResourceField.java | 16 +-
.../processors/resource/GridResourceIoc.java | 389 +-
.../processors/resource/GridResourceMethod.java | 13 +
.../resource/GridResourceProcessor.java | 20 +-
.../rest/client/message/GridRouterRequest.java | 18 +
.../rest/client/message/GridRouterResponse.java | 18 +
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +-
.../service/GridServiceProcessor.java | 125 +-
.../timeout/GridSpiTimeoutObject.java | 73 +
.../timeout/GridTimeoutProcessor.java | 105 +-
.../IgniteTxRollbackCheckedException.java | 9 +
.../apache/ignite/internal/util/GridDebug.java | 48 +-
.../ignite/internal/util/GridJavaProcess.java | 30 +-
.../ignite/internal/util/IgniteUtils.java | 56 +-
.../internal/util/future/GridFutureAdapter.java | 4 +-
.../shmem/IpcSharedMemoryClientEndpoint.java | 2 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 151 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 4 +-
.../util/ipc/shmem/IpcSharedMemoryUtils.java | 4 +-
.../util/lang/GridComputeJobWrapper.java | 96 -
.../util/lang/GridFilteredIterator.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 7218 +++++-------------
.../internal/util/nio/GridBufferedParser.java | 4 -
.../util/nio/GridCommunicationClient.java | 30 +-
.../internal/util/nio/GridDelimitedParser.java | 91 +
.../util/nio/GridNioDelimitedBuffer.java | 106 +
.../util/nio/GridNioRecoveryDescriptor.java | 13 +-
.../ignite/internal/util/nio/GridNioServer.java | 64 +-
.../util/nio/GridShmemCommunicationClient.java | 146 +
.../util/nio/GridTcpCommunicationClient.java | 554 --
.../util/nio/GridTcpNioCommunicationClient.java | 8 -
.../util/offheap/GridOffHeapPartitionedMap.java | 9 +
.../unsafe/GridUnsafePartitionedMap.java | 155 +-
.../util/spring/IgniteSpringHelper.java | 10 +
.../internal/visor/VisorMultiNodeTask.java | 2 +-
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../VisorCacheConfigurationCollectorJob.java | 6 +-
.../internal/visor/cache/VisorCacheMetrics.java | 19 +-
.../cache/VisorCacheMetricsCollectorTask.java | 10 +-
.../cache/VisorCacheStoreConfiguration.java | 5 +-
.../visor/node/VisorNodeDataCollectorTask.java | 9 +-
.../node/VisorNodeDataCollectorTaskResult.java | 17 +-
.../node/VisorNodeSuppressedErrorsTask.java | 12 +-
.../internal/visor/query/VisorQueryJob.java | 13 +-
.../internal/visor/query/VisorQueryTask.java | 3 +-
.../visor/util/VisorExceptionWrapper.java | 81 +
.../internal/visor/util/VisorTaskUtils.java | 6 +-
.../ignite/marshaller/MarshallerContext.java | 8 +
.../ignite/mxbean/CacheMetricsMXBean.java | 80 +
.../org/apache/ignite/plugin/PluginContext.java | 6 +
.../apache/ignite/plugin/PluginProvider.java | 26 +-
.../SpringApplicationContextResource.java | 4 +-
.../apache/ignite/resources/SpringResource.java | 6 +-
.../org/apache/ignite/services/Service.java | 5 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 105 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 66 +-
.../ignite/spi/IgniteSpiTimeoutObject.java | 44 +
.../spi/checkpoint/noop/NoopCheckpointSpi.java | 3 +-
.../communication/tcp/TcpCommunicationSpi.java | 963 ++-
.../tcp/TcpCommunicationSpiMBean.java | 29 +-
.../ignite/spi/discovery/DiscoverySpi.java | 23 +-
.../discovery/DiscoverySpiCustomMessage.java | 40 +
.../spi/discovery/DiscoverySpiListener.java | 5 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 1688 ++++
.../ignite/spi/discovery/tcp/ServerImpl.java | 4778 ++++++++++++
.../discovery/tcp/TcpClientDiscoverySpi.java | 1264 ---
.../tcp/TcpClientDiscoverySpiMBean.java | 164 -
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 279 +
.../spi/discovery/tcp/TcpDiscoverySpi.java | 5785 +++-----------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 1160 ---
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 9 +
.../tcp/internal/TcpDiscoveryNode.java | 25 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 2 +-
.../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +-
.../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +-
.../TcpDiscoveryMulticastIpFinder.java | 50 +-
.../messages/TcpDiscoveryAbstractMessage.java | 34 +-
.../TcpDiscoveryClientHeartbeatMessage.java | 67 +
.../messages/TcpDiscoveryClientPingRequest.java | 56 +
.../TcpDiscoveryClientPingResponse.java | 67 +
.../TcpDiscoveryCustomEventMessage.java | 41 +-
.../messages/TcpDiscoveryHeartbeatMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 43 +
.../messages/TcpDiscoveryNodeAddedMessage.java | 2 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 18 +
.../tcp/messages/TcpDiscoveryPingRequest.java | 6 +
.../tcp/messages/TcpDiscoveryPingResponse.java | 15 +-
.../RoundRobinGlobalLoadBalancer.java | 2 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 8 +-
.../org/apache/ignite/stream/StreamAdapter.java | 111 +
.../ignite/stream/StreamTupleExtractor.java | 33 +
.../stream/socket/SocketMessageConverter.java | 31 +
.../ignite/stream/socket/SocketStreamer.java | 218 +
.../ignite/stream/socket/package-info.java | 21 +
.../java/org/jsr166/ConcurrentHashMap8.java | 8 +-
.../java/org/jsr166/ConcurrentLinkedDeque8.java | 586 +-
.../src/main/java/org/jsr166/LongAdder8.java | 35 +-
.../core/src/main/java/org/jsr166/README.txt | 11 +
.../src/main/java/org/jsr166/Striped64_8.java | 22 +-
.../java/org/jsr166/ThreadLocalRandom8.java | 19 +-
.../src/main/java/org/jsr166/package-info.java | 12 +-
.../resources/META-INF/classnames.properties | 1 -
.../core/src/main/resources/ignite.properties | 2 +-
modules/core/src/test/config/tests.properties | 2 +-
.../ignite/GridSuppressedExceptionSelfTest.java | 4 +-
.../affinity/IgniteClientNodeAffinityTest.java | 182 +
...cheStoreSessionListenerAbstractSelfTest.java | 315 +
...heStoreSessionListenerLifecycleSelfTest.java | 395 +
.../CacheJdbcStoreSessionListenerSelfTest.java | 175 +
.../ignite/internal/GridAffinitySelfTest.java | 1 +
.../internal/GridDiscoveryEventSelfTest.java | 13 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 22 +-
.../GridFailoverTaskWithPredicateSelfTest.java | 3 -
.../GridJobMasterLeaveAwareSelfTest.java | 2 -
.../internal/GridJobStealingSelfTest.java | 3 -
.../internal/GridProjectionAbstractTest.java | 16 +
.../GridProjectionForCachesSelfTest.java | 11 +-
...ectionLocalJobMultipleArgumentsSelfTest.java | 2 -
.../internal/GridReleaseTypeSelfTest.java | 77 +-
.../apache/ignite/internal/GridSelfTest.java | 28 +-
.../GridTaskExecutionContextSelfTest.java | 9 -
.../IgniteComputeEmptyClusterGroupTest.java | 3 -
.../IgniteComputeTopologyExceptionTest.java | 9 -
.../IgniteSlowClientDetectionSelfTest.java | 187 +
.../GridDiscoveryManagerAliveCacheSelfTest.java | 82 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 122 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 46 +-
.../GridAffinityProcessorAbstractSelfTest.java | 1 +
.../cache/CacheClientStoreSelfTest.java | 228 +
.../cache/CacheOffheapMapEntrySelfTest.java | 168 +
.../cache/CacheRemoveAllSelfTest.java | 81 +
.../CacheStoreUsageMultinodeAbstractTest.java | 305 +
...eUsageMultinodeDynamicStartAbstractTest.java | 169 +
...oreUsageMultinodeDynamicStartAtomicTest.java | 32 +
...heStoreUsageMultinodeDynamicStartTxTest.java | 32 +
...reUsageMultinodeStaticStartAbstractTest.java | 158 +
...toreUsageMultinodeStaticStartAtomicTest.java | 32 +
...cheStoreUsageMultinodeStaticStartTxTest.java | 32 +
.../GridCacheAbstractFailoverSelfTest.java | 12 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 379 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 48 +-
.../GridCacheAbstractRemoveFailureTest.java | 23 +
.../cache/GridCacheAbstractSelfTest.java | 9 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 4 +-
.../GridCacheAtomicMessageCountSelfTest.java | 1 +
.../GridCacheConcurrentTxMultiNodeTest.java | 8 +-
...idCacheConfigurationConsistencySelfTest.java | 14 +-
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +
.../cache/GridCacheDeploymentSelfTest.java | 3 -
.../cache/GridCacheEntryMemorySizeSelfTest.java | 91 +-
.../GridCacheExAbstractFullApiSelfTest.java | 103 -
.../cache/GridCacheMemoryModeSelfTest.java | 25 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 2 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 +
...inodeUpdateNearEnabledNoBackupsSelfTest.java | 2 +-
...CacheMultinodeUpdateNearEnabledSelfTest.java | 2 +-
.../processors/cache/GridCacheOffHeapTest.java | 33 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 1 +
.../GridCacheReferenceCleanupSelfTest.java | 3 -
.../cache/GridCacheReloadSelfTest.java | 6 +-
.../GridCacheReturnValueTransferSelfTest.java | 3 +
.../processors/cache/GridCacheStopSelfTest.java | 5 +
.../cache/GridCacheSwapReloadSelfTest.java | 20 +-
...acheTcpClientDiscoveryMultiThreadedTest.java | 190 +
.../processors/cache/GridCacheTestEntryEx.java | 4 +
.../GridCacheVariableTopologySelfTest.java | 12 +-
.../cache/GridCacheVersionMultinodeTest.java | 6 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 36 +-
.../cache/IgniteCacheAbstractTest.java | 5 +-
.../IgniteCacheAtomicStopBusySelfTest.java | 8 +-
.../IgniteCacheConfigurationTemplateTest.java | 2 +-
.../IgniteCacheEntryListenerAbstractTest.java | 14 +-
.../IgniteCacheInterceptorSelfTestSuite.java | 2 +-
.../cache/IgniteCacheInvokeReadThroughTest.java | 5 +
.../cache/IgniteCacheNearLockValueSelfTest.java | 148 +
.../IgniteCacheP2pUnmarshallingErrorTest.java | 200 +
...gniteCacheP2pUnmarshallingNearErrorTest.java | 59 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 77 +
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 116 +
.../IgniteCachePartitionMapUpdateTest.java | 226 +
.../cache/IgniteCachePeekModesAbstractTest.java | 20 +-
...gniteCacheTransactionalStopBusySelfTest.java | 13 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 101 +-
...niteDynamicCacheWithConfigStartSelfTest.java | 97 +
.../IgniteDynamicClientCacheStartSelfTest.java | 283 +
...teStartCacheInTransactionAtomicSelfTest.java | 32 +
.../IgniteStartCacheInTransactionSelfTest.java | 254 +
.../cache/IgniteSystemCacheOnClientTest.java | 97 +
.../IgniteTxMultiThreadedAbstractTest.java | 4 +-
.../cache/OffHeapTieredTransactionSelfTest.java | 127 +
...cheAtomicReferenceMultiNodeAbstractTest.java | 11 -
.../GridCacheQueueApiSelfAbstractTest.java | 4 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 2 -
...dCacheQueueMultiNodeConsistencySelfTest.java | 5 +
...CacheQueueRotativeMultiNodeAbstractTest.java | 10 -
.../GridCacheSetAbstractSelfTest.java | 9 -
.../IgniteClientDataStructuresAbstractTest.java | 283 +
.../IgniteClientDataStructuresTest.java | 28 +
...IgniteClientDiscoveryDataStructuresTest.java | 28 +
.../IgniteCountDownLatchAbstractSelfTest.java | 102 +
...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 +
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 +
...rtitionedDataStructuresFailoverSelfTest.java | 5 +
...edOffheapDataStructuresFailoverSelfTest.java | 5 +
...PartitionedQueueCreateMultiNodeSelfTest.java | 5 +
...dCachePartitionedQueueEntryMoveSelfTest.java | 5 +
...nedQueueFailoverDataConsistencySelfTest.java | 5 +
...eplicatedDataStructuresFailoverSelfTest.java | 5 +
...CacheLoadingConcurrentGridStartSelfTest.java | 54 +-
.../GridCacheAbstractJobExecutionTest.java | 3 -
.../GridCacheAbstractNodeRestartSelfTest.java | 11 +-
.../GridCacheClientModesAbstractSelfTest.java | 94 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 168 +
.../distributed/GridCacheLockAbstractTest.java | 2 -
.../distributed/GridCacheMixedModeSelfTest.java | 3 +
.../GridCachePreloadLifecycleAbstractTest.java | 2 -
...niteCacheClientNodeChangingTopologyTest.java | 1803 +++++
.../IgniteCacheClientNodeConcurrentStart.java | 113 +
...teCacheClientNodePartitionsExchangeTest.java | 632 ++
.../distributed/IgniteCacheManyClientsTest.java | 316 +
.../IgniteCacheMessageRecoveryAbstractTest.java | 1 +
.../IgniteCrossCacheTxStoreSelfTest.java | 147 +-
.../distributed/IgniteTxGetAfterStopTest.java | 131 +
...heAbstractTransformWriteThroughSelfTest.java | 3 -
.../dht/GridCacheClientOnlySelfTest.java | 60 +-
.../GridCacheColocatedTxExceptionSelfTest.java | 5 +
.../GridCacheDhtClientRemoveFailureTest.java | 28 +
...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 11 +-
.../GridCacheExColocatedFullApiSelfTest.java | 33 -
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 +
...achePartitionedNearDisabledLockSelfTest.java | 47 +
...ePartitionedNearDisabledMetricsSelfTest.java | 4 +-
...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +-
...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 +
...earDisabledOffHeapTieredFullApiSelfTest.java | 33 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...dCachePartitionedTopologyChangeSelfTest.java | 5 +
.../dht/IgniteCacheMultiTxLockSelfTest.java | 53 +-
...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +-
...cClientInvalidPartitionHandlingSelfTest.java | 29 +
.../GridCacheAtomicClientRemoveFailureTest.java | 28 +
...eAtomicInvalidPartitionHandlingSelfTest.java | 23 +-
...idCacheAtomicReplicatedFailoverSelfTest.java | 6 +
...unctionExcludeNeighborsAbstractSelfTest.java | 3 +-
.../near/GridCacheAtomicNearOnlySelfTest.java | 32 -
...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 +
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 +
...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
.../near/GridCacheExNearFullApiSelfTest.java | 39 -
.../near/GridCacheNearEvictionSelfTest.java | 3 -
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +
.../near/GridCacheNearOnlySelfTest.java | 63 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 1 +
.../near/GridCacheNearTxExceptionSelfTest.java | 5 +
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 5 +-
.../GridCachePartitionedEvictionSelfTest.java | 11 +-
...PartitionedFullApiMultithreadedSelfTest.java | 5 +
.../GridCachePartitionedFullApiSelfTest.java | 32 +
...idCachePartitionedHitsAndMissesSelfTest.java | 3 -
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 6 +-
.../GridCachePartitionedNodeRestartTest.java | 5 +
...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +-
...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...PartitionedOffHeapTieredFullApiSelfTest.java | 32 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 +
...ePartitionedOptimisticTxNodeRestartTest.java | 5 +
...achePartitionedPreloadLifecycleSelfTest.java | 2 +-
...CachePartitionedTxMultiThreadedSelfTest.java | 5 +
.../GridCachePartitionedTxSalvageSelfTest.java | 54 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +
.../near/IgniteCacheNearOnlyTxTest.java | 190 +
.../near/NoneRebalanceModeSelfTest.java | 67 +
.../GridCacheExReplicatedFullApiSelfTest.java | 33 -
.../GridCacheReplicatedClientOnlySelfTest.java | 43 -
.../GridCacheReplicatedFailoverSelfTest.java | 6 +
...eReplicatedFullApiMultithreadedSelfTest.java | 5 +
.../GridCacheReplicatedInvalidateSelfTest.java | 4 +-
.../GridCacheReplicatedLockSelfTest.java | 5 +
...ridCacheReplicatedMultiNodeLockSelfTest.java | 5 +
.../GridCacheReplicatedMultiNodeSelfTest.java | 5 +
.../GridCacheReplicatedNearOnlySelfTest.java | 43 -
.../GridCacheReplicatedNodeRestartSelfTest.java | 85 +
...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +-
...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
.../GridCacheReplicatedTxExceptionSelfTest.java | 5 +
.../GridCacheSyncReplicatedPreloadSelfTest.java | 1 -
.../replicated/GridReplicatedTxPreloadTest.java | 2 +
...acheAtomicReplicatedNodeRestartSelfTest.java | 5 +
...CacheReplicatedPreloadLifecycleSelfTest.java | 6 +-
.../cache/eviction/EvictionAbstractTest.java | 1056 +++
.../GridCacheBatchEvictUnswapSelfTest.java | 5 +-
...heConcurrentEvictionConsistencySelfTest.java | 82 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 29 +-
.../GridCacheDistributedEvictionsSelfTest.java | 5 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +-
.../eviction/GridCacheEvictionAbstractTest.java | 484 --
.../GridCacheEvictionFilterSelfTest.java | 4 +-
.../GridCacheEvictionTouchSelfTest.java | 22 +-
.../cache/eviction/GridCacheMockEntry.java | 5 +
...cheSynchronousEvictionsFailoverSelfTest.java | 5 +
.../fifo/FifoEvictionPolicySelfTest.java | 262 +
...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 -
.../GridCacheFifoEvictionPolicySelfTest.java | 372 -
.../lru/GridCacheLruEvictionPolicySelfTest.java | 417 -
.../GridCacheLruNearEvictionPolicySelfTest.java | 136 -
...heNearOnlyLruNearEvictionPolicySelfTest.java | 171 -
.../eviction/lru/LruEvictionPolicySelfTest.java | 353 +
.../lru/LruNearEvictionPolicySelfTest.java | 140 +
.../LruNearOnlyNearEvictionPolicySelfTest.java | 172 +
.../GridCacheRandomEvictionPolicySelfTest.java | 258 -
.../RandomEvictionPolicyCacheSizeSelfTest.java | 78 +
.../random/RandomEvictionPolicySelfTest.java | 357 +
...dCacheSortedBatchEvictionPolicySelfTest.java | 385 -
...acheSortedEvictionPolicyPerformanceTest.java | 135 -
.../GridCacheSortedEvictionPolicySelfTest.java | 373 -
.../SortedEvictionPolicyPerformanceTest.java | 134 +
.../sorted/SortedEvictionPolicySelfTest.java | 266 +
.../IgniteCacheClientNearCacheExpiryTest.java | 103 +
.../IgniteCacheExpiryPolicyAbstractTest.java | 10 +-
.../IgniteCacheExpiryPolicyTestSuite.java | 2 +
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +
.../local/GridCacheExLocalFullApiSelfTest.java | 30 -
...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 +
...dCacheLocalFullApiMultithreadedSelfTest.java | 5 +
.../GridCacheLocalIsolatedNodesSelfTest.java | 18 +-
.../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +-
...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 +
.../GridCacheLocalTxExceptionSelfTest.java | 5 +
.../GridCacheSwapScanQueryAbstractSelfTest.java | 115 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 8 +-
...CacheClientWriteBehindStoreAbstractTest.java | 104 +
...teCacheClientWriteBehindStoreAtomicTest.java | 38 +
.../IgnteCacheClientWriteBehindStoreTxTest.java | 32 +
.../closure/GridClosureProcessorSelfTest.java | 29 +-
.../continuous/GridEventConsumeSelfTest.java | 98 +-
.../DataStreamProcessorSelfTest.java | 48 +-
.../DataStreamerMultiThreadedSelfTest.java | 62 +-
.../DataStreamerMultinodeCreateCacheTest.java | 97 +
.../igfs/IgfsClientCacheSelfTest.java | 12 +-
.../processors/igfs/IgfsCommonAbstractTest.java | 10 -
.../processors/igfs/IgfsModesSelfTest.java | 4 +-
.../processors/igfs/IgfsOneClientNodeTest.java | 8 +-
.../service/ClosureServiceClientsNodesTest.java | 251 +
.../service/GridServiceClientNodeTest.java | 81 +
.../ipc/shmem/IgfsSharedMemoryTestServer.java | 2 +
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +-
.../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +-
.../LoadWithCorruptedLibFileTestRunner.java | 2 +-
.../IpcSharedMemoryBenchmarkReader.java | 2 +-
.../IpcSharedMemoryBenchmarkWriter.java | 2 +-
.../nio/GridNioDelimitedBufferSelfTest.java | 112 +
.../internal/util/nio/GridNioSelfTest.java | 15 +-
.../internal/util/nio/GridNioSslSelfTest.java | 2 +
.../unsafe/GridUnsafeMemorySelfTest.java | 4 +-
.../tostring/GridToStringBuilderSelfTest.java | 4 +-
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 5 +-
.../communication/GridIoManagerBenchmark0.java | 1 +
.../GridCachePartitionedAtomicLongLoadTest.java | 6 +-
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
.../swap/GridSwapEvictAllBenchmark.java | 6 +-
.../marshaller/MarshallerContextTestImpl.java | 29 +-
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
...GridMessagingNoPeerClassLoadingSelfTest.java | 7 +-
.../ignite/messaging/GridMessagingSelfTest.java | 16 +-
.../IgniteMessagingWithClientTest.java | 166 +
.../GridP2PContinuousDeploymentSelfTest.java | 2 +
.../p2p/GridP2PLocalDeploymentSelfTest.java | 6 +-
.../p2p/GridP2PRemoteClassLoadersSelfTest.java | 31 +-
.../spi/GridTcpSpiForwardingSelfTest.java | 4 +-
.../GridTcpCommunicationSpiAbstractTest.java | 17 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 6 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 3 -
...cpCommunicationSpiMultithreadedSelfTest.java | 23 +-
...pCommunicationSpiMultithreadedShmemTest.java | 28 +
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 +
...GridTcpCommunicationSpiRecoverySelfTest.java | 1 +
.../GridTcpCommunicationSpiShmemSelfTest.java | 38 +
.../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 +
.../discovery/AbstractDiscoverySelfTest.java | 21 +-
...pClientDiscoveryMarshallerCheckSelfTest.java | 76 +
.../tcp/TcpClientDiscoverySelfTest.java | 700 --
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 +
.../tcp/TcpClientDiscoverySpiSelfTest.java | 1369 ++++
.../tcp/TcpDiscoveryConcurrentStartTest.java | 61 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 18 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 199 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 111 +-
.../stream/socket/SocketStreamerSelfTest.java | 310 +
.../ignite/stream/socket/package-info.java | 21 +
.../testframework/GridSpiTestContext.java | 42 +-
.../ignite/testframework/GridTestUtils.java | 31 +-
.../config/GridTestProperties.java | 14 +-
.../testframework/junits/GridAbstractTest.java | 52 +-
.../junits/GridTestKernalContext.java | 3 +-
.../junits/IgniteTestResources.java | 16 +-
.../junits/cache/TestCacheSession.java | 18 +
.../cache/TestThreadLocalCacheSession.java | 15 +
.../junits/common/GridCommonAbstractTest.java | 98 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 34 +-
.../IgniteCacheDataStructuresSelfTestSuite.java | 27 +-
.../IgniteCacheEvictionSelfTestSuite.java | 18 +-
.../IgniteCacheFailoverTestSuite.java | 26 +-
.../IgniteCacheFailoverTestSuite2.java | 47 +
.../IgniteCacheFullApiSelfTestSuite.java | 32 +-
.../IgniteCacheMetricsSelfTestSuite.java | 1 +
.../IgniteCacheNearOnlySelfTestSuite.java | 16 +-
...niteCacheP2pUnmarshallingErrorTestSuite.java | 53 +
.../testsuites/IgniteCacheRestartTestSuite.java | 10 +-
.../IgniteCacheTcpClientDiscoveryTestSuite.java | 47 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 336 +-
.../testsuites/IgniteCacheTestSuite2.java | 143 +
.../testsuites/IgniteCacheTestSuite3.java | 139 +
.../testsuites/IgniteCacheTestSuite4.java | 150 +
.../IgniteCacheWriteBehindTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 23 +-
.../IgniteMarshallerSelfTestSuite.java | 28 +-
.../IgniteSpiCommunicationSelfTestSuite.java | 2 +
.../IgniteSpiDiscoverySelfTestSuite.java | 4 +-
.../testsuites/IgniteStreamSelfTestSuite.java | 39 +
.../testsuites/IgniteUtilSelfTestSuite.java | 19 +-
.../apache/ignite/util/GridRandomSelfTest.java | 4 +-
modules/extdata/p2p/pom.xml | 2 +-
.../tests/p2p/P2PTestTaskExternalPath1.java | 10 +-
.../tests/p2p/P2PTestTaskExternalPath2.java | 8 +-
modules/extdata/uri/pom.xml | 2 +-
modules/gce/pom.xml | 4 +-
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 +-
modules/geospatial/pom.xml | 2 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 20 +-
modules/hadoop/pom.xml | 3 +-
.../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 137 +-
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 32 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 2 +-
.../internal/processors/hadoop/HadoopUtils.java | 288 +-
.../hadoop/SecondaryFileSystemProvider.java | 57 +-
.../hadoop/fs/HadoopDistributedFileSystem.java | 91 -
.../hadoop/fs/HadoopFileSystemsUtils.java | 17 -
.../hadoop/fs/HadoopLazyConcurrentMap.java | 204 +
.../processors/hadoop/igfs/HadoopIgfsEx.java | 6 +
.../hadoop/igfs/HadoopIgfsInProc.java | 170 +-
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +-
.../hadoop/igfs/HadoopIgfsOutProc.java | 33 +-
.../hadoop/igfs/HadoopIgfsWrapper.java | 19 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +-
.../processors/hadoop/v2/HadoopV2Context.java | 10 +-
.../processors/hadoop/v2/HadoopV2Job.java | 31 +-
.../hadoop/v2/HadoopV2JobResourceManager.java | 26 +-
.../hadoop/v2/HadoopV2TaskContext.java | 52 +-
.../hadoop/HadoopClientProtocolSelfTest.java | 6 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 73 +-
...oopSecondaryFileSystemConfigurationTest.java | 18 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 5 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 65 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 2 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 +
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 9 +
.../hadoop/HadoopAbstractSelfTest.java | 19 +-
.../hadoop/HadoopCommandLineTest.java | 14 +-
.../hadoop/HadoopFileSystemsTest.java | 23 +-
.../processors/hadoop/HadoopMapReduceTest.java | 183 +-
.../hadoop/HadoopTaskExecutionSelfTest.java | 2 +-
.../hadoop/HadoopTasksAllVersionsTest.java | 15 +-
.../processors/hadoop/HadoopTasksV1Test.java | 5 +-
.../processors/hadoop/HadoopTasksV2Test.java | 5 +-
.../processors/hadoop/HadoopV2JobSelfTest.java | 6 +-
.../collections/HadoopAbstractMapTest.java | 12 +
.../collections/HadoopHashMapSelfTest.java | 4 +-
.../collections/HadoopSkipListSelfTest.java | 4 +-
.../HadoopExternalTaskExecutionSelfTest.java | 2 +
.../HadoopExternalCommunicationSelfTest.java | 5 +
.../testsuites/IgniteHadoopTestSuite.java | 9 +-
modules/hibernate/pom.xml | 16 +-
.../hibernate/CacheHibernateBlobStore.java | 87 +-
.../CacheHibernateBlobStoreFactory.java | 235 +
.../CacheHibernateStoreSessionListener.java | 216 +
.../hibernate/src/test/config/factory-cache.xml | 59 +
.../src/test/config/factory-cache1.xml | 61 +
.../config/factory-incorrect-store-cache.xml | 56 +
.../hibernate/HibernateL2CacheSelfTest.java | 5 +
.../HibernateL2CacheTransactionalSelfTest.java | 5 +
.../CacheHibernateStoreFactorySelfTest.java | 273 +
...heHibernateStoreSessionListenerSelfTest.java | 228 +
.../testsuites/IgniteHibernateTestSuite.java | 8 +-
modules/indexing/pom.xml | 18 +-
.../processors/query/h2/IgniteH2Indexing.java | 142 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +-
.../query/h2/sql/GridSqlOperationType.java | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 53 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 321 +-
.../query/h2/twostep/GridMergeIndex.java | 17 +-
.../h2/twostep/GridMergeIndexUnsorted.java | 7 +-
.../h2/twostep/GridReduceQueryExecutor.java | 656 +-
.../query/h2/twostep/GridResultPage.java | 21 +-
.../CacheAbstractQueryMetricsSelfTest.java | 205 +
.../CachePartitionedQueryMetricsSelfTest.java | 32 +
.../CacheReplicatedQueryMetricsSelfTest.java | 32 +
...CacheScanPartitionQueryFallbackSelfTest.java | 408 +
.../cache/GridCacheCrossCacheQuerySelfTest.java | 25 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +-
.../cache/GridCacheOffHeapSelfTest.java | 12 +-
.../GridCacheOffheapIndexEntryEvictTest.java | 200 +
.../cache/GridCacheOffheapIndexGetSelfTest.java | 183 +
.../cache/GridCacheQueryMetricsSelfTest.java | 152 -
...idCacheReduceQueryMultithreadedSelfTest.java | 10 -
.../processors/cache/GridCacheSwapSelfTest.java | 3 -
.../cache/GridIndexingWithNoopSwapSelfTest.java | 6 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 13 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 85 +-
...acheConfigurationPrimitiveTypesSelfTest.java | 104 +
.../cache/IgniteCacheOffheapEvictQueryTest.java | 196 +
...niteCacheP2pUnmarshallingQueryErrorTest.java | 57 +
...hePartitionedQueryMultiThreadedSelfTest.java | 40 +-
...QueryMultiThreadedOffHeapTieredSelfTest.java | 37 +
.../IgniteCacheQueryMultiThreadedSelfTest.java | 44 +-
...lientQueryReplicatedNodeRestartSelfTest.java | 419 +
.../IgniteCacheQueryNodeRestartSelfTest.java | 41 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 383 +
.../local/IgniteCacheLocalQuerySelfTest.java | 6 +
...dCacheAbstractReduceFieldsQuerySelfTest.java | 1 -
.../cache/ttl/CacheTtlAbstractSelfTest.java | 6 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 4 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 22 +-
.../query/h2/sql/GridQueryParsingTest.java | 5 +-
.../IgniteCacheQuerySelfTestSuite.java | 17 +-
.../IgniteCacheWithIndexingTestSuite.java | 5 +
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
.../processors/cache/jta/CacheJtaManager.java | 4 +-
.../cache/jta/GridCacheXAResource.java | 18 +-
.../processors/cache/GridCacheJtaSelfTest.java | 2 +-
modules/log4j/pom.xml | 2 +-
modules/mesos/README.txt | 28 +
modules/mesos/licenses/apache-2.0.txt | 202 +
modules/mesos/licenses/jetty-epl-license.txt | 69 +
modules/mesos/pom.xml | 101 +
.../apache/ignite/mesos/ClusterProperties.java | 534 ++
.../apache/ignite/mesos/IgniteFramework.java | 119 +
.../apache/ignite/mesos/IgniteScheduler.java | 365 +
.../org/apache/ignite/mesos/IgniteTask.java | 86 +
.../org/apache/ignite/mesos/package-info.java | 22 +
.../ignite/mesos/resource/IgniteProvider.java | 234 +
.../ignite/mesos/resource/JettyServer.java | 61 +
.../ignite/mesos/resource/ResourceHandler.java | 142 +
.../ignite/mesos/resource/ResourceProvider.java | 120 +
.../ignite/mesos/resource/package-info.java | 22 +
.../main/resources/ignite-default-config.xml | 35 +
.../org/apache/ignite/IgniteMesosTestSuite.java | 38 +
.../ignite/mesos/IgniteSchedulerSelfTest.java | 464 ++
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/README.txt | 4 +
modules/scalar-2.10/licenses/apache-2.0.txt | 202 +
.../scalar-2.10/licenses/scala-bsd-license.txt | 18 +
modules/scalar-2.10/pom.xml | 197 +
modules/scalar/pom.xml | 2 +-
.../ignite/scalar/ScalarConversions.scala | 8 -
.../scalar/tests/ScalarCacheQueriesSpec.scala | 154 +-
.../ignite/scalar/tests/ScalarCacheSpec.scala | 23 +-
.../scalar/tests/ScalarConversionsSpec.scala | 43 +-
.../scalar/tests/ScalarProjectionSpec.scala | 128 +-
.../scalar/tests/ScalarReturnableSpec.scala | 41 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
.../ignite/schema/generator/CodeGenerator.java | 6 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/README.txt | 4 +
modules/spark-2.10/licenses/apache-2.0.txt | 202 +
.../spark-2.10/licenses/scala-bsd-license.txt | 18 +
modules/spark-2.10/pom.xml | 120 +
modules/spark/README.txt | 8 +
modules/spark/licenses/apache-2.0.txt | 202 +
modules/spark/licenses/scala-bsd-license.txt | 18 +
modules/spark/pom.xml | 110 +
.../org/apache/ignite/spark/IgniteContext.scala | 119 +
.../org/apache/ignite/spark/IgniteRDD.scala | 244 +
.../apache/ignite/spark/JavaIgniteContext.scala | 63 +
.../org/apache/ignite/spark/JavaIgniteRDD.scala | 99 +
.../ignite/spark/impl/IgniteAbstractRDD.scala | 39 +
.../ignite/spark/impl/IgnitePartition.scala | 24 +
.../ignite/spark/impl/IgniteQueryIterator.scala | 27 +
.../apache/ignite/spark/impl/IgniteSqlRDD.scala | 41 +
.../spark/impl/JavaIgniteAbstractRDD.scala | 34 +
.../ignite/spark/JavaIgniteRDDSelfTest.java | 298 +
.../scala/org/apache/ignite/spark/Entity.scala | 28 +
.../org/apache/ignite/spark/IgniteRddSpec.scala | 231 +
modules/spring/pom.xml | 23 +-
.../spring/CacheSpringStoreSessionListener.java | 207 +
.../GridResourceSpringBeanInjector.java | 2 +-
.../util/spring/IgniteSpringHelperImpl.java | 17 +
.../src/test/config/incorrect-store-cache.xml | 57 +
modules/spring/src/test/config/node.xml | 43 +
modules/spring/src/test/config/node1.xml | 45 +
.../test/config/pojo-incorrect-store-cache.xml | 56 +
modules/spring/src/test/config/store-cache.xml | 59 +
modules/spring/src/test/config/store-cache1.xml | 62 +
.../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 172 +
.../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 193 +
...CacheSpringStoreSessionListenerSelfTest.java | 197 +
.../testsuites/IgniteSpringTestSuite.java | 8 +
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
.../ignite/tools/classgen/ClassesGenerator.java | 30 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/README.txt | 4 +
modules/visor-console-2.10/pom.xml | 174 +
.../licenses/jcraft-revised-bsd.txt | 28 -
modules/visor-console/pom.xml | 4 +-
.../commands/cache/VisorCacheScanCommand.scala | 2 +-
.../visor/commands/node/VisorNodeCommand.scala | 2 +-
.../commands/tasks/VisorTasksCommand.scala | 2 +-
.../scala/org/apache/ignite/visor/visor.scala | 63 +-
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +-
.../visor/commands/VisorArgListSpec.scala | 60 +-
.../commands/VisorFileNameCompleterSpec.scala | 34 +-
.../commands/ack/VisorAckCommandSpec.scala | 20 +-
.../commands/alert/VisorAlertCommandSpec.scala | 68 +-
.../cache/VisorCacheClearCommandSpec.scala | 48 +-
.../commands/cache/VisorCacheCommandSpec.scala | 66 +-
.../config/VisorConfigurationCommandSpec.scala | 8 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 24 +-
.../deploy/VisorDeployCommandSpec.scala | 10 +-
.../disco/VisorDiscoveryCommandSpec.scala | 46 +-
.../events/VisorEventsCommandSpec.scala | 28 +-
.../visor/commands/gc/VisorGcCommandSpec.scala | 30 +-
.../commands/help/VisorHelpCommandSpec.scala | 57 +-
.../commands/kill/VisorKillCommandSpec.scala | 58 +-
.../commands/log/VisorLogCommandSpec.scala | 10 +-
.../commands/mem/VisorMemoryCommandSpec.scala | 77 +-
.../commands/node/VisorNodeCommandSpec.scala | 22 +-
.../commands/open/VisorOpenCommandSpec.scala | 16 +-
.../commands/ping/VisorPingCommandSpec.scala | 16 +-
.../commands/start/VisorStartCommandSpec.scala | 126 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 112 +-
.../commands/top/VisorTopologyCommandSpec.scala | 52 +-
.../commands/vvm/VisorVvmCommandSpec.scala | 30 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
.../IgniteWebSessionSelfTestSuite.java | 2 +-
.../config/benchmark-client-mode.properties | 89 +
modules/yardstick/pom.xml | 2 +-
parent/pom.xml | 13 +
pom.xml | 67 +-
scripts/git-apply-patch.sh | 8 +-
scripts/git-format-patch.sh | 16 +-
scripts/git-patch-functions.sh | 36 +-
scripts/git-patch-prop.sh | 2 +-
948 files changed, 59794 insertions(+), 28761 deletions(-)
----------------------------------------------------------------------
[31/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ed5c1c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ed5c1c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ed5c1c6
Branch: refs/heads/ignite-929
Commit: 6ed5c1c694dbdf40840aaf7457f883959e8aa917
Parents: 96fa300 9d0aa6f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Jul 7 18:07:55 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Jul 7 18:07:55 2015 +0300
----------------------------------------------------------------------
.../cache/eviction/fifo/FifoEvictionPolicy.java | 5 -
.../cache/eviction/lru/LruEvictionPolicy.java | 5 -
.../eviction/sorted/SortedEvictionPolicy.java | 19 +--
.../ignite/spi/discovery/tcp/ServerImpl.java | 26 +++
.../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++++++++++++
.../GridCachePartitionedNodeRestartTest.java | 5 -
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
.../GridCacheReplicatedFailoverSelfTest.java | 5 -
.../GridCacheReplicatedNodeRestartSelfTest.java | 5 -
...heConcurrentEvictionConsistencySelfTest.java | 15 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
11 files changed, 217 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
[11/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-7' into ignite-1091
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1091
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca92f1f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca92f1f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca92f1f5
Branch: refs/heads/ignite-929
Commit: ca92f1f552c786c5506d287ca20bad2e2c20560c
Parents: bdc5e94 7828d19
Author: Anton <av...@gridgain.com>
Authored: Fri Jul 3 16:54:16 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Fri Jul 3 16:54:16 2015 +0300
----------------------------------------------------------------------
.../distributed/near/GridCachePartitionedFailoverSelfTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
[30/50] incubator-ignite git commit: GG-10469: Done.
Posted by sb...@apache.org.
GG-10469: Done.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96fa3002
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96fa3002
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96fa3002
Branch: refs/heads/ignite-929
Commit: 96fa3002904fcad50dafc1f19655c2d44eaece40
Parents: 96c9695
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Jul 7 18:07:05 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Jul 7 18:07:05 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/interop/InteropIgnition.java | 17 ++++++++++++++++-
.../ignite/internal/interop/InteropProcessor.java | 7 +++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96fa3002/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
index 2989a17..faae72b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
@@ -50,6 +50,9 @@ public class InteropIgnition {
*/
public static synchronized InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName,
int factoryId, long envPtr, long dataPtr) {
+ if (envPtr <= 0)
+ throw new IgniteException("Environment pointer must be positive.");
+
ClassLoader oldClsLdr = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(InteropIgnition.class.getClassLoader());
@@ -83,13 +86,25 @@ public class InteropIgnition {
* Get instance by environment pointer.
*
* @param gridName Grid name.
- * @return Instance or {@code null} if it doesn't exists (never started or stopped).
+ * @return Instance or {@code null} if it doesn't exist (never started or stopped).
*/
@Nullable public static synchronized InteropProcessor instance(@Nullable String gridName) {
return instances.get(gridName);
}
/**
+ * Get environment pointer of the given instance.
+ *
+ * @param gridName Grid name.
+ * @return Environment pointer or {@code 0} in case grid with such name doesn't exist.
+ */
+ public static synchronized long environmentPointer(@Nullable String gridName) {
+ InteropProcessor proc = instance(gridName);
+
+ return proc != null ? proc.environmentPointer() : 0;
+ }
+
+ /**
* Stop single instance.
*
* @param gridName Grid name,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96fa3002/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
index 325a464..94b733f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
@@ -32,6 +32,13 @@ public interface InteropProcessor {
public Ignite ignite();
/**
+ * Get environment pointer associated with this processor.
+ *
+ * @return Environment pointer.
+ */
+ public long environmentPointer();
+
+ /**
* Get stop runnable to perform cleanup when interop is not longer used.
* <p/>
* <b>NOTE!</b> This runnable is called when current instance of interop processor is eligible for garbage
[37/50] incubator-ignite git commit: #IGNITE-591 - Minor
Posted by sb...@apache.org.
#IGNITE-591 - Minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd01e4c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd01e4c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd01e4c3
Branch: refs/heads/ignite-929
Commit: cd01e4c39362e5c27fe749fcd1cf2788b50bcc3d
Parents: 9a51cdf
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue Jul 7 19:21:15 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue Jul 7 19:21:15 2015 -0700
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/GridCacheContext.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01e4c3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index c454da9..eb813c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -220,7 +220,6 @@ public class GridCacheContext<K, V> implements Externalizable {
* @param dataStructuresMgr Cache dataStructures manager.
* @param ttlMgr TTL manager.
* @param drMgr Data center replication manager.
- * @param jtaMgr JTA manager.
* @param rslvrMgr Conflict resolution manager.
* @param pluginMgr Cache plugin manager.
*/
[43/50] incubator-ignite git commit: Apache license added to
ignite-kafka modeule
Posted by sb...@apache.org.
Apache license added to ignite-kafka modeule
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cf479bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cf479bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cf479bc
Branch: refs/heads/ignite-929
Commit: 1cf479bca360f7381e38f7e1e8ec5e19511d0a33
Parents: 82f4992
Author: agura <ag...@gridgain.com>
Authored: Wed Jul 8 13:30:42 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Wed Jul 8 13:30:42 2015 +0300
----------------------------------------------------------------------
modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++++++++++++
1 file changed, 202 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cf479bc/modules/kafka/licenses/apache-2.0.txt
----------------------------------------------------------------------
diff --git a/modules/kafka/licenses/apache-2.0.txt b/modules/kafka/licenses/apache-2.0.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/modules/kafka/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
[48/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-591'
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-591'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23dc8fc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23dc8fc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23dc8fc8
Branch: refs/heads/ignite-929
Commit: 23dc8fc87352bdb38a0ff7d01dab048c22ceae77
Parents: 6d6ec77 cfeec2d
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Jul 8 15:57:06 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Jul 8 15:57:06 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 4 ++
.../configuration/TransactionConfiguration.java | 23 +++++++
.../processors/cache/GridCacheAttributes.java | 3 +
.../processors/cache/GridCacheContext.java | 8 +--
.../processors/cache/GridCacheProcessor.java | 21 +++---
.../cache/GridCacheSharedContext.java | 15 +++-
.../cache/jta/CacheJtaManagerAdapter.java | 17 +++--
.../cache/jta/CacheNoopJtaManager.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 11 ---
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
.../HibernateTransactionalDataRegion.java | 12 +++-
.../hibernate/HibernateL2CacheSelfTest.java | 7 +-
.../HibernateL2CacheTransactionalSelfTest.java | 5 --
.../apache/ignite/cache/jta/CacheTmLookup.java | 3 +-
.../processors/cache/jta/CacheJtaManager.java | 72 ++++++++++++++++++--
.../cache/jta/GridCacheXAResource.java | 16 ++---
.../processors/cache/GridCacheJtaSelfTest.java | 52 ++++++++++----
.../GridTmLookupLifecycleAwareSelfTest.java | 29 ++++++--
.../commands/cache/VisorCacheCommand.scala | 2 -
19 files changed, 211 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
[16/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-7' into ignite-sprint-7
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-7' into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4ff352f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ff352f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ff352f5
Branch: refs/heads/ignite-929
Commit: 4ff352f523e59f862e31dcfa0da5b894da55ac85
Parents: 335a7bb 8fc9e4e
Author: Anton <av...@gridgain.com>
Authored: Mon Jul 6 14:30:32 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Mon Jul 6 14:30:32 2015 +0300
----------------------------------------------------------------------
.../internal/interop/InteropIgnition.java | 31 +++++++++++++-------
1 file changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[08/50] incubator-ignite git commit: # IGNITE-591 Don't use static
ThreadLocal.
Posted by sb...@apache.org.
# IGNITE-591 Don't use static ThreadLocal.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/53143355
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/53143355
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/53143355
Branch: refs/heads/ignite-929
Commit: 53143355dc713f2af3308f5ceef9fcc6e3d3d2a1
Parents: bac6f48
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Jul 2 16:38:10 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Jul 2 16:38:10 2015 +0300
----------------------------------------------------------------------
.../processors/cache/jta/CacheJtaManager.java | 122 ++++++++++++-------
1 file changed, 77 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/53143355/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
index 2a078dc..c5a94bc 100644
--- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
+++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
@@ -17,23 +17,34 @@
package org.apache.ignite.internal.processors.cache.jta;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.jta.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.transaction.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.jta.CacheTmLookup;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.jetbrains.annotations.Nullable;
+
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import java.lang.ref.WeakReference;
+import java.util.Map;
+import java.util.WeakHashMap;
/**
* Implementation of {@link CacheJtaManagerAdapter}.
*/
public class CacheJtaManager extends CacheJtaManagerAdapter {
/** */
- private final static ThreadLocal<GridCacheXAResource> xaRsrc = new ThreadLocal<>();
+ private static final Map<TransactionManager, ThreadLocal<WeakReference<GridCacheXAResource>>> threadLocals =
+ new WeakHashMap<>();
+
+ /** */
+ private volatile TransactionManager jtaTm;
/** */
- private TransactionManager jtaTm;
+ private ThreadLocal<WeakReference<GridCacheXAResource>> xaRsrc;
/** */
private CacheTmLookup tmLookup;
@@ -54,55 +65,76 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
/** {@inheritDoc} */
@Override public void checkJta() throws IgniteCheckedException {
+ TransactionManager jtaTm = this.jtaTm;
+
if (jtaTm == null) {
try {
jtaTm = tmLookup.getTm();
+
+ if (jtaTm == null)
+ return;
+
+ synchronized (threadLocals) {
+ if (this.jtaTm != null)
+ jtaTm = this.jtaTm;
+ else {
+ xaRsrc = threadLocals.get(jtaTm);
+
+ if (xaRsrc == null) {
+ xaRsrc = new ThreadLocal<>();
+
+ threadLocals.put(jtaTm, xaRsrc);
+ }
+
+ this.jtaTm = jtaTm;
+ }
+ }
}
catch (Exception e) {
throw new IgniteCheckedException("Failed to get transaction manager: " + e, e);
}
}
- if (jtaTm != null) {
- GridCacheXAResource rsrc = xaRsrc.get();
-
- if (rsrc == null || rsrc.isFinished()) {
- try {
- Transaction jtaTx = jtaTm.getTransaction();
-
- if (jtaTx != null) {
- IgniteInternalTx tx = cctx.tm().userTx();
-
- if (tx == null) {
- TransactionConfiguration tCfg = cctx.kernalContext().config()
- .getTransactionConfiguration();
-
- tx = cctx.tm().newTx(
- /*implicit*/false,
- /*implicit single*/false,
- null,
- tCfg.getDefaultTxConcurrency(),
- tCfg.getDefaultTxIsolation(),
- tCfg.getDefaultTxTimeout(),
- /*store enabled*/true,
- /*tx size*/0
- );
- }
-
- rsrc = new GridCacheXAResource(tx, cctx.kernalContext());
+ WeakReference<GridCacheXAResource> rsrcRef = xaRsrc.get();
- if (!jtaTx.enlistResource(rsrc))
- throw new IgniteCheckedException("Failed to enlist XA resource to JTA user transaction.");
+ GridCacheXAResource rsrc = rsrcRef == null ? null : rsrcRef.get();
- xaRsrc.set(rsrc);
+ if (rsrc == null || rsrc.isFinished()) {
+ try {
+ Transaction jtaTx = jtaTm.getTransaction();
+
+ if (jtaTx != null) {
+ IgniteInternalTx tx = cctx.tm().userTx();
+
+ if (tx == null) {
+ TransactionConfiguration tCfg = cctx.kernalContext().config()
+ .getTransactionConfiguration();
+
+ tx = cctx.tm().newTx(
+ /*implicit*/false,
+ /*implicit single*/false,
+ null,
+ tCfg.getDefaultTxConcurrency(),
+ tCfg.getDefaultTxIsolation(),
+ tCfg.getDefaultTxTimeout(),
+ /*store enabled*/true,
+ /*tx size*/0
+ );
}
+
+ rsrc = new GridCacheXAResource(tx, cctx.kernalContext());
+
+ if (!jtaTx.enlistResource(rsrc))
+ throw new IgniteCheckedException("Failed to enlist XA resource to JTA user transaction.");
+
+ xaRsrc.set(new WeakReference<>(rsrc));
}
- catch (SystemException e) {
- throw new IgniteCheckedException("Failed to obtain JTA transaction.", e);
- }
- catch (RollbackException e) {
- throw new IgniteCheckedException("Failed to enlist XAResource to JTA transaction.", e);
- }
+ }
+ catch (SystemException e) {
+ throw new IgniteCheckedException("Failed to obtain JTA transaction.", e);
+ }
+ catch (RollbackException e) {
+ throw new IgniteCheckedException("Failed to enlist XAResource to JTA transaction.", e);
}
}
}
[21/50] incubator-ignite git commit: # minor format
Posted by sb...@apache.org.
# minor format
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2aa6ab5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2aa6ab5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2aa6ab5
Branch: refs/heads/ignite-929
Commit: f2aa6ab5a5e049e10bfec06142b3f734d0709996
Parents: b87f138
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 7 10:35:03 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 7 10:35:03 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheObjectImpl.java | 1 -
.../distributed/dht/GridPartitionedGetFuture.java | 13 ++++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2aa6ab5/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 ad033a7..96603f9 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
@@ -77,7 +77,6 @@ public class CacheObjectImpl extends CacheObjectAdapter {
catch (IgniteCheckedException e) {
throw new IgniteException("Failed to unmarshall object.", e);
}
-
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2aa6ab5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 2f41e63..79d5e75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -224,7 +224,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
* @param res Result.
*/
public void onResult(UUID nodeId, GridNearGetResponse res) {
- for (IgniteInternalFuture<Map<K, V>> fut : futures())
+ for (IgniteInternalFuture<Map<K, V>> fut : futures()) {
if (isMini(fut)) {
MiniFuture f = (MiniFuture)fut;
@@ -234,6 +234,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
f.onResult(res);
}
}
+ }
}
/** {@inheritDoc} */
@@ -702,8 +703,14 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
}
});
}
- else
- onDone(createResultMap(res.entries()));
+ else {
+ try {
+ onDone(createResultMap(res.entries()));
+ }
+ catch (Exception e) {
+ onDone(e);
+ }
+ }
}
/** {@inheritDoc} */
[49/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-929
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e5be0c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e5be0c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e5be0c3
Branch: refs/heads/ignite-929
Commit: 5e5be0c345aa094871059f00745a7a5bbf6d04e0
Parents: bf6fba8 23dc8fc
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 8 16:27:02 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 8 16:27:02 2015 +0300
----------------------------------------------------------------------
dev-tools/slurp.sh | 2 +-
modules/core/pom.xml | 4 +-
.../cache/eviction/fifo/FifoEvictionPolicy.java | 5 -
.../cache/eviction/lru/LruEvictionPolicy.java | 5 -
.../eviction/sorted/SortedEvictionPolicy.java | 19 +-
.../configuration/CacheConfiguration.java | 4 +
.../configuration/TransactionConfiguration.java | 23 +++
.../internal/interop/InteropIgnition.java | 17 +-
.../internal/interop/InteropProcessor.java | 7 +
.../processors/cache/CacheObjectImpl.java | 1 -
.../processors/cache/GridCacheAttributes.java | 3 +
.../processors/cache/GridCacheContext.java | 8 +-
.../processors/cache/GridCacheIoManager.java | 8 +-
.../processors/cache/GridCacheProcessor.java | 21 +-
.../cache/GridCacheSharedContext.java | 15 +-
.../dht/GridPartitionedGetFuture.java | 13 +-
.../distributed/near/GridNearGetFuture.java | 4 +-
.../cache/jta/CacheJtaManagerAdapter.java | 17 +-
.../cache/jta/CacheNoopJtaManager.java | 2 +-
.../cache/query/GridCacheQueryAdapter.java | 35 +++-
.../processors/query/GridQueryProcessor.java | 5 +
.../visor/cache/VisorCacheConfiguration.java | 11 -
.../ignite/spi/discovery/tcp/ServerImpl.java | 46 +++++
.../tcp/internal/TcpDiscoveryNode.java | 2 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 8 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 10 +-
.../cache/CacheFutureExceptionSelfTest.java | 158 +++++++++++++++
.../GridCachePartitionedNodeRestartTest.java | 5 -
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
.../GridCacheReplicatedFailoverSelfTest.java | 5 -
.../GridCacheReplicatedNodeRestartSelfTest.java | 5 -
...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +-
...heConcurrentEvictionConsistencySelfTest.java | 15 +-
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../IgniteSpiDiscoverySelfTestSuite.java | 3 +
.../HibernateTransactionalDataRegion.java | 12 +-
.../hibernate/HibernateL2CacheSelfTest.java | 7 +-
.../HibernateL2CacheTransactionalSelfTest.java | 5 -
.../CacheAbstractQueryMetricsSelfTest.java | 157 +++++++++++++-
.../cache/CacheLocalQueryMetricsSelfTest.java | 33 +++
...titionedQueryMetricsDistributedSelfTest.java | 33 +++
...chePartitionedQueryMetricsLocalSelfTest.java | 33 +++
.../CachePartitionedQueryMetricsSelfTest.java | 32 ---
...plicatedQueryMetricsDistributedSelfTest.java | 33 +++
...acheReplicatedQueryMetricsLocalSelfTest.java | 33 +++
.../CacheReplicatedQueryMetricsSelfTest.java | 32 ---
.../IgniteCacheQuerySelfTestSuite.java | 7 +-
.../apache/ignite/cache/jta/CacheTmLookup.java | 3 +-
.../processors/cache/jta/CacheJtaManager.java | 72 ++++++-
.../cache/jta/GridCacheXAResource.java | 16 +-
.../processors/cache/GridCacheJtaSelfTest.java | 52 +++--
.../GridTmLookupLifecycleAwareSelfTest.java | 29 ++-
modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++
modules/mesos/pom.xml | 1 -
modules/rest-http/pom.xml | 14 +-
modules/urideploy/pom.xml | 8 +-
.../commands/cache/VisorCacheCommand.scala | 2 -
modules/web/pom.xml | 6 +-
.../config/benchmark-put-indexed-val.properties | 64 ++++++
modules/yardstick/config/ignite-base-config.xml | 23 +++
.../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++
.../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++
.../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++
.../ignite/yardstick/cache/model/Person1.java | 55 +++++
.../ignite/yardstick/cache/model/Person2.java | 67 ++++++
.../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++
parent/pom.xml | 1 +
scripts/git-patch-prop.sh | 2 +-
70 files changed, 1562 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e5be0c3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
[02/50] incubator-ignite git commit: Merge branch 'ignite-1.0.0-b'
Posted by sb...@apache.org.
Merge branch 'ignite-1.0.0-b'
Conflicts:
examples/pom-standalone.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/825e2fe4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/825e2fe4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/825e2fe4
Branch: refs/heads/ignite-929
Commit: 825e2fe4cadf40acaf3d7a9dc1bdbbd36811285f
Parents: b92f1cd 5fc2cd0
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon Mar 30 23:41:24 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon Mar 30 23:41:24 2015 -0700
----------------------------------------------------------------------
DEVNOTES.txt | 20 +-
LICENSE.txt | 75 +-
NOTICE.txt | 28 +-
RELEASE_NOTES.txt | 20 +-
assembly/dependencies-fabric.xml | 4 +-
assembly/dependencies-hadoop.xml | 13 +-
assembly/dependencies-optional-fabric.xml | 3 +-
assembly/dependencies-optional-hadoop.xml | 3 +-
assembly/dependencies-visor-console.xml | 5 +
assembly/libs/README.txt | 119 +
assembly/libs/readme.txt | 120 -
assembly/release-fabric.xml | 3 +
bin/ignite-schema-import.bat | 40 +-
bin/ignite-schema-import.sh | 33 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/igniteservice.exe | Bin 6144 -> 0 bytes
config/fabric/default-config.xml | 50 +-
examples/README.txt | 25 +
examples/config/example-cache.xml | 105 +-
examples/config/example-compute.xml | 70 -
examples/config/example-ignite.xml | 83 +
examples/config/example-streamer.xml | 293 --
examples/config/filesystem/README.txt | 8 +
examples/config/filesystem/example-igfs.xml | 14 +-
examples/config/filesystem/readme.txt | 8 -
examples/config/hibernate/README.txt | 8 +
.../hibernate/example-hibernate-L2-cache.xml | 3 -
examples/config/hibernate/readme.txt | 8 -
examples/config/servlet/README.txt | 8 +
examples/config/servlet/WEB-INF/web.xml | 2 +-
examples/config/servlet/readme.txt | 8 -
examples/config/store/example-database.script | 27 -
.../config/store/example-jdbc-pojo-store.xml | 142 -
examples/memcached/memcached-example.php | 93 +
examples/pom-standalone.xml | 22 +-
examples/pom.xml | 82 +
examples/rest/http-rest-example.php | 15 +-
examples/rest/memcache-rest-example.php | 92 -
examples/schema-import/README.txt | 38 +
examples/schema-import/bin/db-init.sql | 10 +
examples/schema-import/bin/h2-server.bat | 80 +
examples/schema-import/bin/h2-server.sh | 66 +
.../schema-import/bin/schema-import.properties | 28 +
examples/schema-import/pom.xml | 91 +
.../org/apache/ignite/schema/CacheConfig.java | 38 +
.../java/org/apache/ignite/schema/Demo.java | 145 +
.../java/org/apache/ignite/schema/DemoNode.java | 37 +
.../java/org/apache/ignite/schema/Person.java | 45 +
.../org/apache/ignite/schema/PersonKey.java | 38 +
.../ignite/examples/ComputeNodeStartup.java | 35 -
.../ignite/examples/ExampleNodeStartup.java | 35 +
.../apache/ignite/examples/ExamplesUtils.java | 67 +-
.../computegrid/ComputeAsyncExample.java | 74 +
.../computegrid/ComputeBroadcastExample.java | 8 +-
.../computegrid/ComputeCallableExample.java | 8 +-
.../computegrid/ComputeClosureExample.java | 8 +-
.../ComputeClusterGroupsExample.java | 93 -
.../ComputeContinuousMapperExample.java | 10 +-
.../ComputeExecutorServiceExample.java | 71 -
.../ComputeFibonacciContinuationExample.java | 10 +-
.../computegrid/ComputeReducerExample.java | 8 +-
.../computegrid/ComputeRunnableExample.java | 23 +-
.../computegrid/ComputeScheduleExample.java | 81 -
.../computegrid/ComputeTaskMapExample.java | 8 +-
.../computegrid/ComputeTaskSplitExample.java | 8 +-
.../cluster/ClusterGroupExample.java | 93 +
.../computegrid/cluster/package-info.java | 22 +
.../computegrid/failover/package-info.java | 22 +
.../examples/computegrid/failover/package.html | 24 -
.../montecarlo/CreditRiskExample.java | 8 +-
.../computegrid/montecarlo/package-info.java | 22 +
.../computegrid/montecarlo/package.html | 24 -
.../examples/computegrid/package-info.java | 22 +
.../ignite/examples/computegrid/package.html | 24 -
.../examples/datagrid/CacheAffinityExample.java | 37 +-
.../examples/datagrid/CacheApiExample.java | 55 +-
.../examples/datagrid/CacheAsyncApiExample.java | 86 +
.../datagrid/CacheContinuousQueryExample.java | 101 +-
.../datagrid/CacheDataStreamerExample.java | 47 +-
.../examples/datagrid/CacheEventsExample.java | 77 +-
.../examples/datagrid/CacheNodeStartup.java | 35 -
.../datagrid/CachePopularNumbersExample.java | 161 -
.../examples/datagrid/CachePutGetExample.java | 42 +-
.../examples/datagrid/CacheQueryExample.java | 239 +-
.../datagrid/CacheTransactionExample.java | 65 +-
.../hibernate/HibernateL2CacheExample.java | 135 +-
.../HibernateL2CacheExampleNodeStartup.java | 97 -
.../datagrid/hibernate/package-info.java | 22 +
.../examples/datagrid/hibernate/package.html | 24 -
.../ignite/examples/datagrid/package-info.java | 22 +
.../ignite/examples/datagrid/package.html | 24 -
.../starschema/CacheStarSchemaExample.java | 89 +-
.../datagrid/starschema/DimProduct.java | 2 +-
.../examples/datagrid/starschema/DimStore.java | 2 +-
.../datagrid/starschema/FactPurchase.java | 2 +-
.../datagrid/starschema/package-info.java | 22 +
.../examples/datagrid/starschema/package.html | 24 -
.../store/CacheNodeWithStoreStartup.java | 121 -
.../datagrid/store/CacheStoreExample.java | 88 -
.../store/CacheStoreLoadDataExample.java | 73 -
.../ignite/examples/datagrid/store/Person.java | 155 +
.../store/auto/CacheAutoStoreExample.java | 86 +
.../auto/CacheAutoStoreLoadDataExample.java | 78 +
.../datagrid/store/auto/CacheConfig.java | 80 +
.../datagrid/store/auto/DbH2ServerStartup.java | 78 +
.../datagrid/store/auto/package-info.java | 22 +
.../store/dummy/CacheDummyPersonStore.java | 11 +-
.../store/dummy/CacheDummyStoreExample.java | 127 +
.../datagrid/store/dummy/package-info.java | 22 +
.../examples/datagrid/store/dummy/package.html | 24 -
.../hibernate/CacheHibernatePersonStore.java | 48 +-
.../hibernate/CacheHibernateStoreExample.java | 130 +
.../datagrid/store/hibernate/Person.hbm.xml | 2 +-
.../datagrid/store/hibernate/package-info.java | 22 +
.../datagrid/store/hibernate/package.html | 24 -
.../store/jdbc/CacheJdbcPersonStore.java | 4 +-
.../store/jdbc/CacheJdbcPojoPersonStore.java | 96 -
.../store/jdbc/CacheJdbcStoreExample.java | 130 +
.../datagrid/store/jdbc/package-info.java | 22 +
.../examples/datagrid/store/jdbc/package.html | 24 -
.../examples/datagrid/store/model/Person.java | 155 -
.../datagrid/store/model/PersonKey.java | 97 -
.../examples/datagrid/store/package-info.java | 22 +
.../ignite/examples/datagrid/store/package.html | 24 -
.../datastructures/IgniteAtomicLongExample.java | 10 +-
.../IgniteAtomicReferenceExample.java | 10 +-
.../IgniteAtomicSequenceExample.java | 10 +-
.../IgniteAtomicStampedExample.java | 10 +-
.../IgniteCountDownLatchExample.java | 10 +-
.../IgniteExecutorServiceExample.java | 71 +
.../datastructures/IgniteQueueExample.java | 33 +-
.../datastructures/IgniteSetExample.java | 33 +-
.../examples/datastructures/package-info.java | 22 +
.../ignite/examples/datastructures/package.html | 24 -
.../ignite/examples/events/EventsExample.java | 10 +-
.../ignite/examples/events/package-info.java | 22 +
.../apache/ignite/examples/events/package.html | 24 -
.../ignite/examples/igfs/package-info.java | 22 +
.../apache/ignite/examples/igfs/package.html | 24 -
.../examples/messaging/MessagingExample.java | 8 +-
.../messaging/MessagingPingPongExample.java | 56 +-
.../MessagingPingPongListenActorExample.java | 8 +-
.../ignite/examples/messaging/package-info.java | 22 +
.../ignite/examples/messaging/package.html | 24 -
.../client/memcache/MemcacheRestExample.java | 2 +-
.../MemcacheRestExampleNodeStartup.java | 7 -
.../misc/client/memcache/package-info.java | 22 +
.../examples/misc/client/memcache/package.html | 24 -
.../examples/misc/client/package-info.java | 22 +
.../ignite/examples/misc/client/package.html | 24 -
.../misc/deployment/DeploymentExample.java | 8 +-
.../examples/misc/deployment/package-info.java | 22 +
.../examples/misc/deployment/package.html | 24 -
.../examples/misc/lifecycle/package-info.java | 22 +
.../ignite/examples/misc/lifecycle/package.html | 24 -
.../ignite/examples/misc/package-info.java | 22 +
.../apache/ignite/examples/misc/package.html | 24 -
.../misc/schedule/ComputeScheduleExample.java | 81 +
.../examples/misc/schedule/package-info.java | 22 +
.../misc/springbean/SpringBeanExample.java | 6 +-
.../examples/misc/springbean/package-info.java | 22 +
.../examples/misc/springbean/package.html | 24 -
.../apache/ignite/examples/package-info.java | 22 +
.../org/apache/ignite/examples/package.html | 24 -
.../examples/servicegrid/ServicesExample.java | 21 +-
.../servicegrid/SimpleMapServiceImpl.java | 32 +-
.../examples/servicegrid/package-info.java | 22 +
.../streaming/StreamingCheckInExample.java | 580 ---
.../streaming/StreamingNodeStartup.java | 35 -
.../StreamingPopularNumbersExample.java | 250 --
.../streaming/StreamingPriceBarsExample.java | 451 ---
.../StreamingRunningAverageExample.java | 247 --
.../streaming/marketdata/CacheConfig.java | 44 +
.../streaming/marketdata/Instrument.java | 106 +
.../marketdata/QueryTopInstruments.java | 73 +
.../streaming/marketdata/StreamMarketData.java | 103 +
.../examples/streaming/numbers/CacheConfig.java | 46 +
.../streaming/numbers/QueryPopularNumbers.java | 74 +
.../streaming/numbers/StreamRandomNumbers.java | 78 +
.../ignite/examples/streaming/package-info.java | 22 +
.../ignite/examples/streaming/package.html | 24 -
.../apache/ignite/examples/ComputeExample.java | 57 -
.../ignite/examples/MessagingExample.java | 162 -
.../java8/cluster/ClusterGroupExample.java | 82 +
.../examples/java8/cluster/package-info.java | 22 +
.../java8/computegrid/ComputeAsyncExample.java | 71 +
.../computegrid/ComputeBroadcastExample.java | 101 +
.../computegrid/ComputeCallableExample.java | 73 +
.../computegrid/ComputeClosureExample.java | 69 +
.../computegrid/ComputeRunnableExample.java | 63 +
.../java8/computegrid/package-info.java | 22 +
.../java8/datagrid/CacheAffinityExample.java | 131 +
.../java8/datagrid/CacheApiExample.java | 103 +
.../java8/datagrid/CacheAsyncApiExample.java | 82 +
.../examples/java8/datagrid/package-info.java | 22 +
.../IgniteExecutorServiceExample.java | 69 +
.../java8/datastructures/package-info.java | 22 +
.../examples/java8/events/EventsExample.java | 132 +
.../examples/java8/events/package-info.java | 22 +
.../java8/messaging/MessagingExample.java | 163 +
.../messaging/MessagingPingPongExample.java | 111 +
.../examples/java8/messaging/package-info.java | 22 +
.../misc/schedule/ComputeScheduleExample.java | 66 +
.../java8/misc/schedule/package-info.java | 22 +
.../ignite/examples/java8/package-info.java | 23 +
.../java8/streaming/marketdata/CacheConfig.java | 44 +
.../java8/streaming/marketdata/Instrument.java | 106 +
.../marketdata/QueryTopInstruments.java | 73 +
.../streaming/marketdata/StreamMarketData.java | 101 +
.../java8/streaming/numbers/CacheConfig.java | 46 +
.../streaming/numbers/QueryPopularNumbers.java | 74 +
.../streaming/numbers/StreamRandomNumbers.java | 74 +
.../examples/java8/streaming/package-info.java | 22 +
.../examples/ScalarCacheAffinityExample.scala | 115 +
.../examples/ScalarCacheAffinityExample1.scala | 121 -
.../examples/ScalarCacheAffinityExample2.scala | 116 -
.../ScalarCacheAffinitySimpleExample.scala | 83 -
.../scalar/examples/ScalarCacheExample.scala | 29 +-
.../ScalarCachePopularNumbersExample.scala | 94 +-
.../examples/ScalarCacheQueryExample.scala | 45 +-
.../scalar/examples/ScalarClosureExample.scala | 9 +-
.../examples/ScalarContinuationExample.scala | 11 +-
.../examples/ScalarCreditRiskExample.scala | 9 +-
.../scalar/examples/ScalarJvmCloudExample.scala | 2 +-
.../examples/ScalarPiCalculationExample.scala | 55 -
.../scalar/examples/ScalarPingPongExample.scala | 9 +-
.../scalar/examples/ScalarPrimeExample.scala | 8 +-
.../scalar/examples/ScalarScheduleExample.scala | 9 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 86 +-
.../scalar/examples/ScalarTaskExample.scala | 9 +-
.../examples/ScalarWorldShortestMapReduce.scala | 9 +-
.../ignite/examples/BasicExamplesSelfTest.java | 3 +-
.../CacheExamplesMultiNodeSelfTest.java | 12 +-
.../ignite/examples/CacheExamplesSelfTest.java | 20 +-
...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 -
.../examples/ClusterGroupExampleSelfTest.java | 39 +
.../ComputeClusterGroupsExampleSelfTest.java | 39 -
...ibernateL2CacheExampleMultiNodeSelfTest.java | 2 +-
.../examples/MessagingExamplesSelfTest.java | 5 +-
.../testsuites/IgniteExamplesSelfTestSuite.java | 3 +-
.../BasicExamplesMultiNodeSelfTest.java | 28 +
.../java8/examples/BasicExamplesSelfTest.java | 83 +
.../CacheExamplesMultiNodeSelfTest.java | 38 +
.../java8/examples/CacheExamplesSelfTest.java | 141 +
.../examples/CheckpointExamplesSelfTest.java | 45 +
.../examples/ClusterGroupExampleSelfTest.java | 39 +
.../ContinuationExamplesMultiNodeSelfTest.java | 28 +
.../examples/ContinuationExamplesSelfTest.java | 33 +
...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 +
.../ContinuousMapperExamplesSelfTest.java | 33 +
.../DeploymentExamplesMultiNodeSelfTest.java | 30 +
.../examples/DeploymentExamplesSelfTest.java | 33 +
.../EventsExamplesMultiNodeSelfTest.java | 28 +
.../java8/examples/EventsExamplesSelfTest.java | 33 +
...ibernateL2CacheExampleMultiNodeSelfTest.java | 29 +
.../HibernateL2CacheExampleSelfTest.java | 33 +
.../java8/examples/IgfsExamplesSelfTest.java | 51 +
.../examples/LifecycleExamplesSelfTest.java | 33 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 31 +
.../examples/MemcacheRestExamplesSelfTest.java | 41 +
.../examples/MessagingExamplesSelfTest.java | 53 +
.../MonteCarloExamplesMultiNodeSelfTest.java | 28 +
.../examples/MonteCarloExamplesSelfTest.java | 74 +
.../examples/SpringBeanExamplesSelfTest.java | 33 +
.../examples/TaskExamplesMultiNodeSelfTest.java | 28 +
.../java8/examples/TaskExamplesSelfTest.java | 40 +
.../IgniteExamplesJ8SelfTestSuite.java | 73 +
.../tests/examples/ScalarExamplesSelfTest.scala | 17 +-
ipc/README.txt | 4 +
ipc/readme.txt | 4 -
ipc/shmem/README.txt | 37 +
ipc/shmem/readme.txt | 37 -
modules/aop/README.txt | 33 +
modules/aop/readme.txt | 33 -
.../gridify/aop/aspectj/package-info.java | 22 +
.../compute/gridify/aop/aspectj/package.html | 24 -
.../gridify/aop/spring/package-info.java | 22 +
.../compute/gridify/aop/spring/package.html | 25 -
.../apache/ignite/gridify/AbstractAopTest.java | 6 +-
.../ignite/gridify/hierarchy/package-info.java | 22 +
.../ignite/gridify/hierarchy/package.html | 25 -
.../org/apache/ignite/gridify/package-info.java | 22 +
.../java/org/apache/ignite/gridify/package.html | 25 -
.../direct/singlesplit/package-info.java | 22 +
.../loadtests/direct/singlesplit/package.html | 24 -
.../java/org/test/gridify/package-info.java | 22 +
.../src/test/java/org/test/gridify/package.html | 24 -
modules/aws/README.txt | 32 +
modules/aws/readme.txt | 32 -
.../ignite/spi/checkpoint/s3/package-info.java | 22 +
.../ignite/spi/checkpoint/s3/package.html | 24 -
.../discovery/tcp/ipfinder/s3/package-info.java | 22 +
.../spi/discovery/tcp/ipfinder/s3/package.html | 24 -
.../ignite/spi/checkpoint/s3/package-info.java | 22 +
.../ignite/spi/checkpoint/s3/package.html | 24 -
.../discovery/tcp/ipfinder/s3/package-info.java | 22 +
.../spi/discovery/tcp/ipfinder/s3/package.html | 24 -
.../ClientAbstractMultiThreadedSelfTest.java | 194 +-
.../client/ClientDefaultCacheSelfTest.java | 48 -
.../client/ClientTopologyCacheSelfTest.java | 288 --
.../ClientAbstractMultiNodeSelfTest.java | 284 +-
.../integration/ClientAbstractSelfTest.java | 835 +---
.../client/suite/IgniteClientTestSuite.java | 2 -
.../rest/AbstractRestProcessorSelfTest.java | 4 +-
.../JettyRestProcessorAbstractSelfTest.java | 9 +-
.../rest/RestBinaryProtocolSelfTest.java | 74 +-
.../rest/RestMemcacheProtocolSelfTest.java | 80 +-
.../processors/rest/RestProcessorTest.java | 3 +-
.../rest/TaskCommandHandlerSelfTest.java | 4 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 17 +-
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 5 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 20 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 13 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 7 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 9 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 9 +-
.../loadtests/client/ClientTcpSslLoadTest.java | 4 +-
.../clients/src/test/resources/spring-cache.xml | 19 +-
.../src/test/resources/spring-server-node.xml | 13 +-
.../test/resources/spring-server-ssl-node.xml | 10 +-
modules/codegen/pom.xml | 6 +
.../ignite/codegen/MessageCodeGenerator.java | 11 +
.../core/licenses/pcollections-mit-license.txt | 19 -
modules/core/pom.xml | 129 +-
.../META-INF/native/linux64/libigniteshmem.so | Bin 138345 -> 0 bytes
.../META-INF/native/osx/libigniteshmem.dylib | Bin 33116 -> 0 bytes
.../src/main/java/com/romix/scala/None.java | 27 -
.../src/main/java/com/romix/scala/Option.java | 42 -
.../src/main/java/com/romix/scala/Some.java | 38 -
.../scala/collection/concurrent/BasicNode.java | 32 -
.../scala/collection/concurrent/CNodeBase.java | 49 -
.../romix/scala/collection/concurrent/Gen.java | 29 -
.../scala/collection/concurrent/INodeBase.java | 47 -
.../scala/collection/concurrent/ListMap.java | 247 --
.../scala/collection/concurrent/MainNode.java | 51 -
.../romix/scala/collection/concurrent/Pair.java | 54 -
.../scala/collection/concurrent/TrieMap.java | 1826 ---------
.../src/main/java/org/apache/ignite/Ignite.java | 175 +-
.../java/org/apache/ignite/IgniteCache.java | 203 +-
.../java/org/apache/ignite/IgniteCluster.java | 8 +-
.../java/org/apache/ignite/IgniteCompute.java | 165 +-
.../org/apache/ignite/IgniteDataStreamer.java | 91 +-
.../java/org/apache/ignite/IgniteEvents.java | 60 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 13 +-
.../java/org/apache/ignite/IgniteMessaging.java | 56 +-
.../java/org/apache/ignite/IgniteQueue.java | 4 +-
.../java/org/apache/ignite/IgniteServices.java | 40 +-
.../main/java/org/apache/ignite/IgniteSet.java | 2 +-
.../java/org/apache/ignite/IgniteStreamer.java | 154 -
.../apache/ignite/IgniteSystemProperties.java | 12 +
.../org/apache/ignite/IgniteTransactions.java | 26 +-
.../main/java/org/apache/ignite/Ignition.java | 58 +-
.../ignite/cache/CacheDistributionMode.java | 69 -
.../CacheEntryEventSerializableFilter.java | 28 +
.../ignite/cache/CacheEntryProcessor.java | 28 +
.../ignite/cache/CacheExistsException.java | 52 +
.../apache/ignite/cache/CacheInterceptor.java | 8 +-
.../ignite/cache/CacheInterceptorAdapter.java | 3 +
.../org/apache/ignite/cache/CacheManager.java | 406 +-
.../apache/ignite/cache/CacheMemoryMode.java | 6 +-
.../java/org/apache/ignite/cache/CacheMode.java | 8 +-
.../apache/ignite/cache/CacheRebalanceMode.java | 3 +-
.../cache/CacheServerNotFoundException.java | 49 +
.../ignite/cache/CacheTypeFieldMetadata.java | 7 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 12 +-
.../apache/ignite/cache/CachingProvider.java | 155 +-
.../java/org/apache/ignite/cache/GridCache.java | 221 -
.../ignite/cache/IgniteEntryProcessor.java | 28 -
.../apache/ignite/cache/IgniteImmutable.java | 45 -
.../apache/ignite/cache/affinity/Affinity.java | 219 +
.../affinity/AffinityCentralizedFunction.java | 31 +
.../ignite/cache/affinity/AffinityFunction.java | 110 +
.../cache/affinity/AffinityFunctionContext.java | 72 +
.../ignite/cache/affinity/AffinityKey.java | 189 +
.../cache/affinity/AffinityKeyMapped.java | 110 +
.../cache/affinity/AffinityKeyMapper.java | 62 +
.../AffinityNodeAddressHashResolver.java | 39 +
.../affinity/AffinityNodeHashResolver.java | 43 +
.../affinity/AffinityNodeIdHashResolver.java | 40 +
.../ignite/cache/affinity/CacheAffinity.java | 256 --
.../cache/affinity/CacheAffinityFunction.java | 110 -
.../affinity/CacheAffinityFunctionContext.java | 71 -
.../ignite/cache/affinity/CacheAffinityKey.java | 189 -
.../cache/affinity/CacheAffinityKeyMapped.java | 156 -
.../cache/affinity/CacheAffinityKeyMapper.java | 62 -
.../CacheAffinityNodeAddressHashResolver.java | 39 -
.../affinity/CacheAffinityNodeHashResolver.java | 43 -
.../CacheAffinityNodeIdHashResolver.java | 40 -
.../CacheCentralizedAffinityFunction.java | 31 -
.../fair/CachePartitionFairAffinity.java | 804 ----
.../affinity/fair/FairAffinityFunction.java | 777 ++++
.../cache/affinity/fair/package-info.java | 21 +
.../ignite/cache/affinity/fair/package.html | 24 -
.../ignite/cache/affinity/package-info.java | 21 +
.../apache/ignite/cache/affinity/package.html | 24 -
.../CacheRendezvousAffinityFunction.java | 501 ---
.../rendezvous/RendezvousAffinityFunction.java | 500 +++
.../cache/affinity/rendezvous/package-info.java | 21 +
.../cache/affinity/rendezvous/package.html | 24 -
.../cache/eviction/CacheEvictionFilter.java | 40 -
.../cache/eviction/CacheEvictionPolicy.java | 51 -
.../ignite/cache/eviction/EvictableEntry.java | 2 +-
.../ignite/cache/eviction/EvictionFilter.java | 43 +
.../ignite/cache/eviction/EvictionPolicy.java | 54 +
.../eviction/fifo/CacheFifoEvictionPolicy.java | 178 -
.../fifo/CacheFifoEvictionPolicyMBean.java | 50 -
.../cache/eviction/fifo/FifoEvictionPolicy.java | 191 +
.../eviction/fifo/FifoEvictionPolicyMBean.java | 50 +
.../cache/eviction/fifo/package-info.java | 21 +
.../ignite/cache/eviction/fifo/package.html | 24 -
.../eviction/igfs/CacheIgfsEvictionFilter.java | 35 -
.../CacheIgfsPerBlockLruEvictionPolicy.java | 358 --
...acheIgfsPerBlockLruEvictionPolicyMXBean.java | 93 -
.../cache/eviction/igfs/IgfsEvictionFilter.java | 38 +
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 376 ++
.../IgfsPerBlockLruEvictionPolicyMXBean.java | 93 +
.../cache/eviction/igfs/package-info.java | 21 +
.../ignite/cache/eviction/igfs/package.html | 24 -
.../eviction/lru/CacheLruEvictionPolicy.java | 185 -
.../lru/CacheLruEvictionPolicyMBean.java | 50 -
.../cache/eviction/lru/LruEvictionPolicy.java | 198 +
.../eviction/lru/LruEvictionPolicyMBean.java | 50 +
.../ignite/cache/eviction/lru/package-info.java | 21 +
.../ignite/cache/eviction/lru/package.html | 24 -
.../ignite/cache/eviction/package-info.java | 21 +
.../apache/ignite/cache/eviction/package.html | 24 -
.../random/CacheRandomEvictionPolicy.java | 101 -
.../random/CacheRandomEvictionPolicyMBean.java | 42 -
.../eviction/random/RandomEvictionPolicy.java | 114 +
.../random/RandomEvictionPolicyMBean.java | 42 +
.../cache/eviction/random/package-info.java | 21 +
.../ignite/cache/eviction/random/package.html | 24 -
.../org/apache/ignite/cache/package-info.java | 22 +
.../java/org/apache/ignite/cache/package.html | 24 -
.../ignite/cache/query/ContinuousQuery.java | 106 +-
.../org/apache/ignite/cache/query/Query.java | 102 +-
.../apache/ignite/cache/query/QueryMetrics.java | 4 +-
.../ignite/cache/query/QueryTypeResolver.java | 32 -
.../apache/ignite/cache/query/ScanQuery.java | 28 +-
.../org/apache/ignite/cache/query/SpiQuery.java | 17 +-
.../ignite/cache/query/SqlFieldsQuery.java | 17 +-
.../org/apache/ignite/cache/query/SqlQuery.java | 30 +-
.../apache/ignite/cache/query/TextQuery.java | 28 +-
.../query/annotations/QuerySqlFunction.java | 4 +-
.../cache/query/annotations/package-info.java | 22 +
.../apache/ignite/cache/query/package-info.java | 21 +
.../org/apache/ignite/cache/query/package.html | 24 -
.../cache/store/CacheLoadOnlyStoreAdapter.java | 10 +-
.../apache/ignite/cache/store/CacheStore.java | 6 +-
.../ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../ignite/cache/store/CacheStoreSession.java | 2 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 246 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 8 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 10 +-
.../store/jdbc/dialect/BasicJdbcDialect.java | 6 +-
.../cache/store/jdbc/dialect/DB2Dialect.java | 2 +-
.../cache/store/jdbc/dialect/JdbcDialect.java | 2 +-
.../store/jdbc/dialect/SQLServerDialect.java | 2 +-
.../cache/store/jdbc/dialect/package-info.java | 21 +
.../cache/store/jdbc/dialect/package.html | 24 -
.../ignite/cache/store/jdbc/package-info.java | 22 +
.../apache/ignite/cache/store/jdbc/package.html | 24 -
.../apache/ignite/cache/store/package-info.java | 22 +
.../org/apache/ignite/cache/store/package.html | 24 -
.../org/apache/ignite/cluster/ClusterGroup.java | 215 +-
.../org/apache/ignite/cluster/ClusterNode.java | 49 +-
.../cluster/ClusterTopologyException.java | 2 +-
.../org/apache/ignite/cluster/package-info.java | 22 +
.../org/apache/ignite/compute/ComputeJob.java | 3 +-
.../ignite/compute/ComputeJobAdapter.java | 2 +-
.../compute/gridify/aop/package-info.java | 22 +
.../ignite/compute/gridify/aop/package.html | 24 -
.../ignite/compute/gridify/package-info.java | 22 +
.../apache/ignite/compute/gridify/package.html | 24 -
.../org/apache/ignite/compute/package-info.java | 22 +
.../java/org/apache/ignite/compute/package.html | 24 -
.../configuration/CacheConfiguration.java | 490 +--
.../configuration/CacheQueryConfiguration.java | 182 -
.../configuration/IgniteConfiguration.java | 221 +-
.../configuration/IgniteReflectionFactory.java | 216 +
.../configuration/NearCacheConfiguration.java | 95 +
.../configuration/QueryConfiguration.java | 227 --
.../ignite/configuration/package-info.java | 22 +
.../org/apache/ignite/events/CacheEvent.java | 25 +-
.../ignite/events/CacheQueryExecutedEvent.java | 10 +-
.../ignite/events/CacheQueryReadEvent.java | 10 +-
.../ignite/events/CacheRebalancingEvent.java | 26 +-
.../org/apache/ignite/events/EventType.java | 156 +-
.../org/apache/ignite/events/package-info.java | 22 +
.../java/org/apache/ignite/events/package.html | 24 -
.../igfs/IgfsIpcEndpointConfiguration.java | 20 +-
.../apache/ignite/igfs/IgfsIpcEndpointType.java | 2 +-
.../ignite/igfs/mapreduce/package-info.java | 22 +
.../apache/ignite/igfs/mapreduce/package.html | 24 -
.../igfs/mapreduce/records/package-info.java | 22 +
.../ignite/igfs/mapreduce/records/package.html | 24 -
.../org/apache/ignite/igfs/package-info.java | 22 +
.../java/org/apache/ignite/igfs/package.html | 24 -
.../ignite/igfs/secondary/package-info.java | 22 +
.../apache/ignite/igfs/secondary/package.html | 24 -
.../apache/ignite/internal/GridComponent.java | 9 +-
.../internal/GridEventConsumeHandler.java | 18 +-
.../ignite/internal/GridKernalContext.java | 8 -
.../ignite/internal/GridKernalContextImpl.java | 33 +-
.../ignite/internal/GridKernalGateway.java | 5 +
.../ignite/internal/GridKernalGatewayImpl.java | 8 +
.../apache/ignite/internal/GridKernalState.java | 2 +-
.../internal/GridMessageListenHandler.java | 9 +-
.../internal/GridNodeOrderComparator.java | 10 +
.../ignite/internal/GridPluginComponent.java | 2 +-
.../ignite/internal/IgniteComponentType.java | 11 +-
.../org/apache/ignite/internal/IgniteEx.java | 10 +-
.../apache/ignite/internal/IgniteKernal.java | 208 +-
.../ignite/internal/IgniteNodeAttributes.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 289 +-
.../internal/MarshallerContextAdapter.java | 7 +-
.../ignite/internal/MarshallerContextImpl.java | 46 +-
.../internal/client/GridClientCacheFlag.java | 2 +-
.../client/GridClientPartitionAffinity.java | 8 +-
.../router/impl/GridRouterClientImpl.java | 2 +-
.../impl/GridRouterCommandLineStartup.java | 4 +-
.../internal/cluster/ClusterGroupAdapter.java | 130 +-
.../ignite/internal/cluster/ClusterGroupEx.java | 6 +-
.../cluster/ClusterNodeLocalMapImpl.java | 2 +-
.../ClusterTopologyServerNotFoundException.java | 40 +
.../cluster/IgniteClusterAsyncImpl.java | 15 +-
.../internal/cluster/IgniteClusterImpl.java | 8 +-
.../internal/events/DiscoveryCustomEvent.java | 18 +
.../ignite/internal/executor/package-info.java | 22 +
.../ignite/internal/executor/package.html | 24 -
.../ignite/internal/igfs/common/IgfsLogger.java | 6 +-
.../internal/igfs/common/package-info.java | 22 +
.../ignite/internal/igfs/common/package.html | 24 -
.../internal/managers/GridManagerAdapter.java | 8 +-
.../checkpoint/GridCheckpointManager.java | 4 +-
.../managers/checkpoint/package-info.java | 22 +
.../internal/managers/checkpoint/package.html | 24 -
.../managers/collision/package-info.java | 22 +
.../internal/managers/collision/package.html | 24 -
.../managers/communication/GridIoManager.java | 19 +-
.../communication/GridIoMessageFactory.java | 50 +-
.../managers/communication/package-info.java | 22 +
.../managers/communication/package.html | 24 -
.../managers/deployment/GridDeployment.java | 2 +-
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../deployment/GridDeploymentLocalStore.java | 7 +-
.../GridDeploymentPerLoaderStore.java | 6 +-
.../GridDeploymentPerVersionStore.java | 8 +-
.../managers/deployment/package-info.java | 22 +
.../internal/managers/deployment/package.html | 24 -
.../deployment/protocol/gg/package-info.java | 22 +
.../deployment/protocol/gg/package.html | 24 -
.../discovery/GridDiscoveryManager.java | 563 ++-
.../GridDiscoveryTopologySnapshot.java | 16 +-
.../managers/discovery/package-info.java | 22 +
.../internal/managers/discovery/package.html | 24 -
.../eventstorage/GridEventStorageManager.java | 5 +-
.../managers/eventstorage/package-info.java | 22 +
.../internal/managers/eventstorage/package.html | 24 -
.../managers/failover/package-info.java | 22 +
.../internal/managers/failover/package.html | 24 -
.../managers/indexing/package-info.java | 22 +
.../internal/managers/indexing/package.html | 24 -
.../managers/loadbalancer/package-info.java | 22 +
.../internal/managers/loadbalancer/package.html | 24 -
.../ignite/internal/managers/package-info.java | 22 +
.../ignite/internal/managers/package.html | 24 -
.../swapspace/GridSwapSpaceManager.java | 15 +-
.../managers/swapspace/package-info.java | 22 +
.../internal/managers/swapspace/package.html | 24 -
.../ignite/internal/mxbean/package-info.java | 22 +
.../apache/ignite/internal/mxbean/package.html | 24 -
.../apache/ignite/internal/package-info.java | 22 +
.../org/apache/ignite/internal/package.html | 24 -
.../processors/GridProcessorAdapter.java | 2 +-
.../affinity/AffinityTopologyVersion.java | 204 +
.../affinity/GridAffinityAssignment.java | 12 +-
.../affinity/GridAffinityAssignmentCache.java | 124 +-
.../GridAffinityFunctionContextImpl.java | 83 +
.../affinity/GridAffinityProcessor.java | 150 +-
.../processors/affinity/GridAffinityUtils.java | 19 +-
.../GridCacheAffinityFunctionContextImpl.java | 83 -
.../processors/affinity/package-info.java | 22 +
.../internal/processors/affinity/package.html | 24 -
.../processors/cache/CacheDistributionMode.java | 67 +
.../cache/CacheEntryPredicateAdapter.java | 20 +-
.../cache/CacheEntryPredicateContainsValue.java | 6 +
.../cache/CacheEvictableEntryImpl.java | 197 +
.../internal/processors/cache/CacheFlag.java | 2 -
.../processors/cache/CacheObjectContext.java | 6 +-
.../processors/cache/CacheObjectImpl.java | 6 +
.../processors/cache/CacheProjection.java | 166 +-
.../cache/CacheStoreBalancingWrapper.java | 6 +-
.../cache/CacheWeakQueryIteratorsHolder.java | 4 +-
.../cache/DynamicCacheChangeBatch.java | 75 +
.../cache/DynamicCacheChangeRequest.java | 193 +
.../cache/DynamicCacheDescriptor.java | 171 +
.../processors/cache/EvictableEntryImpl.java | 197 -
.../internal/processors/cache/GridCache.java | 227 ++
.../processors/cache/GridCacheAdapter.java | 339 +-
.../cache/GridCacheAffinityManager.java | 120 +-
.../processors/cache/GridCacheAtomicFuture.java | 4 +-
.../cache/GridCacheAtomicVersionComparator.java | 21 +-
.../processors/cache/GridCacheAttributes.java | 381 +-
.../cache/GridCacheClearAllRunnable.java | 11 +-
.../cache/GridCacheConcurrentMap.java | 31 +-
.../processors/cache/GridCacheContext.java | 124 +-
.../GridCacheDefaultAffinityKeyMapper.java | 16 +-
.../cache/GridCacheDeploymentManager.java | 19 +-
.../processors/cache/GridCacheEntryEx.java | 12 +-
.../GridCacheEntryInfoCollectSwapListener.java | 2 +-
.../processors/cache/GridCacheEntrySet.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 26 +-
.../cache/GridCacheEvictionManager.java | 57 +-
.../cache/GridCacheEvictionRequest.java | 14 +-
.../cache/GridCacheExplicitLockSpan.java | 20 +-
.../processors/cache/GridCacheGateway.java | 118 +-
.../processors/cache/GridCacheIoManager.java | 27 +-
.../processors/cache/GridCacheIterator.java | 2 +-
.../processors/cache/GridCacheKeySet.java | 2 +-
.../cache/GridCacheLoaderWriterStore.java | 8 +-
.../GridCacheLoaderWriterStoreFactory.java | 59 +
.../processors/cache/GridCacheMapEntry.java | 117 +-
.../cache/GridCacheMapEntryFactory.java | 3 +-
.../processors/cache/GridCacheMessage.java | 5 +-
.../cache/GridCacheMvccCandidate.java | 7 +-
.../processors/cache/GridCacheMvccManager.java | 59 +-
.../GridCachePartitionExchangeManager.java | 278 +-
.../processors/cache/GridCachePeekMode.java | 6 +-
.../processors/cache/GridCachePreloader.java | 3 +-
.../cache/GridCachePreloaderAdapter.java | 5 +-
.../processors/cache/GridCacheProcessor.java | 2211 ++++++----
.../processors/cache/GridCacheProjectionEx.java | 26 +-
.../cache/GridCacheProjectionImpl.java | 25 +
.../processors/cache/GridCacheProxyImpl.java | 76 +-
.../cache/GridCacheSharedContext.java | 39 +-
.../processors/cache/GridCacheStoreManager.java | 143 +-
.../processors/cache/GridCacheSwapListener.java | 5 +-
.../processors/cache/GridCacheSwapManager.java | 44 +-
.../cache/GridCacheTryPutFailedException.java | 28 +
.../processors/cache/GridCacheTtlManager.java | 12 +-
.../processors/cache/GridCacheUtils.java | 170 +-
.../cache/GridCacheValueCollection.java | 2 +-
.../cache/GridCacheWriteBehindStore.java | 96 +-
.../processors/cache/GridPartitionLockKey.java | 104 -
.../processors/cache/IgniteCacheProxy.java | 419 +-
.../processors/cache/QueryCursorImpl.java | 116 +
.../cache/affinity/GridCacheAffinityImpl.java | 13 +-
.../cache/affinity/GridCacheAffinityProxy.java | 6 +-
.../CacheDataStructuresManager.java | 21 +-
.../distributed/GridCacheTtlUpdateRequest.java | 12 +-
.../distributed/GridCacheTxFinishSync.java | 2 +-
.../GridDistributedCacheAdapter.java | 41 +-
.../distributed/GridDistributedTxMapping.java | 6 +-
.../GridDistributedTxRemoteAdapter.java | 19 +-
.../GridFutureRemapTimeoutObject.java | 73 +
.../dht/GridClientPartitionTopology.java | 109 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 12 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 13 +-
.../dht/GridDhtAssignmentFetchFuture.java | 19 +-
.../distributed/dht/GridDhtCacheAdapter.java | 84 +-
.../distributed/dht/GridDhtCacheEntry.java | 17 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 7 +-
.../distributed/dht/GridDhtLocalPartition.java | 110 +-
.../distributed/dht/GridDhtLockFuture.java | 69 +-
.../distributed/dht/GridDhtLockRequest.java | 11 +-
.../dht/GridDhtPartitionTopology.java | 31 +-
.../dht/GridDhtPartitionTopologyImpl.java | 117 +-
.../distributed/dht/GridDhtTopologyFuture.java | 10 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 25 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 11 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 5 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 13 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 12 +-
.../dht/GridDhtTxPrepareRequest.java | 11 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 9 +-
.../distributed/dht/GridNoStorageCacheMap.java | 6 +-
.../dht/GridPartitionedGetFuture.java | 71 +-
.../dht/atomic/GridDhtAtomicCache.java | 112 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 3 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 9 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 11 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 87 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 11 +-
.../dht/colocated/GridDhtColocatedCache.java | 36 +-
.../colocated/GridDhtColocatedCacheEntry.java | 7 +-
.../colocated/GridDhtColocatedLockFuture.java | 107 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 9 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 12 +-
.../GridDhtPartitionDemandMessage.java | 12 +-
.../preloader/GridDhtPartitionDemandPool.java | 56 +-
.../preloader/GridDhtPartitionExchangeId.java | 28 +-
.../dht/preloader/GridDhtPartitionFullMap.java | 8 +-
.../dht/preloader/GridDhtPartitionMap.java | 2 +-
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 235 +-
.../preloader/GridDhtPartitionsFullMessage.java | 18 +-
.../dht/preloader/GridDhtPreloader.java | 19 +-
.../preloader/GridDhtPreloaderAssignments.java | 9 +-
.../distributed/near/GridNearAtomicCache.java | 9 +-
.../distributed/near/GridNearCacheAdapter.java | 66 +-
.../distributed/near/GridNearCacheEntry.java | 104 +-
.../distributed/near/GridNearGetFuture.java | 124 +-
.../distributed/near/GridNearGetRequest.java | 12 +-
.../distributed/near/GridNearGetResponse.java | 12 +-
.../distributed/near/GridNearLockFuture.java | 95 +-
.../distributed/near/GridNearLockRequest.java | 53 +-
.../near/GridNearTransactionalCache.java | 13 +-
.../near/GridNearTxFinishFuture.java | 3 +-
.../near/GridNearTxFinishRequest.java | 11 +-
.../cache/distributed/near/GridNearTxLocal.java | 50 +-
.../near/GridNearTxPrepareFuture.java | 54 +-
.../near/GridNearTxPrepareRequest.java | 11 +-
.../distributed/near/GridNearTxRemote.java | 3 +-
.../processors/cache/dr/GridCacheDrManager.java | 3 +-
.../cache/dr/os/GridOsCacheDrManager.java | 3 +-
.../processors/cache/local/GridLocalCache.java | 18 +-
.../local/atomic/GridLocalAtomicCache.java | 17 +-
.../processors/cache/query/CacheQuery.java | 10 +-
.../query/GridCacheDistributedQueryManager.java | 26 +-
.../cache/query/GridCacheQueriesEx.java | 9 +-
.../cache/query/GridCacheQueriesImpl.java | 13 +-
.../cache/query/GridCacheQueriesProxy.java | 4 +-
.../cache/query/GridCacheQueryAdapter.java | 15 +-
.../cache/query/GridCacheQueryManager.java | 60 +-
.../cache/query/GridCacheSqlQuery.java | 2 +-
.../cache/query/GridCacheSqlResult.java | 29 -
.../cache/query/GridCacheTwoStepQuery.java | 22 +-
.../processors/cache/query/QueryCursorEx.java | 46 +
.../processors/cache/query/QueryCursorImpl.java | 87 -
.../CacheContinuousQueryFilterEx.java | 4 +-
.../continuous/CacheContinuousQueryHandler.java | 42 +-
.../continuous/CacheContinuousQueryManager.java | 76 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 13 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 253 +-
.../jdbc/GridCacheQueryJdbcValidationTask.java | 7 +-
.../cache/transactions/IgniteInternalTx.java | 10 +-
.../cache/transactions/IgniteTxAdapter.java | 38 +-
.../transactions/IgniteTxLocalAdapter.java | 17 +-
.../cache/transactions/IgniteTxManager.java | 12 +-
.../transactions/TransactionProxyImpl.java | 17 -
.../version/GridCacheRawVersionedEntry.java | 9 +-
.../cache/version/GridCacheVersion.java | 19 +-
.../GridCacheVersionConflictResolver.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 22 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 11 +-
.../IgniteCacheObjectProcessorImpl.java | 101 +-
.../processors/cacheobject/package-info.java | 22 +
.../processors/cacheobject/package.html | 24 -
.../processors/clock/GridClockDeltaVersion.java | 10 +-
.../processors/clock/GridClockServer.java | 2 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../processors/closure/package-info.java | 22 +
.../internal/processors/closure/package.html | 24 -
.../continuous/GridContinuousHandler.java | 15 +-
.../continuous/GridContinuousProcessor.java | 81 +-
.../datastreamer/DataStreamProcessor.java | 3 +-
.../datastreamer/DataStreamerCacheUpdaters.java | 37 +-
.../datastreamer/DataStreamerImpl.java | 131 +-
.../datastreamer/DataStreamerRequest.java | 2 +-
.../datastreamer/DataStreamerUpdateJob.java | 18 +-
.../processors/datastreamer/package-info.java | 22 +
.../processors/datastreamer/package.html | 24 -
.../datastructures/DataStructuresProcessor.java | 5 +-
.../GridCacheInternalKeyImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../datastructures/GridCacheSetImpl.java | 6 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java | 14 +-
.../internal/processors/dr/package-info.java | 22 +
.../ignite/internal/processors/dr/package.html | 26 -
.../processors/hadoop/package-info.java | 22 +
.../internal/processors/hadoop/package.html | 24 -
.../processors/igfs/IgfsClientSession.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 69 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 3 +
.../processors/igfs/IgfsFileWorker.java | 2 -
.../processors/igfs/IgfsHelperImpl.java | 16 +-
.../internal/processors/igfs/IgfsImpl.java | 10 +-
.../processors/igfs/IgfsLocalMetrics.java | 30 +-
.../processors/igfs/IgfsMetaManager.java | 46 +-
.../internal/processors/igfs/IgfsProcessor.java | 53 +-
.../internal/processors/igfs/IgfsServer.java | 6 +-
.../processors/igfs/IgfsServerManager.java | 4 +-
.../internal/processors/igfs/package-info.java | 22 +
.../internal/processors/igfs/package.html | 24 -
.../processors/job/GridJobProcessor.java | 14 +-
.../internal/processors/job/package-info.java | 22 +
.../ignite/internal/processors/job/package.html | 24 -
.../jobmetrics/GridJobMetricsProcessor.java | 2 +-
.../processors/jobmetrics/package-info.java | 22 +
.../internal/processors/jobmetrics/package.html | 24 -
.../offheap/GridOffHeapProcessor.java | 2 +-
.../internal/processors/package-info.java | 22 +
.../ignite/internal/processors/package.html | 24 -
.../plugin/IgnitePluginProcessor.java | 2 +-
.../internal/processors/port/package-info.java | 22 +
.../internal/processors/port/package.html | 24 -
.../processors/portable/package-info.java | 22 +
.../internal/processors/portable/package.html | 24 -
.../query/GridQueryCacheObjectsIterator.java | 70 +
.../processors/query/GridQueryIndexing.java | 52 +-
.../processors/query/GridQueryProcessor.java | 653 +--
.../query/GridQueryTypeDescriptor.java | 18 +-
.../messages/GridQueryCancelRequest.java | 114 +
.../twostep/messages/GridQueryFailResponse.java | 140 +
.../messages/GridQueryNextPageRequest.java | 167 +
.../messages/GridQueryNextPageResponse.java | 240 ++
.../h2/twostep/messages/GridQueryRequest.java | 211 +
.../processors/resource/GridResourceIoc.java | 2 +-
.../processors/resource/package-info.java | 22 +
.../internal/processors/resource/package.html | 24 -
.../processors/rest/GridRestProcessor.java | 4 +-
.../rest/client/message/package-info.java | 22 +
.../processors/rest/client/message/package.html | 24 -
.../handlers/cache/GridCacheCommandHandler.java | 4 +-
.../cache/GridCacheQueryCommandHandler.java | 6 +-
.../rest/handlers/cache/package-info.java | 22 +
.../processors/rest/handlers/cache/package.html | 24 -
.../processors/rest/handlers/package-info.java | 22 +
.../processors/rest/handlers/package.html | 24 -
.../handlers/task/GridTaskCommandHandler.java | 2 +-
.../rest/handlers/top/package-info.java | 22 +
.../processors/rest/handlers/top/package.html | 24 -
.../rest/handlers/version/package-info.java | 22 +
.../rest/handlers/version/package.html | 24 -
.../internal/processors/rest/package-info.java | 22 +
.../internal/processors/rest/package.html | 24 -
.../processors/rest/protocols/package-info.java | 22 +
.../processors/rest/protocols/package.html | 24 -
.../rest/protocols/tcp/package-info.java | 22 +
.../processors/rest/protocols/tcp/package.html | 24 -
.../processors/rest/request/package-info.java | 22 +
.../processors/rest/request/package.html | 24 -
.../processors/schedule/package-info.java | 22 +
.../internal/processors/schedule/package.html | 24 -
.../processors/segmentation/package-info.java | 22 +
.../processors/segmentation/package.html | 24 -
.../service/GridServiceProcessor.java | 40 +-
.../processors/service/GridServiceProxy.java | 2 +-
.../session/GridTaskSessionProcessor.java | 2 +-
.../processors/session/package-info.java | 23 +
.../internal/processors/session/package.html | 25 -
.../spring/IgniteSpringProcessor.java | 73 -
.../streamer/GridStreamProcessor.java | 347 --
.../streamer/GridStreamerAttributes.java | 127 -
.../streamer/GridStreamerCancelRequest.java | 110 -
.../streamer/GridStreamerContextDelegate.java | 102 -
.../streamer/GridStreamerContextImpl.java | 201 -
.../streamer/GridStreamerExecutionBatch.java | 175 -
.../streamer/GridStreamerExecutionRequest.java | 293 --
.../streamer/GridStreamerResponse.java | 144 -
.../GridStreamerRouteFailedException.java | 36 -
.../GridStreamerStageExecutionFuture.java | 340 --
.../streamer/GridStreamerWindowIterator.java | 40 -
.../processors/streamer/IgniteStreamerEx.java | 94 -
.../processors/streamer/IgniteStreamerImpl.java | 1375 -------
.../streamer/StreamerMBeanAdapter.java | 116 -
.../streamer/StreamerMetricsAdapter.java | 272 --
.../streamer/StreamerMetricsHolder.java | 424 --
.../streamer/StreamerStageMBeanAdapter.java | 101 -
.../streamer/StreamerStageMetricsAdapter.java | 135 -
.../streamer/StreamerStageMetricsHolder.java | 167 -
.../streamer/StreamerStageWrapper.java | 90 -
.../streamer/StreamerWindowMetricsAdapter.java | 65 -
.../streamer/StreamerWindowMetricsHolder.java | 50 -
.../internal/processors/streamer/package.html | 24 -
.../task/GridStreamerBroadcastTask.java | 137 -
.../streamer/task/GridStreamerQueryTask.java | 140 -
.../streamer/task/GridStreamerReduceTask.java | 144 -
.../processors/task/GridTaskProcessor.java | 13 +-
.../processors/task/GridTaskWorker.java | 2 +-
.../internal/processors/task/package-info.java | 22 +
.../internal/processors/task/package.html | 24 -
.../timeout/GridTimeoutProcessor.java | 2 +-
.../processors/timeout/package-info.java | 22 +
.../internal/processors/timeout/package.html | 24 -
.../internal/util/GridAnnotationsCache.java | 2 +-
.../ignite/internal/util/GridArgumentCheck.java | 1 -
.../GridBoundedConcurrentLinkedHashMap.java | 4 +-
.../GridBoundedConcurrentLinkedHashSet.java | 6 +-
.../internal/util/GridClassLoaderCache.java | 2 +-
.../internal/util/GridConcurrentFactory.java | 2 +-
.../internal/util/GridConcurrentHashSet.java | 2 +-
.../util/GridConcurrentLinkedHashSet.java | 4 +-
.../ignite/internal/util/GridEnumCache.java | 2 +-
.../internal/util/GridExecutionStatistics.java | 2 +-
.../ignite/internal/util/GridKeyLock.java | 2 +-
.../ignite/internal/util/GridLogThrottle.java | 2 +-
.../internal/util/GridSynchronizedMap.java | 2 +-
.../apache/ignite/internal/util/GridTimer.java | 2 +-
.../internal/util/IgniteExceptionRegistry.java | 164 +-
.../ignite/internal/util/IgniteUtils.java | 268 +-
.../util/future/GridCompoundFuture.java | 2 +-
.../internal/util/future/IgniteFutureImpl.java | 5 -
.../internal/util/future/package-info.java | 22 +
.../ignite/internal/util/future/package.html | 24 -
.../internal/util/gridify/package-info.java | 22 +
.../ignite/internal/util/gridify/package.html | 24 -
.../internal/util/io/GridFilenameUtils.java | 13 +-
.../util/ipc/loopback/package-info.java | 22 +
.../internal/util/ipc/loopback/package.html | 24 -
.../ignite/internal/util/ipc/package-info.java | 22 +
.../ignite/internal/util/ipc/package.html | 24 -
.../shmem/IpcSharedMemoryServerEndpoint.java | 90 +-
.../internal/util/ipc/shmem/package-info.java | 22 +
.../ignite/internal/util/ipc/shmem/package.html | 24 -
.../ignite/internal/util/lang/GridFunc.java | 544 +--
.../ignite/internal/util/lang/GridMapEntry.java | 2 +-
.../ignite/internal/util/nio/GridNioServer.java | 122 +-
.../util/nio/GridSelectorNioSessionImpl.java | 2 +-
.../util/nio/GridShmemCommunicationClient.java | 146 -
.../ignite/internal/util/nio/package-info.java | 22 +
.../ignite/internal/util/nio/package.html | 24 -
.../internal/util/nio/ssl/package-info.java | 22 +
.../ignite/internal/util/nio/ssl/package.html | 24 -
.../util/nodestart/IgniteSshHelper.java | 34 +
.../util/nodestart/IgniteSshProcessor.java | 34 -
.../offheap/unsafe/GridOffHeapSnapTreeMap.java | 2 +-
.../util/offheap/unsafe/GridUnsafeMap.java | 8 +-
.../unsafe/GridUnsafePartitionedMap.java | 4 +-
.../ignite/internal/util/package-info.java | 22 +
.../apache/ignite/internal/util/package.html | 24 -
.../internal/util/portscanner/package-info.java | 22 +
.../internal/util/portscanner/package.html | 24 -
.../internal/util/scala/package-info.java | 22 +
.../ignite/internal/util/scala/package.html | 24 -
.../internal/util/snaptree/package-info.java | 22 +
.../ignite/internal/util/snaptree/package.html | 24 -
.../util/spring/IgniteSpringHelper.java | 95 +
.../ignite/internal/util/test/package-info.java | 22 +
.../ignite/internal/util/test/package.html | 24 -
.../internal/util/tostring/package-info.java | 22 +
.../ignite/internal/util/tostring/package.html | 24 -
.../ignite/internal/util/typedef/PCE.java | 2 +-
.../util/typedef/internal/package-info.java | 22 +
.../internal/util/typedef/internal/package.html | 24 -
.../internal/util/typedef/package-info.java | 22 +
.../ignite/internal/util/typedef/package.html | 24 -
.../ignite/internal/util/worker/GridWorker.java | 26 +-
.../internal/util/worker/package-info.java | 22 +
.../ignite/internal/util/worker/package.html | 24 -
.../apache/ignite/internal/visor/VisorJob.java | 3 +
.../internal/visor/VisorMultiNodeTask.java | 1 +
.../ignite/internal/visor/cache/VisorCache.java | 17 +-
.../cache/VisorCacheAffinityConfiguration.java | 6 +-
.../visor/cache/VisorCacheClearTask.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 54 +-
.../cache/VisorCacheDefaultConfiguration.java | 1 -
.../cache/VisorCacheEvictionConfiguration.java | 13 +-
.../visor/cache/VisorCacheLoadTask.java | 2 +-
.../visor/cache/VisorCacheMetadataTask.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 1 +
.../cache/VisorCacheMetricsCollectorTask.java | 2 +-
.../cache/VisorCacheNearConfiguration.java | 6 +-
.../cache/VisorCachePreloadConfiguration.java | 114 -
.../visor/cache/VisorCachePreloadTask.java | 82 -
.../cache/VisorCacheQueryConfiguration.java | 123 +
.../cache/VisorCacheRebalanceConfiguration.java | 114 +
.../visor/cache/VisorCacheRebalanceTask.java | 82 +
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 4 +-
.../compute/VisorComputeMonitoringHolder.java | 10 +-
.../visor/event/VisorGridEventsLost.java | 7 +-
.../event/VisorGridSecuritySessionEvent.java | 91 -
.../node/VisorCacheQueryConfiguration.java | 106 -
.../visor/node/VisorGridConfiguration.java | 23 -
.../visor/node/VisorIgfsConfiguration.java | 11 +
.../visor/node/VisorNodeDataCollectorJob.java | 53 +-
.../node/VisorNodeDataCollectorJobResult.java | 27 +-
.../visor/node/VisorNodeDataCollectorTask.java | 8 +-
.../node/VisorNodeDataCollectorTaskResult.java | 45 +-
.../node/VisorNodeSuppressedErrorsTask.java | 99 +
.../visor/node/VisorQueryConfiguration.java | 138 -
.../internal/visor/query/VisorQueryTask.java | 4 +-
.../internal/visor/streamer/VisorStreamer.java | 104 -
.../streamer/VisorStreamerConfiguration.java | 177 -
.../visor/streamer/VisorStreamerMetrics.java | 350 --
.../streamer/VisorStreamerMetricsResetTask.java | 75 -
.../visor/streamer/VisorStreamerResetTask.java | 75 -
.../streamer/VisorStreamerStageMetrics.java | 277 --
.../internal/visor/util/VisorTaskUtils.java | 14 +-
.../org/apache/ignite/lang/IgniteCallable.java | 2 +-
.../org/apache/ignite/lang/IgniteFuture.java | 31 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 +
.../org/apache/ignite/lang/IgnitePredicate.java | 5 +-
.../ignite/lang/IgniteProductVersion.java | 30 +-
.../java/org/apache/ignite/lang/IgniteUuid.java | 7 +-
.../org/apache/ignite/lang/package-info.java | 22 +
.../java/org/apache/ignite/lang/package.html | 24 -
.../apache/ignite/lifecycle/package-info.java | 22 +
.../apache/ignite/logger/java/package-info.java | 22 +
.../org/apache/ignite/logger/java/package.html | 24 -
.../org/apache/ignite/logger/package-info.java | 22 +
.../java/org/apache/ignite/logger/package.html | 24 -
.../ignite/marshaller/MarshallerContext.java | 5 +-
.../jdk/JdkMarshallerObjectInputStream.java | 4 +-
.../ignite/marshaller/jdk/package-info.java | 22 +
.../apache/ignite/marshaller/jdk/package.html | 24 -
.../optimized/OptimizedClassDescriptor.java | 288 +-
.../optimized/OptimizedMarshaller.java | 30 +-
.../optimized/OptimizedMarshallerUtils.java | 66 +-
.../optimized/OptimizedObjectInputStream.java | 111 +-
.../optimized/OptimizedObjectOutputStream.java | 84 +-
.../marshaller/optimized/package-info.java | 22 +
.../ignite/marshaller/optimized/package.html | 24 -
.../apache/ignite/marshaller/package-info.java | 22 +
.../org/apache/ignite/marshaller/package.html | 24 -
.../apache/ignite/messaging/package-info.java | 22 +
.../org/apache/ignite/messaging/package.html | 24 -
.../org/apache/ignite/mxbean/package-info.java | 22 +
.../java/org/apache/ignite/mxbean/package.html | 24 -
.../java/org/apache/ignite/package-info.java | 21 +
.../main/java/org/apache/ignite/package.html | 24 -
.../extensions/communication/package-info.java | 22 +
.../extensions/communication/package.html | 24 -
.../org/apache/ignite/plugin/package-info.java | 22 +
.../ignite/plugin/security/package-info.java | 22 +
.../apache/ignite/plugin/security/package.html | 24 -
.../plugin/segmentation/package-info.java | 22 +
.../ignite/plugin/segmentation/package.html | 24 -
.../apache/ignite/scheduler/package-info.java | 22 +
.../org/apache/ignite/scheduler/package.html | 24 -
.../apache/ignite/services/package-info.java | 21 +
.../org/apache/ignite/services/package.html | 23 -
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 8 -
.../spi/checkpoint/cache/package-info.java | 23 +
.../ignite/spi/checkpoint/cache/package.html | 25 -
.../spi/checkpoint/jdbc/package-info.java | 23 +
.../ignite/spi/checkpoint/jdbc/package.html | 25 -
.../spi/checkpoint/noop/package-info.java | 22 +
.../ignite/spi/checkpoint/noop/package.html | 24 -
.../ignite/spi/checkpoint/package-info.java | 22 +
.../apache/ignite/spi/checkpoint/package.html | 24 -
.../spi/checkpoint/sharedfs/package-info.java | 22 +
.../ignite/spi/checkpoint/sharedfs/package.html | 24 -
.../spi/collision/fifoqueue/package-info.java | 22 +
.../ignite/spi/collision/fifoqueue/package.html | 24 -
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../spi/collision/jobstealing/package-info.java | 22 +
.../spi/collision/jobstealing/package.html | 24 -
.../ignite/spi/collision/noop/package-info.java | 22 +
.../ignite/spi/collision/noop/package.html | 24 -
.../ignite/spi/collision/package-info.java | 22 +
.../apache/ignite/spi/collision/package.html | 24 -
.../collision/priorityqueue/package-info.java | 22 +
.../spi/collision/priorityqueue/package.html | 24 -
.../ignite/spi/communication/package-info.java | 22 +
.../ignite/spi/communication/package.html | 24 -
.../communication/tcp/TcpCommunicationSpi.java | 402 +-
.../tcp/TcpCommunicationSpiMBean.java | 8 -
.../spi/communication/tcp/package-info.java | 22 +
.../ignite/spi/communication/tcp/package.html | 24 -
.../deployment/local/LocalDeploymentSpi.java | 2 +-
.../spi/deployment/local/package-info.java | 22 +
.../ignite/spi/deployment/local/package.html | 24 -
.../ignite/spi/deployment/package-info.java | 22 +
.../apache/ignite/spi/deployment/package.html | 24 -
.../spi/discovery/DiscoverySpiDataExchange.java | 8 +-
.../spi/discovery/DiscoverySpiListener.java | 3 +-
.../ignite/spi/discovery/package-info.java | 22 +
.../apache/ignite/spi/discovery/package.html | 24 -
.../discovery/tcp/TcpClientDiscoverySpi.java | 21 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 120 +-
.../tcp/internal/TcpDiscoveryNode.java | 10 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 2 +-
.../discovery/tcp/internal/package-info.java | 22 +
.../spi/discovery/tcp/internal/package.html | 24 -
.../tcp/ipfinder/jdbc/package-info.java | 22 +
.../discovery/tcp/ipfinder/jdbc/package.html | 24 -
.../TcpDiscoveryMulticastIpFinder.java | 4 +-
.../tcp/ipfinder/multicast/package-info.java | 22 +
.../tcp/ipfinder/multicast/package.html | 24 -
.../discovery/tcp/ipfinder/package-info.java | 22 +
.../spi/discovery/tcp/ipfinder/package.html | 24 -
.../tcp/ipfinder/sharedfs/package-info.java | 22 +
.../tcp/ipfinder/sharedfs/package.html | 24 -
.../discovery/tcp/ipfinder/vm/package-info.java | 22 +
.../spi/discovery/tcp/ipfinder/vm/package.html | 24 -
.../TcpDiscoveryCustomEventMessage.java | 1 +
.../messages/TcpDiscoveryNodeAddedMessage.java | 26 +-
.../discovery/tcp/messages/package-info.java | 22 +
.../spi/discovery/tcp/messages/package.html | 24 -
.../ignite/spi/discovery/tcp/package-info.java | 22 +
.../ignite/spi/discovery/tcp/package.html | 24 -
.../memory/MemoryEventStorageSpi.java | 2 +-
.../spi/eventstorage/memory/package-info.java | 22 +
.../ignite/spi/eventstorage/memory/package.html | 24 -
.../ignite/spi/eventstorage/package-info.java | 22 +
.../apache/ignite/spi/eventstorage/package.html | 24 -
.../spi/failover/always/package-info.java | 22 +
.../ignite/spi/failover/always/package.html | 24 -
.../spi/failover/jobstealing/package-info.java | 22 +
.../spi/failover/jobstealing/package.html | 24 -
.../ignite/spi/failover/never/package-info.java | 22 +
.../ignite/spi/failover/never/package.html | 24 -
.../ignite/spi/failover/package-info.java | 22 +
.../org/apache/ignite/spi/failover/package.html | 24 -
.../spi/indexing/IndexingQueryFilter.java | 2 +-
.../ignite/spi/indexing/noop/package-info.java | 22 +
.../ignite/spi/indexing/package-info.java | 22 +
.../org/apache/ignite/spi/indexing/package.html | 24 -
.../adaptive/AdaptiveLoadBalancingSpi.java | 2 +-
.../loadbalancing/adaptive/package-info.java | 22 +
.../spi/loadbalancing/adaptive/package.html | 24 -
.../ignite/spi/loadbalancing/package-info.java | 22 +
.../ignite/spi/loadbalancing/package.html | 24 -
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../loadbalancing/roundrobin/package-info.java | 22 +
.../spi/loadbalancing/roundrobin/package.html | 24 -
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../weightedrandom/package-info.java | 22 +
.../loadbalancing/weightedrandom/package.html | 24 -
.../org/apache/ignite/spi/package-info.java | 22 +
.../java/org/apache/ignite/spi/package.html | 24 -
.../spi/swapspace/SwapSpaceSpiListener.java | 3 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 14 +-
.../ignite/spi/swapspace/file/package-info.java | 22 +
.../ignite/spi/swapspace/file/package.html | 24 -
.../ignite/spi/swapspace/noop/package-info.java | 22 +
.../ignite/spi/swapspace/noop/package.html | 24 -
.../ignite/spi/swapspace/package-info.java | 22 +
.../apache/ignite/spi/swapspace/package.html | 24 -
.../ignite/startup/BasicWarmupClosure.java | 12 +-
.../ignite/startup/cmdline/package-info.java | 22 +
.../apache/ignite/startup/cmdline/package.html | 24 -
.../apache/ignite/stream/StreamReceiver.java | 42 +
.../apache/ignite/stream/StreamTransformer.java | 53 +
.../org/apache/ignite/stream/StreamVisitor.java | 53 +
.../org/apache/ignite/stream/package-info.java | 21 +
.../ignite/streamer/StreamerConfiguration.java | 249 --
.../apache/ignite/streamer/StreamerContext.java | 142 -
.../ignite/streamer/StreamerEventRouter.java | 55 -
.../streamer/StreamerEventRouterAdapter.java | 60 -
.../streamer/StreamerFailureListener.java | 44 -
.../apache/ignite/streamer/StreamerMBean.java | 169 -
.../apache/ignite/streamer/StreamerMetrics.java | 209 -
.../apache/ignite/streamer/StreamerStage.java | 61 -
.../ignite/streamer/StreamerStageMBean.java | 114 -
.../ignite/streamer/StreamerStageMetrics.java | 93 -
.../apache/ignite/streamer/StreamerWindow.java | 206 -
.../ignite/streamer/StreamerWindowMBean.java | 58 -
.../ignite/streamer/StreamerWindowMetrics.java | 44 -
.../ignite/streamer/index/StreamerIndex.java | 305 --
.../streamer/index/StreamerIndexEntry.java | 57 -
.../streamer/index/StreamerIndexPolicy.java | 50 -
.../streamer/index/StreamerIndexProvider.java | 107 -
.../index/StreamerIndexProviderAdapter.java | 796 ----
.../index/StreamerIndexProviderMBean.java | 74 -
.../streamer/index/StreamerIndexUpdateSync.java | 77 -
.../streamer/index/StreamerIndexUpdater.java | 88 -
.../index/hash/StreamerHashIndexProvider.java | 500 ---
.../ignite/streamer/index/hash/package.html | 23 -
.../apache/ignite/streamer/index/package.html | 23 -
.../index/tree/StreamerTreeIndexProvider.java | 953 -----
.../ignite/streamer/index/tree/package.html | 23 -
.../org/apache/ignite/streamer/package.html | 23 -
.../router/StreamerAffinityEventRouter.java | 150 -
.../StreamerCacheAffinityEventRouter.java | 70 -
.../router/StreamerLocalEventRouter.java | 46 -
.../router/StreamerRandomEventRouter.java | 89 -
.../router/StreamerRoundRobinEventRouter.java | 53 -
.../apache/ignite/streamer/router/package.html | 23 -
.../window/StreamerBoundedSizeBatchWindow.java | 804 ----
.../window/StreamerBoundedSizeSortedWindow.java | 218 -
.../window/StreamerBoundedSizeWindow.java | 144 -
.../StreamerBoundedSizeWindowAdapter.java | 357 --
.../window/StreamerBoundedTimeBatchWindow.java | 906 -----
.../window/StreamerBoundedTimeWindow.java | 462 ---
.../window/StreamerUnboundedWindow.java | 111 -
.../streamer/window/StreamerWindowAdapter.java | 537 ---
.../apache/ignite/streamer/window/package.html | 23 -
.../org/apache/ignite/thread/package-info.java | 22 +
.../java/org/apache/ignite/thread/package.html | 24 -
.../apache/ignite/transactions/Transaction.java | 38 +-
.../TransactionSynchronization.java | 2 +-
.../ignite/transactions/package-info.java | 22 +
.../org/jdk8/backport/ConcurrentHashMap8.java | 3823 ------------------
.../jdk8/backport/ConcurrentLinkedDeque8.java | 1983 ---------
.../jdk8/backport/ConcurrentLinkedHashMap.java | 2170 ----------
.../main/java/org/jdk8/backport/LongAdder.java | 235 --
.../main/java/org/jdk8/backport/Striped64.java | 370 --
.../org/jdk8/backport/ThreadLocalRandom8.java | 231 --
.../org/jetbrains/annotations/package-info.java | 27 +
.../java/org/jsr166/ConcurrentHashMap8.java | 3794 +++++++++++++++++
.../java/org/jsr166/ConcurrentLinkedDeque8.java | 1954 +++++++++
.../org/jsr166/ConcurrentLinkedHashMap.java | 2150 ++++++++++
.../src/main/java/org/jsr166/LongAdder8.java | 206 +
.../src/main/java/org/jsr166/Striped64_8.java | 346 ++
.../java/org/jsr166/ThreadLocalRandom8.java | 202 +
.../src/main/java/org/jsr166/package-info.java | 10 +
.../java/org/pcollections/AmortizedPQueue.java | 156 -
.../main/java/org/pcollections/ConsPStack.java | 225 --
.../src/main/java/org/pcollections/Empty.java | 47 -
.../main/java/org/pcollections/HashPMap.java | 175 -
.../java/org/pcollections/HashTreePBag.java | 47 -
.../java/org/pcollections/HashTreePMap.java | 52 -
.../java/org/pcollections/HashTreePSet.java | 46 -
.../src/main/java/org/pcollections/IntTree.java | 320 --
.../main/java/org/pcollections/IntTreePMap.java | 165 -
.../src/main/java/org/pcollections/MapPBag.java | 143 -
.../src/main/java/org/pcollections/MapPSet.java | 101 -
.../main/java/org/pcollections/OrderedPSet.java | 85 -
.../src/main/java/org/pcollections/PBag.java | 23 -
.../main/java/org/pcollections/PCollection.java | 56 -
.../src/main/java/org/pcollections/PMap.java | 49 -
.../main/java/org/pcollections/POrderedSet.java | 25 -
.../src/main/java/org/pcollections/PQueue.java | 38 -
.../main/java/org/pcollections/PSequence.java | 73 -
.../src/main/java/org/pcollections/PSet.java | 23 -
.../src/main/java/org/pcollections/PStack.java | 51 -
.../src/main/java/org/pcollections/PVector.java | 45 -
.../org/pcollections/SimpleImmutableEntry.java | 146 -
.../main/java/org/pcollections/TreePVector.java | 155 -
.../resources/META-INF/classnames.properties | 173 +-
.../resources/META-INF/licenses/apache-2.0.txt | 202 -
.../META-INF/licenses/gnu-gplv2ce-license.txt | 349 --
.../resources/META-INF/licenses/snaptree.txt | 35 -
.../core/src/main/resources/ignite.properties | 2 +-
.../core/src/test/bin/start-nodes-custom.bat | 3 +-
.../spring-cache-client-benchmark-1.xml | 6 +-
.../spring-cache-client-benchmark-2.xml | 6 +-
.../spring-cache-client-benchmark-3.xml | 6 +-
.../core/src/test/config/discovery-stress.xml | 4 +-
modules/core/src/test/config/example-cache.xml | 9 +-
.../core/src/test/config/examples.properties | 14 +-
modules/core/src/test/config/igfs-loopback.xml | 3 -
modules/core/src/test/config/igfs-shmem.xml | 3 -
.../src/test/config/io-manager-benchmark.xml | 1 -
.../src/test/config/load/cache-benchmark.xml | 4 -
.../test/config/load/cache-client-benchmark.xml | 15 -
.../config/load/dsi-49-server-production.xml | 6 +-
.../src/test/config/load/dsi-load-server.xml | 7 +-
modules/core/src/test/config/log4j-test.xml | 6 +
.../config/spring-cache-put-remove-load.xml | 8 -
.../core/src/test/config/spring-cache-swap.xml | 2 +-
.../src/test/config/spring-cache-teststore.xml | 2 +-
.../core/src/test/config/spring-multicache.xml | 16 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 186 -
.../config/store/jdbc/ignite-type-metadata.xml | 268 ++
.../test/config/websession/example-cache.xml | 164 +
.../test/config/websession/spring-cache-1.xml | 4 -
.../test/config/websession/spring-cache-2.xml | 4 -
.../test/config/websession/spring-cache-3.xml | 4 -
modules/core/src/test/java/ExcludeList | 20 +
.../GridCacheAffinityBackupsSelfTest.java | 10 +-
.../apache/ignite/GridTestStoreNodeStartup.java | 2 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 28 +-
...CachePartitionFairAffinityNodesSelfTest.java | 242 --
.../GridCachePartitionFairAffinitySelfTest.java | 261 --
.../GridFairAffinityFunctionNodesSelfTest.java | 242 ++
.../fair/GridFairAffinityFunctionSelfTest.java | 264 ++
.../store/GridCacheBalancingStoreSelfTest.java | 2 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 2 +-
.../cache/store/GridGeneratingTestStore.java | 2 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 8 +-
.../store/jdbc/CacheJdbcPojoStoreTest.java | 564 +--
...eJdbcStoreAbstractMultithreadedSelfTest.java | 20 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 75 +-
.../cache/store/jdbc/model/Organization.java | 2 +-
.../cache/store/jdbc/model/OrganizationKey.java | 2 +-
.../ignite/cache/store/jdbc/model/Person.java | 2 +-
.../store/jdbc/model/PersonComplexKey.java | 2 +-
.../cache/store/jdbc/model/PersonKey.java | 2 +-
.../cache/store/jdbc/model/package-info.java | 22 +
.../ignite/cache/store/jdbc/model/package.html | 24 -
.../ignite/cache/store/jdbc/package-info.java | 22 +
.../apache/ignite/cache/store/jdbc/package.html | 24 -
.../apache/ignite/cache/store/package-info.java | 22 +
.../org/apache/ignite/cache/store/package.html | 24 -
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 8 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 1 +
.../internal/ClusterNodeMetricsSelfTest.java | 31 +-
.../ignite/internal/GridAffinityMappedTest.java | 4 +-
.../internal/GridAffinityP2PSelfTest.java | 4 +-
.../ignite/internal/GridAffinitySelfTest.java | 2 +-
.../ignite/internal/GridDiscoverySelfTest.java | 3 +-
.../GridJobMasterLeaveAwareSelfTest.java | 6 +-
.../internal/GridMultipleJobsSelfTest.java | 2 +-
.../GridProjectionForCachesSelfTest.java | 65 +-
.../ignite/internal/GridProjectionSelfTest.java | 36 +-
.../ignite/internal/GridStartStopSelfTest.java | 4 +-
.../internal/GridUpdateNotifierSelfTest.java | 2 +
.../checkpoint/GridCheckpointTaskSelfTest.java | 4 +-
.../managers/checkpoint/package-info.java | 22 +
.../internal/managers/checkpoint/package.html | 24 -
.../managers/communication/package-info.java | 22 +
.../managers/communication/package.html | 24 -
.../GridDeploymentMessageCountSelfTest.java | 8 +-
.../managers/deployment/package-info.java | 22 +
.../internal/managers/deployment/package.html | 24 -
.../GridDiscoveryManagerAliveCacheSelfTest.java | 13 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 124 +-
.../ignite/internal/managers/package-info.java | 22 +
.../ignite/internal/managers/package.html | 24 -
.../managers/swapspace/package-info.java | 22 +
.../internal/managers/swapspace/package.html | 24 -
.../apache/ignite/internal/package-info.java | 22 +
.../org/apache/ignite/internal/package.html | 24 -
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 152 +
.../GridAffinityProcessorAbstractSelfTest.java | 18 +-
...GridAffinityProcessorRendezvousSelfTest.java | 4 +-
...cheNearUpdateTopologyChangeAbstractTest.java | 140 +
.../GridCacheAbstractFailoverSelfTest.java | 2 +-
.../cache/GridCacheAbstractFlagsTest.java | 7 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 356 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 23 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 80 +-
.../GridCacheAbstractRemoveFailureTest.java | 15 +-
.../cache/GridCacheAbstractSelfTest.java | 42 +-
...acheAbstractUsersAffinityMapperSelfTest.java | 12 +-
.../cache/GridCacheAffinityApiSelfTest.java | 56 +-
.../cache/GridCacheAffinityMapperSelfTest.java | 14 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 6 +-
.../cache/GridCacheAlwaysEvictionPolicy.java | 14 +-
.../GridCacheAtomicMessageCountSelfTest.java | 30 +-
...dCacheAtomicUsersAffinityMapperSelfTest.java | 5 +-
.../cache/GridCacheBasicApiAbstractTest.java | 31 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 12 +-
...acheBasicStoreMultithreadedAbstractTest.java | 2 +-
.../cache/GridCacheClearAllSelfTest.java | 45 +-
.../cache/GridCacheClearLocallySelfTest.java | 378 ++
.../cache/GridCacheClearLocalySelfTest.java | 336 --
...dCacheColocatedTxStoreExceptionSelfTest.java | 6 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 10 +-
.../cache/GridCacheConcurrentMapTest.java | 6 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 41 +-
...idCacheConfigurationConsistencySelfTest.java | 295 +-
...ridCacheConfigurationValidationSelfTest.java | 42 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 7 +-
.../GridCacheDeploymentOffHeapSelfTest.java | 4 +-
.../cache/GridCacheDeploymentSelfTest.java | 21 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 7 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheEvictionEventAbstractTest.java | 10 +-
.../GridCacheExAbstractFullApiSelfTest.java | 6 +-
.../GridCacheFieldsQueryNoDataSelfTest.java | 83 -
.../GridCacheFinishPartitionsSelfTest.java | 30 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 3 +-
.../cache/GridCacheGenericTestStore.java | 2 +-
...idCacheGetAndTransformStoreAbstractTest.java | 11 +-
.../cache/GridCacheIncrementTransformTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 355 +-
...cheInterceptorAtomicNearEnabledSelfTest.java | 11 +-
...erceptorAtomicPrimaryWriteOrderSelfTest.java | 8 +-
.../GridCacheInterceptorAtomicSelfTest.java | 8 +-
...GridCacheInterceptorNearEnabledSelfTest.java | 7 +-
.../cache/GridCacheInterceptorSelfTest.java | 8 +-
.../cache/GridCacheIteratorPerformanceTest.java | 6 +-
.../GridCacheKeyCheckNearEnabledSelfTest.java | 6 +-
.../cache/GridCacheKeyCheckSelfTest.java | 14 +-
.../processors/cache/GridCacheLeakTest.java | 8 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 45 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 17 +-
.../GridCacheMarshallerTxAbstractTest.java | 10 +-
.../GridCacheMarshallingNodeJoinSelfTest.java | 170 +
.../cache/GridCacheMemoryModeSelfTest.java | 6 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 45 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 14 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 24 +-
...ultinodeUpdateAtomicNearEnabledSelfTest.java | 6 +-
.../GridCacheMultinodeUpdateAtomicSelfTest.java | 6 +-
...CacheMultinodeUpdateNearEnabledSelfTest.java | 6 +-
.../cache/GridCacheMultinodeUpdateSelfTest.java | 6 +-
.../cache/GridCacheMvccManagerSelfTest.java | 2 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 2 -
.../cache/GridCacheNestedTxAbstractTest.java | 12 +-
.../cache/GridCacheObjectToStringSelfTest.java | 23 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 17 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 14 +-
.../cache/GridCacheOffHeapSelfTest.java | 14 +-
.../processors/cache/GridCacheOffHeapTest.java | 6 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 45 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 17 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 10 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 18 +-
.../GridCacheOrderedPreloadingSelfTest.java | 2 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 11 +-
.../GridCachePartitionedAffinitySpreadTest.java | 4 +-
.../cache/GridCachePartitionedGetSelfTest.java | 12 +-
.../GridCachePartitionedLocalStoreSelfTest.java | 6 +-
...chePartitionedOffHeapLocalStoreSelfTest.java | 6 +-
...hePartitionedProjectionAffinitySelfTest.java | 2 -
.../cache/GridCachePartitionedWritesTest.java | 6 +-
.../GridCachePreloadingEvictionsSelfTest.java | 13 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 10 +-
.../processors/cache/GridCachePutAllTask.java | 2 +-
.../cache/GridCacheQueryEmbeddedValue.java | 2 +
.../cache/GridCacheQueryIndexSelfTest.java | 126 -
.../GridCacheQueryIndexingDisabledSelfTest.java | 1 -
.../GridCacheQueryInternalKeysSelfTest.java | 3 +-
.../GridCacheReferenceCleanupSelfTest.java | 13 +-
.../cache/GridCacheReloadSelfTest.java | 10 +-
.../GridCacheReplicatedLocalStoreSelfTest.java | 6 +-
...ridCacheReplicatedSynchronousCommitTest.java | 8 +-
...CacheReplicatedTxStoreExceptionSelfTest.java | 6 +-
...heReplicatedUsersAffinityMapperSelfTest.java | 5 +-
.../GridCacheReturnValueTransferSelfTest.java | 14 +-
.../cache/GridCacheSlowTxWarnTest.java | 2 +-
.../processors/cache/GridCacheStopSelfTest.java | 3 +-
.../cache/GridCacheStorePutxSelfTest.java | 4 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 3 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 25 +-
.../cache/GridCacheSwapReloadSelfTest.java | 2 +-
.../processors/cache/GridCacheTestEntryEx.java | 28 +-
.../processors/cache/GridCacheTestStore.java | 2 +-
.../processors/cache/GridCacheTestValue.java | 2 +-
.../processors/cache/GridCacheTestValue2.java | 2 +
...cheTransactionalAbstractMetricsSelfTest.java | 8 +-
.../cache/GridCacheTtlManagerLoadTest.java | 2 +-
.../cache/GridCacheTtlManagerSelfTest.java | 6 +-
...ridCacheTxPartitionedLocalStoreSelfTest.java | 6 +-
.../GridCacheTxUsersAffinityMapperSelfTest.java | 5 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 13 +-
...idCacheValueConsistencyAbstractSelfTest.java | 83 +-
...istencyTransactionalNearEnabledSelfTest.java | 6 +-
...heValueConsistencyTransactionalSelfTest.java | 2 +-
.../GridCacheVariableTopologySelfTest.java | 2 +-
.../cache/GridCacheVersionMultinodeTest.java | 13 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 2 +-
.../GridCacheWriteBehindStoreAbstractTest.java | 4 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 12 +-
.../GridCacheWriteBehindStoreSelfTest.java | 2 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 13 +-
.../cache/IgniteCacheAbstractTest.java | 28 +-
.../cache/IgniteCacheAtomicInvokeTest.java | 6 +-
.../cache/IgniteCacheAtomicLocalInvokeTest.java | 6 +-
...niteCacheAtomicLocalWithStoreInvokeTest.java | 6 +-
.../IgniteCacheAtomicNearEnabledInvokeTest.java | 8 +-
.../IgniteCacheAtomicNearPeekModesTest.java | 28 +
...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 6 +-
...micPrimaryWriteOrderWithStoreInvokeTest.java | 6 +-
.../IgniteCacheContainsKeyAbstractSelfTest.java | 2 -
...niteCacheCopyOnReadDisabledAbstractTest.java | 2 +-
.../cache/IgniteCacheDynamicStopSelfTest.java | 130 +
.../IgniteCacheEntryListenerAbstractTest.java | 204 +-
...IgniteCacheEntryListenerAtomicLocalTest.java | 6 +-
.../IgniteCacheEntryListenerAtomicTest.java | 6 +-
.../IgniteCacheEntryListenerTxLocalTest.java | 6 +-
.../cache/IgniteCacheEntryListenerTxTest.java | 6 +-
.../cache/IgniteCacheInvokeReadThroughTest.java | 11 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 42 +-
.../cache/IgniteCacheStartStopLoadTest.java | 135 +
.../cache/IgniteCacheTxInvokeTest.java | 6 +-
.../cache/IgniteCacheTxLocalInvokeTest.java | 6 +-
.../IgniteCacheTxNearEnabledInvokeTest.java | 8 +-
.../cache/IgniteCacheTxNearPeekModesTest.java | 28 +
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 8 +-
.../cache/IgniteCachingProviderSelfTest.java | 4 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 108 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 1005 +++++
.../cache/IgnitePutAllLargeBatchSelfTest.java | 11 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 6 +-
.../cache/IgniteStaticCacheStartSelfTest.java | 98 +
.../processors/cache/IgniteTxAbstractTest.java | 4 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 33 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 62 +-
.../IgniteTxMultiThreadedAbstractTest.java | 2 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 7 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 52 +-
...IgniteCacheAbstractExecutionContextTest.java | 13 +-
.../IgniteCacheAtomicExecutionContextTest.java | 6 +-
...iteCachePartitionedExecutionContextTest.java | 6 +-
...niteCacheReplicatedExecutionContextTest.java | 6 +-
.../IgniteCacheTxExecutionContextTest.java | 6 +-
...eAbstractDataStructuresFailoverSelfTest.java | 2 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 2 +-
...idCacheAtomicStampedApiSelfAbstractTest.java | 2 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 2 +-
.../GridCacheSetAbstractSelfTest.java | 10 +-
.../IgniteAtomicLongApiAbstractSelfTest.java | 4 +-
.../IgniteCollectionAbstractTest.java | 4 +-
...titionedAtomicSequenceMultiThreadedTest.java | 48 +-
...GridCachePartitionedNodeRestartSelfTest.java | 2 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 26 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 2 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 9 +-
...CacheAtomicNearUpdateTopologyChangeTest.java | 39 +
.../CacheTxNearUpdateTopologyChangeTest.java | 33 +
...tractDistributedByteArrayValuesSelfTest.java | 6 +-
.../GridCacheAbstractJobExecutionTest.java | 41 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 10 +-
...tractPartitionedByteArrayValuesSelfTest.java | 11 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 7 +-
.../GridCacheAtomicTimeoutSelfTest.java | 20 +-
.../GridCacheBasicOpAbstractTest.java | 26 +-
.../GridCacheClientModesAbstractSelfTest.java | 34 +-
.../GridCacheEntrySetAbstractSelfTest.java | 2 +-
...acheEntrySetIterationPreloadingSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 8 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +-
...GridCacheLoadingConcurrentGridStartTest.java | 154 +
.../distributed/GridCacheLockAbstractTest.java | 6 +-
.../distributed/GridCacheMixedModeSelfTest.java | 8 +-
.../GridCacheModuloAffinityFunction.java | 4 +-
.../GridCacheMultiNodeAbstractTest.java | 10 +-
.../GridCacheMultiNodeLockAbstractTest.java | 14 +-
...dCacheMultithreadedFailoverAbstractTest.java | 25 +-
.../GridCacheNodeFailureAbstractTest.java | 7 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 148 +
...dCachePartitionedAffinityFilterSelfTest.java | 10 +-
...chePartitionedReloadAllAbstractSelfTest.java | 17 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 7 +-
...GridCachePreloadRestartAbstractSelfTest.java | 13 +-
.../GridCacheTransformEventSelfTest.java | 7 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 2 +-
.../IgniteCrossCacheTxStoreSelfTest.java | 105 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 8 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 16 +-
.../IgniteTxTimeoutAbstractTest.java | 4 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 12 +-
...heAbstractTransformWriteThroughSelfTest.java | 8 +-
...acheAtomicExpiredEntriesPreloadSelfTest.java | 6 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 5 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 86 +-
...idCacheAtomicNearEnabledFullApiSelfTest.java | 8 +-
...EnabledPrimaryWriteOrderFullApiSelfTest.java | 8 +-
.../dht/GridCacheClientOnlySelfTest.java | 8 +-
.../dht/GridCacheColocatedDebugTest.java | 116 +-
.../dht/GridCacheColocatedFailoverSelfTest.java | 6 +-
...eColocatedOptimisticTransactionSelfTest.java | 6 +-
.../GridCacheColocatedPrimarySyncSelfTest.java | 8 +-
.../GridCacheColocatedTxExceptionSelfTest.java | 6 +-
...ssimisticOriginatingNodeFailureSelfTest.java | 6 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 2 +-
.../GridCacheDhtAtomicRemoveFailureTest.java | 3 +-
.../dht/GridCacheDhtEntrySelfTest.java | 8 +-
.../dht/GridCacheDhtEntrySetSelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 22 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 23 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 5 +-
...idCacheDhtExpiredEntriesPreloadSelfTest.java | 6 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 36 +-
.../dht/GridCacheDhtMappingSelfTest.java | 4 +-
.../dht/GridCacheDhtMultiBackupTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 26 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 15 +-
.../GridCacheDhtPreloadMessageCountTest.java | 8 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 1 -
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 27 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 26 +-
.../dht/GridCacheDhtRemoveFailureTest.java | 3 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 12 +-
.../dht/GridCacheDhtTxPreloadSelfTest.java | 3 +-
.../dht/GridCacheGlobalLoadTest.java | 14 +-
...ePartitionedNearDisabledFullApiSelfTest.java | 8 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 13 +-
...nedNearDisabledMultiNodeFullApiSelfTest.java | 8 +-
...bledMultiNodeP2PDisabledFullApiSelfTest.java | 8 +-
...isabledTxOriginatingNodeFailureSelfTest.java | 6 +-
...idCachePartitionedPreloadEventsSelfTest.java | 18 +-
...dCachePartitionedTopologyChangeSelfTest.java | 21 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 5 -
...ridCachePartitionedUnloadEventsSelfTest.java | 10 +-
...IgniteCacheContainsKeyColocatedSelfTest.java | 5 +-
...teTxConsistencyColocatedRestartSelfTest.java | 5 +-
.../dht/IgniteTxReentryColocatedSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 60 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 9 +-
...tomicPrimaryWriteOrderRemoveFailureTest.java | 56 +
.../GridCacheAtomicRemoveFailureTest.java | 56 +
...lueConsistencyAtomicNearEnabledSelfTest.java | 14 +-
...micPrimaryWriteOrderNearEnabledSelfTest.java | 6 +-
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 +
...GridCacheValueConsistencyAtomicSelfTest.java | 8 +-
...CacheContainsKeyColocatedAtomicSelfTest.java | 5 +-
...tNearPartitionedByteArrayValuesSelfTest.java | 8 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 6 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 50 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 5 +-
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 +-
...omicNearEnabledMultiNodeFullApiSelfTest.java | 8 +-
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 8 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 14 +-
.../GridCacheAtomicNearRemoveFailureTest.java | 3 +-
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 5 +-
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 5 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 8 +-
...cPrimaryWriteOrderNearRemoveFailureTest.java | 3 +-
.../near/GridCacheExNearFullApiSelfTest.java | 6 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 41 +-
.../GridCacheNearEvictionEventSelfTest.java | 5 -
.../near/GridCacheNearEvictionSelfTest.java | 14 +-
...dCacheNearExpiredEntriesPreloadSelfTest.java | 6 -
.../near/GridCacheNearJobExecutionSelfTest.java | 3 +-
.../near/GridCacheNearMetricsSelfTest.java | 30 +-
.../near/GridCacheNearMultiGetSelfTest.java | 8 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 28 +-
.../near/GridCacheNearOneNodeSelfTest.java | 4 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 80 +-
.../near/GridCacheNearOnlySelfTest.java | 7 -
.../near/GridCacheNearOnlyTopologySelfTest.java | 40 +-
.../GridCacheNearPartitionedClearSelfTest.java | 9 +-
.../near/GridCacheNearPrimarySyncSelfTest.java | 8 +-
.../GridCacheNearReaderPreloadSelfTest.java | 11 +-
.../near/GridCacheNearReadersSelfTest.java | 34 +-
.../near/GridCacheNearRemoveFailureTest.java | 3 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 15 +-
...ssimisticOriginatingNodeFailureSelfTest.java | 6 -
.../near/GridCacheNearTxPreloadSelfTest.java | 3 +-
...AffinityExcludeNeighborsPerformanceTest.java | 10 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 20 +-
.../GridCachePartitionedAffinitySelfTest.java | 12 +-
.../near/GridCachePartitionedBasicApiTest.java | 3 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 6 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 15 +-
.../near/GridCachePartitionedEventSelfTest.java | 3 +-
.../GridCachePartitionedEvictionSelfTest.java | 8 +-
...titionedExplicitLockNodeFailureSelfTest.java | 3 +-
...GridCachePartitionedFilteredPutSelfTest.java | 4 +-
.../GridCachePartitionedFullApiSelfTest.java | 3 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 18 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 5 +-
...achePartitionedMultiNodeCounterSelfTest.java | 25 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 44 +-
...idCachePartitionedMultiNodeLockSelfTest.java | 3 +-
.../GridCachePartitionedMultiNodeSelfTest.java | 2 -
...ePartitionedMultiThreadedPutGetSelfTest.java | 15 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 4 +-
...itionedNearOnlyNoPrimaryFullApiSelfTest.java | 6 +-
...GridCachePartitionedNodeFailureSelfTest.java | 2 -
.../GridCachePartitionedNodeRestartTest.java | 5 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
...achePartitionedPreloadLifecycleSelfTest.java | 15 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 305 --
.../GridCachePartitionedStorePutSelfTest.java | 9 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 5 +-
...achePartitionedTxSingleThreadedSelfTest.java | 1 -
.../near/GridCachePutArrayValueSelfTest.java | 2 +-
...idCacheRendezvousAffinityClientSelfTest.java | 10 +-
...ffinityFunctionExcludeNeighborsSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 5 +-
.../near/IgniteCacheNearReadCommittedTest.java | 9 +-
.../near/IgniteTxReentryNearSelfTest.java | 2 +-
...stractReplicatedByteArrayValuesSelfTest.java | 3 -
.../GridCacheReplicatedEvictionSelfTest.java | 5 +-
.../GridCacheReplicatedFullApiSelfTest.java | 5 +-
.../GridCacheReplicatedInvalidateSelfTest.java | 2 +-
...dezvousAffinityMultiNodeFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedTxExceptionSelfTest.java | 6 +-
...ssimisticOriginatingNodeFailureSelfTest.java | 7 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 4 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 7 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 16 +-
...idCacheReplicatedPreloadOffHeapSelfTest.java | 3 +-
.../GridCacheReplicatedPreloadSelfTest.java | 36 +-
...GridCacheReplicatedPreloadUndeploysTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 11 +-
...heConcurrentEvictionConsistencySelfTest.java | 29 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 18 +-
.../GridCacheDistributedEvictionsSelfTest.java | 48 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 17 +-
.../eviction/GridCacheEvictionAbstractTest.java | 32 +-
.../GridCacheEvictionFilterSelfTest.java | 25 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 12 +-
.../GridCacheEvictionTouchSelfTest.java | 35 +-
.../cache/eviction/GridCacheMockEntry.java | 3 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 9 +-
.../GridCacheFifoEvictionPolicySelfTest.java | 20 +-
.../lru/GridCacheLruEvictionPolicySelfTest.java | 22 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 10 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 14 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 28 +-
.../IgniteCacheAtomicExpiryPolicyTest.java | 6 +-
.../IgniteCacheAtomicLocalExpiryPolicyTest.java | 6 +-
...maryWriteOrderWithStoreExpiryPolicyTest.java | 6 +-
...iteCacheAtomicWithStoreExpiryPolicyTest.java | 6 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 86 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 50 +-
.../expiry/IgniteCacheTxExpiryPolicyTest.java | 6 +-
.../IgniteCacheTxLocalExpiryPolicyTest.java | 6 +-
.../IgniteCacheTxWithStoreExpiryPolicyTest.java | 6 +-
.../IgniteCacheAtomicLoadAllTest.java | 6 +-
.../IgniteCacheAtomicLoaderWriterTest.java | 6 +-
.../IgniteCacheAtomicLocalLoadAllTest.java | 6 +-
...CacheAtomicLocalNoLoadPreviousValueTest.java | 6 +-
...IgniteCacheAtomicLocalNoReadThroughTest.java | 6 +-
...gniteCacheAtomicLocalNoWriteThroughTest.java | 6 +-
...tomicNearEnabledNoLoadPreviousValueTest.java | 8 +-
...CacheAtomicNearEnabledNoReadThroughTest.java | 8 +-
...acheAtomicNearEnabledNoWriteThroughTest.java | 8 +-
...gniteCacheAtomicNoLoadPreviousValueTest.java | 6 +-
.../IgniteCacheAtomicNoReadThroughTest.java | 6 +-
.../IgniteCacheAtomicNoWriteThroughTest.java | 6 +-
.../IgniteCacheAtomicStoreSessionTest.java | 6 +-
...eCacheAtomicStoreSessionWriteBehindTest.java | 38 +
.../IgniteCacheLoadAllAbstractTest.java | 111 +-
.../IgniteCacheLoaderWriterAbstractTest.java | 14 +-
...iteCacheNoLoadPreviousValueAbstractTest.java | 5 +-
.../IgniteCacheNoReadThroughAbstractTest.java | 63 +-
.../IgniteCacheNoWriteThroughAbstractTest.java | 8 +-
.../IgniteCacheStoreSessionAbstractTest.java | 34 +-
...acheStoreSessionWriteBehindAbstractTest.java | 265 ++
.../integration/IgniteCacheTxLoadAllTest.java | 6 +-
.../IgniteCacheTxLoaderWriterTest.java | 6 +-
.../IgniteCacheTxLocalLoadAllTest.java | 6 +-
...niteCacheTxLocalNoLoadPreviousValueTest.java | 6 +-
.../IgniteCacheTxLocalNoReadThroughTest.java | 6 +-
.../IgniteCacheTxLocalNoWriteThroughTest.java | 6 +-
...cheTxNearEnabledNoLoadPreviousValueTest.java | 8 +-
...niteCacheTxNearEnabledNoReadThroughTest.java | 8 +-
...iteCacheTxNearEnabledNoWriteThroughTest.java | 8 +-
.../IgniteCacheTxNoLoadPreviousValueTest.java | 6 +-
.../IgniteCacheTxNoReadThroughTest.java | 6 +-
.../IgniteCacheTxNoWriteThroughTest.java | 6 +-
.../IgniteCacheTxStoreSessionTest.java | 26 +-
...gniteCacheTxStoreSessionWriteBehindTest.java | 32 +
...dCacheAtomicLocalMetricsNoStoreSelfTest.java | 13 +-
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 8 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 6 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 5 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 6 +-
.../GridCacheLocalMultithreadedSelfTest.java | 2 +-
.../local/GridCacheLocalTxTimeoutSelfTest.java | 2 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 13 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 217 +-
...ontinuousQueryAtomicNearEnabledSelfTest.java | 8 +-
.../GridCacheContinuousQueryAtomicSelfTest.java | 6 +-
...eContinuousQueryPartitionedOnlySelfTest.java | 6 +-
...dCacheContinuousQueryReplicatedSelfTest.java | 14 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 410 --
...ridCacheReduceFieldsQueryAtomicSelfTest.java | 38 -
...GridCacheReduceFieldsQueryLocalSelfTest.java | 37 -
...cheReduceFieldsQueryPartitionedSelfTest.java | 59 -
...acheReduceFieldsQueryReplicatedSelfTest.java | 37 -
.../processors/closure/package-info.java | 22 +
.../internal/processors/closure/package.html | 24 -
.../DataStreamProcessorSelfTest.java | 49 +-
.../datastreamer/DataStreamerImplSelfTest.java | 2 +-
.../IgniteDataStreamerPerformanceTest.java | 9 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 234 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 16 +-
.../processors/igfs/IgfsCacheSelfTest.java | 24 +-
.../igfs/IgfsDataManagerSelfTest.java | 3 +-
.../igfs/IgfsDualAbstractSelfTest.java | 72 +-
.../igfs/IgfsExUniversalFileSystemAdapter.java | 104 +
.../igfs/IgfsMetaManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 12 +-
.../processors/igfs/IgfsModesSelfTest.java | 8 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 4 +-
.../igfs/IgfsProcessorValidationSelfTest.java | 8 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 2 -
.../processors/igfs/IgfsSizeSelfTest.java | 10 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../processors/igfs/IgfsTaskSelfTest.java | 6 +-
.../igfs/UniversalFileSystemAdapter.java | 96 +
.../internal/processors/igfs/package-info.java | 22 +
.../internal/processors/igfs/package.html | 24 -
.../IgfsAbstractRecordResolverSelfTest.java | 5 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 1 -
.../processors/service/DummyService.java | 6 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
.../GridServiceProcessorMultiNodeSelfTest.java | 2 +-
.../streamer/GridStreamerEvictionSelfTest.java | 163 -
.../streamer/GridStreamerFailoverSelfTest.java | 267 --
.../GridStreamerLifecycleAwareSelfTest.java | 212 -
.../streamer/GridStreamerSelfTest.java | 796 ----
.../processors/streamer/GridTestStage.java | 52 -
.../streamer/GridTestStreamerEventRouter.java | 49 -
.../ignite/internal/processors/streamer/SC.java | 31 -
.../internal/util/GridTestClockTimer.java | 11 +
.../util/IgniteExceptionRegistrySelfTest.java | 51 +-
.../util/future/GridCompoundFutureSelfTest.java | 3 +-
.../future/GridFutureListenPerformanceTest.java | 4 +-
.../util/future/GridFutureQueueTest.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 24 +-
.../ipc/shmem/IpcSharedMemoryNodeStartup.java | 4 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +-
.../ignite/internal/util/nio/package-info.java | 22 +
.../ignite/internal/util/nio/package.html | 24 -
.../offheap/GridOffHeapMapAbstractSelfTest.java | 3 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
.../unsafe/GridUnsafeMemorySelfTest.java | 10 +-
...GridUnsafePartitionedMapPerformanceTest.java | 2 +-
.../internal/util/tostring/package-info.java | 22 +
.../ignite/internal/util/tostring/package.html | 24 -
.../ignite/jvmtest/BlockingQueueTest.java | 4 +-
.../ignite/jvmtest/ConcurrentMapTest.java | 2 +-
.../ignite/lang/GridBasicPerformanceTest.java | 2 +-
.../lang/GridFutureListenPerformanceTest.java | 4 +-
.../GridImmutableCollectionsPerfomanceTest.java | 120 -
.../lang/GridMetadataAwareAdapterSelfTest.java | 14 +-
.../org/apache/ignite/lang/package-info.java | 22 +
.../java/org/apache/ignite/lang/package.html | 24 -
.../GridCircularBufferPerformanceTest.java | 10 +-
.../lang/utils/GridCircularBufferSelfTest.java | 2 +-
.../utils/GridConcurrentHashMapSelfTest.java | 4 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 19 +-
.../ignite/lang/utils/GridPCollectionsTest.java | 54 -
.../ignite/lang/utils/GridTrieMapSelfTest.java | 242 --
.../apache/ignite/lang/utils/package-info.java | 22 +
.../org/apache/ignite/lang/utils/package.html | 24 -
.../apache/ignite/loadtest/package-info.java | 22 +
.../org/apache/ignite/loadtest/package.html | 24 -
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 2 +-
.../loadtests/GridCacheLoadPopulationTask.java | 2 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 5 +-
.../cache/GridCacheAbstractLoadTest.java | 2 +-
.../loadtests/cache/GridCacheBenchmark.java | 3 +-
.../cache/GridCacheDataStructuresLoadTest.java | 2 +-
.../loadtests/cache/GridCacheLoadTest.java | 5 +-
.../cache/GridCachePutRemoveLoadTest.java | 373 --
.../cache/GridCacheSingleNodeLoadTest.java | 182 -
.../loadtests/cache/GridCacheSwapLoadTest.java | 7 +-
.../GridCacheWriteBehindStoreLoadTest.java | 2 +-
.../capacity/GridCapacityLoadTest.java | 3 +-
.../capacity/spring-capacity-cache.xml | 4 +-
.../colocation/GridTestCacheStore.java | 7 +-
.../loadtests/colocation/GridTestKey.java | 2 +-
.../colocation/GridTestLifecycleBean.java | 2 +-
.../loadtests/colocation/GridTestMain.java | 6 +-
.../loadtests/colocation/spring-colocation.xml | 6 +-
.../communication/GridIoManagerBenchmark.java | 4 +-
.../communication/GridIoManagerBenchmark0.java | 9 +-
.../GridTcpCommunicationBenchmark.java | 6 +-
.../GridContinuousOperationsLoadTest.java | 11 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 7 +-
.../direct/multisplit/package-info.java | 22 +
.../loadtests/direct/multisplit/package.html | 24 -
.../loadtests/direct/newnodes/package-info.java | 22 +
.../loadtests/direct/newnodes/package.html | 24 -
.../loadtests/direct/redeploy/package-info.java | 22 +
.../loadtests/direct/redeploy/package.html | 24 -
.../loadtests/direct/session/package-info.java | 22 +
.../loadtests/direct/session/package.html | 24 -
.../loadtests/direct/stealing/package-info.java | 22 +
.../loadtests/direct/stealing/package.html | 24 -
.../ignite/loadtests/dsi/GridDsiClient.java | 4 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 10 +-
.../ignite/loadtests/dsi/GridDsiRequest.java | 2 +-
.../ignite/loadtests/dsi/GridDsiResponse.java | 4 +-
.../ignite/loadtests/dsi/GridDsiSession.java | 2 +-
.../cacheget/GridBenchmarkCacheGetLoadTest.java | 2 +-
.../ignite/loadtests/dsi/package-info.java | 22 +
.../apache/ignite/loadtests/dsi/package.html | 24 -
...dBoundedConcurrentLinkedHashSetLoadTest.java | 8 +-
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../job/GridJobExecutionLoadTestClient.java | 4 +-
...GridJobExecutionLoadTestClientSemaphore.java | 4 +-
...JobExecutionSingleNodeSemaphoreLoadTest.java | 6 +-
.../ignite/loadtests/job/package-info.java | 22 +
.../apache/ignite/loadtests/job/package.html | 24 -
.../GridConcurrentLinkedHashMapBenchmark.java | 6 +-
.../mapper/GridContinuousMapperTask1.java | 2 +-
.../mapper/GridContinuousMapperTask2.java | 2 +-
.../ignite/loadtests/mapper/TestObject.java | 2 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 2 +-
.../ignite/loadtests/streamer/EventClosure.java | 60 -
.../streamer/GridStreamerBenchmark.java | 140 -
.../streamer/GridStreamerIndexLoadTest.java | 179 -
.../loadtests/streamer/GridStreamerLoad.java | 62 -
.../ignite/loadtests/streamer/IndexUpdater.java | 46 -
.../ignite/loadtests/streamer/QueryClosure.java | 107 -
.../loadtests/streamer/average/TestAverage.java | 70 -
.../loadtests/streamer/average/TestStage.java | 63 -
.../swap/GridSwapEvictAllBenchmark.java | 7 +-
.../apache/ignite/logger/java/package-info.java | 22 +
.../org/apache/ignite/logger/java/package.html | 24 -
.../marshaller/GridMarshallerAbstractTest.java | 63 +-
.../marshaller/MarshallerContextTestImpl.java | 2 +-
.../ignite/marshaller/jdk/package-info.java | 22 +
.../apache/ignite/marshaller/jdk/package.html | 24 -
.../OptimizedMarshallerNodeFailoverTest.java | 202 +
...arshallerSerialPersistentFieldsSelfTest.java | 110 +
.../optimized/OptimizedMarshallerTest.java | 4 +-
.../OptimizedObjectStreamSelfTest.java | 22 +-
.../marshaller/optimized/package-info.java | 22 +
.../ignite/marshaller/optimized/package.html | 24 -
.../apache/ignite/marshaller/package-info.java | 22 +
.../org/apache/ignite/marshaller/package.html | 24 -
.../ignite/messaging/GridMessagingSelfTest.java | 13 +-
.../org/apache/ignite/p2p/package-info.java | 22 +
.../java/org/apache/ignite/p2p/package.html | 24 -
.../java/org/apache/ignite/package-info.java | 22 +
.../test/java/org/apache/ignite/package.html | 24 -
.../org/apache/ignite/session/package-info.java | 22 +
.../java/org/apache/ignite/session/package.html | 24 -
.../spi/GridTcpSpiForwardingSelfTest.java | 1 -
.../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +-
.../spi/checkpoint/cache/package-info.java | 22 +
.../ignite/spi/checkpoint/cache/package.html | 24 -
.../spi/checkpoint/jdbc/package-info.java | 22 +
.../ignite/spi/checkpoint/jdbc/package.html | 24 -
.../ignite/spi/checkpoint/package-info.java | 22 +
.../apache/ignite/spi/checkpoint/package.html | 24 -
.../spi/checkpoint/sharedfs/package-info.java | 22 +
.../ignite/spi/checkpoint/sharedfs/package.html | 24 -
.../spi/collision/fifoqueue/package-info.java | 22 +
.../ignite/spi/collision/fifoqueue/package.html | 24 -
.../spi/collision/jobstealing/package-info.java | 22 +
.../spi/collision/jobstealing/package.html | 24 -
.../ignite/spi/collision/package-info.java | 22 +
.../apache/ignite/spi/collision/package.html | 24 -
.../collision/priorityqueue/package-info.java | 22 +
.../spi/collision/priorityqueue/package.html | 24 -
.../ignite/spi/communication/package-info.java | 22 +
.../ignite/spi/communication/package.html | 24 -
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../GridTcpCommunicationSpiAbstractTest.java | 17 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 1 -
.../GridTcpCommunicationSpiConfigSelfTest.java | 2 -
.../tcp/GridTcpCommunicationSpiLanTest.java | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 15 +-
...pCommunicationSpiMultithreadedShmemTest.java | 28 -
...ommunicationSpiMultithreadedTcpSelfTest.java | 28 -
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 -
...GridTcpCommunicationSpiRecoverySelfTest.java | 1 -
.../GridTcpCommunicationSpiShmemSelfTest.java | 31 -
.../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 6 +-
.../spi/communication/tcp/package-info.java | 22 +
.../ignite/spi/communication/tcp/package.html | 24 -
.../spi/deployment/local/package-info.java | 22 +
.../ignite/spi/deployment/local/package.html | 24 -
.../discovery/AbstractDiscoverySelfTest.java | 2 +-
.../ignite/spi/discovery/package-info.java | 22 +
.../apache/ignite/spi/discovery/package.html | 24 -
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 2 +-
.../tcp/ipfinder/jdbc/package-info.java | 22 +
.../discovery/tcp/ipfinder/jdbc/package.html | 24 -
.../discovery/tcp/ipfinder/package-info.java | 22 +
.../spi/discovery/tcp/ipfinder/package.html | 24 -
.../tcp/ipfinder/sharedfs/package-info.java | 22 +
.../tcp/ipfinder/sharedfs/package.html | 24 -
.../discovery/tcp/ipfinder/vm/package-info.java | 22 +
.../spi/discovery/tcp/ipfinder/vm/package.html | 24 -
.../ignite/spi/discovery/tcp/package-info.java | 22 +
.../ignite/spi/discovery/tcp/package.html | 24 -
.../spi/eventstorage/memory/package-info.java | 22 +
.../ignite/spi/eventstorage/memory/package.html | 24 -
.../spi/failover/always/package-info.java | 22 +
.../ignite/spi/failover/always/package.html | 24 -
.../spi/failover/jobstealing/package-info.java | 22 +
.../spi/failover/jobstealing/package.html | 24 -
.../ignite/spi/failover/never/package-info.java | 22 +
.../ignite/spi/failover/never/package.html | 24 -
.../ignite/spi/failover/package-info.java | 22 +
.../org/apache/ignite/spi/failover/package.html | 24 -
.../loadbalancing/adaptive/package-info.java | 22 +
.../spi/loadbalancing/adaptive/package.html | 24 -
.../ignite/spi/loadbalancing/package-info.java | 22 +
.../ignite/spi/loadbalancing/package.html | 24 -
.../loadbalancing/roundrobin/package-info.java | 22 +
.../spi/loadbalancing/roundrobin/package.html | 24 -
.../weightedrandom/package-info.java | 22 +
.../loadbalancing/weightedrandom/package.html | 24 -
.../org/apache/ignite/spi/package-info.java | 22 +
.../java/org/apache/ignite/spi/package.html | 24 -
.../GridSwapSpaceSpiAbstractSelfTest.java | 9 +-
.../file/GridFileSwapSpaceSpiSelfTest.java | 3 +-
.../inmemory/GridTestSwapSpaceSpi.java | 4 +-
.../ignite/spi/swapspace/package-info.java | 22 +
.../apache/ignite/spi/swapspace/package.html | 24 -
.../ignite/startup/cmdline/package-info.java | 22 +
.../apache/ignite/startup/cmdline/package.html | 24 -
.../org/apache/ignite/startup/package-info.java | 22 +
.../java/org/apache/ignite/startup/package.html | 24 -
.../ignite/startup/servlet/package-info.java | 22 +
.../apache/ignite/startup/servlet/package.html | 24 -
.../GridCacheStoreValueBytesNode.java | 137 -
.../GridCacheStoreValueBytesTest.java | 343 --
.../index/GridStreamerIndexSelfTest.java | 686 ----
.../window/GridStreamerWindowSelfTest.java | 911 -----
.../testframework/GridSpiTestContext.java | 5 -
.../ignite/testframework/GridTestUtils.java | 29 +-
.../testframework/config/package-info.java | 22 +
.../ignite/testframework/config/package.html | 24 -
.../ignite/testframework/http/package-info.java | 22 +
.../ignite/testframework/http/package.html | 24 -
.../testframework/junits/GridAbstractTest.java | 149 +-
.../junits/GridTestKernalContext.java | 2 -
.../ignite/testframework/junits/IgniteMock.java | 42 +-
.../cache/GridAbstractCacheStoreSelfTest.java | 34 +-
.../junits/common/GridAbstractExamplesTest.java | 2 +-
.../GridAbstractLifecycleAwareSelfTest.java | 7 +
.../junits/common/GridCommonAbstractTest.java | 95 +-
.../junits/common/package-info.java | 22 +
.../testframework/junits/common/package.html | 24 -
.../testframework/junits/package-info.java | 22 +
.../ignite/testframework/junits/package.html | 24 -
.../junits/spi/GridSpiAbstractTest.java | 5 +-
.../testframework/junits/spi/package-info.java | 22 +
.../testframework/junits/spi/package.html | 24 -
.../ignite/testframework/package-info.java | 22 +
.../apache/ignite/testframework/package.html | 24 -
.../ignite/testsuites/IgniteBasicTestSuite.java | 3 -
.../IgniteCacheFailoverTestSuite.java | 12 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 22 +-
.../IgniteMarshallerSelfTestSuite.java | 2 +
.../IgniteSpiCommunicationSelfTestSuite.java | 4 +-
.../testsuites/IgniteStreamerSelfTestSuite.java | 46 -
.../apache/ignite/testsuites/package-info.java | 22 +
.../org/apache/ignite/testsuites/package.html | 24 -
...dConcurrentLinkedDequeMultiThreadedTest.java | 6 +-
.../util/GridConcurrentLinkedDequeSelfTest.java | 6 +-
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../org/apache/ignite/util/package-info.java | 22 +
.../java/org/apache/ignite/util/package.html | 24 -
.../webapp/META-INF/ignite-webapp-config.xml | 67 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 4 +-
.../tests/p2p/CacheDeploymentTestTask1.java | 2 +-
.../tests/p2p/CacheDeploymentTestTask3.java | 2 +-
.../tests/p2p/GridExternalAffinityFunction.java | 14 +-
.../p2p/GridExternalAffinityKeyMapper.java | 2 +-
.../p2p/GridP2PContinuousDeploymentTask1.java | 2 +-
.../apache/ignite/tests/p2p/package-info.java | 22 +
.../org/apache/ignite/tests/p2p/package.html | 24 -
.../spi/deployment/uri/tasks/package-info.java | 22 +
.../spi/deployment/uri/tasks/package.html | 24 -
modules/geospatial/README.txt | 48 +
modules/geospatial/readme.txt | 33 -
.../query/h2/GridH2IndexingGeoSelfTest.java | 16 +-
modules/hadoop/README.txt | 33 +
modules/hadoop/pom.xml | 6 +
modules/hadoop/readme.txt | 33 -
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 34 +-
.../apache/ignite/hadoop/fs/package-info.java | 22 +
.../org/apache/ignite/hadoop/fs/package.html | 24 -
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 13 +-
.../ignite/hadoop/fs/v1/package-info.java | 22 +
.../org/apache/ignite/hadoop/fs/v1/package.html | 24 -
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 4 +-
.../ignite/hadoop/fs/v2/package-info.java | 22 +
.../org/apache/ignite/hadoop/fs/v2/package.html | 24 -
.../ignite/hadoop/mapreduce/package-info.java | 22 +
.../apache/ignite/hadoop/mapreduce/package.html | 24 -
.../org/apache/ignite/hadoop/package-info.java | 22 +
.../java/org/apache/ignite/hadoop/package.html | 24 -
.../processors/hadoop/HadoopClassLoader.java | 2 +-
.../processors/hadoop/HadoopContext.java | 4 +-
.../internal/processors/hadoop/HadoopSetup.java | 8 +-
.../hadoop/SecondaryFileSystemProvider.java | 31 +-
.../hadoop/counter/HadoopCountersImpl.java | 2 +-
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 16 +-
.../hadoop/igfs/HadoopIgfsOutProc.java | 2 +-
.../processors/hadoop/igfs/HadoopIgfsUtils.java | 7 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 2 +-
.../taskexecutor/HadoopExecutorService.java | 2 +-
.../external/HadoopExternalTaskExecutor.java | 2 +-
.../HadoopExternalCommunication.java | 6 +-
.../hadoop/v1/HadoopV1ReduceTask.java | 5 +-
.../processors/hadoop/v2/HadoopV2Job.java | 2 +-
.../hadoop/v2/HadoopV2ReduceTask.java | 5 +-
.../ignite/igfs/Hadoop1DualAbstractTest.java | 105 +
.../igfs/Hadoop1OverIgfsDualAsyncTest.java | 30 +
.../igfs/Hadoop1OverIgfsDualSyncTest.java | 30 +
...oopFileSystemUniversalFileSystemAdapter.java | 113 +
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 23 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 5 +-
...oopSecondaryFileSystemConfigurationTest.java | 36 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 20 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 24 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 5 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 12 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 11 +-
...niteHadoopFileSystemLoggerStateSelfTest.java | 4 +-
...teHadoopFileSystemSecondaryModeSelfTest.java | 8 +-
.../hadoop/HadoopAbstractSelfTest.java | 6 -
.../hadoop/HadoopCommandLineTest.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 6 +-
.../processors/hadoop/HadoopMapReduceTest.java | 24 +-
.../processors/hadoop/HadoopSharedMap.java | 2 +-
.../taskexecutor/HadoopExecutorServiceTest.java | 6 +-
.../testsuites/IgniteHadoopTestSuite.java | 4 +-
modules/hibernate/README.txt | 48 +
modules/hibernate/readme.txt | 33 -
.../HibernateAccessStrategyAdapter.java | 3 +-
.../hibernate/HibernateCollectionRegion.java | 2 +-
.../cache/hibernate/HibernateEntityRegion.java | 2 +-
.../hibernate/HibernateGeneralDataRegion.java | 2 +-
.../hibernate/HibernateNaturalIdRegion.java | 2 +-
.../HibernateNonStrictAccessStrategy.java | 2 +-
.../hibernate/HibernateQueryResultsRegion.java | 2 +-
.../HibernateReadOnlyAccessStrategy.java | 2 +-
.../HibernateReadWriteAccessStrategy.java | 34 +-
.../ignite/cache/hibernate/HibernateRegion.java | 2 +-
.../cache/hibernate/HibernateRegionFactory.java | 27 +-
.../hibernate/HibernateTimestampsRegion.java | 2 +-
.../HibernateTransactionalAccessStrategy.java | 4 +-
.../HibernateTransactionalDataRegion.java | 2 +-
.../ignite/cache/hibernate/package-info.java | 24 +
.../apache/ignite/cache/hibernate/package.html | 26 -
.../hibernate/CacheHibernateBlobStore.java | 6 +-
.../cache/store/hibernate/package-info.java | 22 +
.../ignite/cache/store/hibernate/package.html | 24 -
.../HibernateL2CacheConfigurationSelfTest.java | 16 +-
.../hibernate/HibernateL2CacheSelfTest.java | 10 +-
.../HibernateL2CacheTransactionalSelfTest.java | 3 +-
.../cache/store/hibernate/package-info.java | 22 +
.../ignite/cache/store/hibernate/package.html | 24 -
modules/indexing/README.txt | 33 +
modules/indexing/readme.txt | 33 -
.../processors/query/h2/IgniteH2Indexing.java | 923 ++---
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 106 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 64 +-
.../query/h2/opt/GridH2RowDescriptor.java | 18 +-
.../processors/query/h2/opt/GridH2Table.java | 33 +-
.../query/h2/opt/GridH2TreeIndex.java | 4 +-
.../query/h2/opt/GridLuceneIndex.java | 15 +-
.../processors/query/h2/package-info.java | 22 +
.../internal/processors/query/h2/package.html | 24 -
.../processors/query/h2/sql/GridSqlColumn.java | 6 +
.../processors/query/h2/sql/GridSqlElement.java | 54 +-
.../query/h2/sql/GridSqlFunction.java | 26 +-
.../query/h2/sql/GridSqlFunctionType.java | 3 +
.../processors/query/h2/sql/GridSqlJoin.java | 30 +-
.../query/h2/sql/GridSqlOperationType.java | 6 +-
.../query/h2/sql/GridSqlQueryParser.java | 129 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 198 +-
.../processors/query/h2/sql/GridSqlSelect.java | 100 +-
.../query/h2/sql/GridSqlSortColumn.java | 76 +
.../processors/query/h2/sql/GridSqlType.java | 94 +
.../query/h2/twostep/GridMapQueryExecutor.java | 438 +-
.../query/h2/twostep/GridMergeIndex.java | 111 +-
.../h2/twostep/GridMergeIndexUnsorted.java | 44 +-
.../h2/twostep/GridReduceQueryExecutor.java | 424 +-
.../query/h2/twostep/GridResultPage.java | 47 +-
.../twostep/messages/GridNextPageRequest.java | 70 -
.../twostep/messages/GridNextPageResponse.java | 191 -
.../query/h2/twostep/messages/GridQueryAck.java | 45 -
.../twostep/messages/GridQueryFailResponse.java | 57 -
.../h2/twostep/messages/GridQueryRequest.java | 72 -
.../GridCacheAbstractFieldsQuerySelfTest.java | 90 +-
.../cache/GridCacheAbstractQuerySelfTest.java | 2058 ----------
.../cache/GridCacheCrossCacheQuerySelfTest.java | 163 +-
.../GridCacheCrossCacheQuerySelfTestNewApi.java | 411 --
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 84 +-
...idCacheQueryEvictsMultiThreadedSelfTest.java | 28 -
.../GridCacheQueryIndexDisabledSelfTest.java | 257 ++
.../cache/GridCacheQueryLoadSelfTest.java | 355 --
.../cache/GridCacheQueryMetricsSelfTest.java | 6 -
.../GridCacheQueryMultiThreadedSelfTest.java | 869 ----
...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 -
...dCacheQueryOffheapMultiThreadedSelfTest.java | 28 -
.../cache/GridCacheQuerySimpleBenchmark.java | 212 +
.../cache/GridCacheQueryTestValue.java | 2 +-
...idCacheReduceQueryMultithreadedSelfTest.java | 8 +-
.../GridCacheSqlQueryMultiThreadedSelfTest.java | 142 -
.../processors/cache/GridCacheSwapSelfTest.java | 18 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 20 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 776 ++++
.../cache/IgniteCacheAbstractQuerySelfTest.java | 1562 +++++++
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 84 +
...CacheOffheapTieredMultithreadedSelfTest.java | 319 ++
...hePartitionedQueryMultiThreadedSelfTest.java | 307 ++
...teCacheQueryEvictsMultiThreadedSelfTest.java | 28 +
.../cache/IgniteCacheQueryIndexSelfTest.java | 133 +
.../cache/IgniteCacheQueryLoadSelfTest.java | 337 ++
.../IgniteCacheQueryMultiThreadedSelfTest.java | 724 ++++
...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 +
...eCacheQueryOffheapMultiThreadedSelfTest.java | 28 +
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 196 +
.../GridCacheAtomicFieldsQuerySelfTest.java | 66 -
...cheAtomicNearEnabledFieldsQuerySelfTest.java | 32 -
...GridCacheAtomicNearEnabledQuerySelfTest.java | 38 -
.../near/GridCacheAtomicQuerySelfTest.java | 38 -
...GridCachePartitionedFieldsQuerySelfTest.java | 15 +-
...CachePartitionedQueryP2PEnabledSelfTest.java | 34 -
.../near/GridCachePartitionedQuerySelfTest.java | 479 ---
.../near/GridCacheQueryNodeRestartSelfTest.java | 225 --
.../IgniteCacheAtomicFieldsQuerySelfTest.java | 59 +
...cheAtomicNearEnabledFieldsQuerySelfTest.java | 30 +
...niteCacheAtomicNearEnabledQuerySelfTest.java | 39 +
.../near/IgniteCacheAtomicQuerySelfTest.java | 39 +
...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 +
...niteCachePartitionedFieldsQuerySelfTest.java | 56 +
...achePartitionedQueryP2PDisabledSelfTest.java | 34 +
.../IgniteCachePartitionedQuerySelfTest.java | 133 +
.../IgniteCacheQueryNodeRestartSelfTest.java | 218 +
.../GridCacheReplicatedFieldsQuerySelfTest.java | 6 +-
...dCacheReplicatedQueryP2PEnabledSelfTest.java | 34 -
.../GridCacheReplicatedQuerySelfTest.java | 683 ----
...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 +
...gniteCacheReplicatedFieldsQuerySelfTest.java | 79 +
...CacheReplicatedQueryP2PDisabledSelfTest.java | 34 +
.../IgniteCacheReplicatedQuerySelfTest.java | 576 +++
.../GridCacheLocalAtomicQuerySelfTest.java | 32 -
.../GridCacheLocalFieldsQuerySelfTest.java | 38 -
.../local/GridCacheLocalQuerySelfTest.java | 107 -
.../IgniteCacheLocalAtomicQuerySelfTest.java | 32 +
.../IgniteCacheLocalFieldsQuerySelfTest.java | 38 +
.../local/IgniteCacheLocalQuerySelfTest.java | 82 +
...dCacheAbstractReduceFieldsQuerySelfTest.java | 412 ++
...ridCacheReduceFieldsQueryAtomicSelfTest.java | 38 +
...GridCacheReduceFieldsQueryLocalSelfTest.java | 37 +
...cheReduceFieldsQueryPartitionedSelfTest.java | 59 +
...acheReduceFieldsQueryReplicatedSelfTest.java | 37 +
.../query/h2/GridH2IndexRebuildTest.java | 25 +-
.../query/h2/GridH2IndexingOffheapSelfTest.java | 20 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 106 +-
.../query/h2/sql/GridQueryParsingTest.java | 69 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 10 -
.../IgniteCacheQuerySelfTestSuite.java | 55 +-
modules/jcl/README.txt | 33 +
modules/jcl/readme.txt | 33 -
.../apache/ignite/logger/jcl/package-info.java | 22 +
.../org/apache/ignite/logger/jcl/package.html | 24 -
.../apache/ignite/logger/jcl/package-info.java | 22 +
.../org/apache/ignite/logger/jcl/package.html | 24 -
modules/jta/README.txt | 32 +
modules/jta/readme.txt | 32 -
.../ignite/cache/jta/jndi/package-info.java | 22 +
.../apache/ignite/cache/jta/jndi/package.html | 24 -
.../apache/ignite/cache/jta/package-info.java | 22 +
.../org/apache/ignite/cache/jta/package.html | 24 -
.../ignite/cache/jta/reflect/package-info.java | 22 +
.../ignite/cache/jta/reflect/package.html | 24 -
.../processors/cache/GridCacheJtaSelfTest.java | 2 +-
.../GridTmLookupLifecycleAwareSelfTest.java | 12 +-
modules/log4j/README.txt | 32 +
modules/log4j/readme.txt | 32 -
.../ignite/logger/log4j/package-info.java | 22 +
.../org/apache/ignite/logger/log4j/package.html | 24 -
.../ignite/logger/log4j/package-info.java | 22 +
.../org/apache/ignite/logger/log4j/package.html | 24 -
modules/rest-http/README.txt | 33 +
modules/rest-http/readme.txt | 33 -
.../http/jetty/GridJettyRestHandler.java | 5 +-
.../rest/protocols/http/jetty/package-info.java | 22 +
.../rest/protocols/http/jetty/package.html | 24 -
modules/scalar/README.txt | 32 +
modules/scalar/readme.txt | 32 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 4 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 25 +-
.../scalar/src/test/resources/spring-cache.xml | 67 +-
.../test/resources/spring-ping-pong-partner.xml | 2 +-
.../tests/ScalarAffinityRoutingSpec.scala | 6 +-
.../ignite/scalar/tests/ScalarCacheSpec.scala | 4 +-
modules/schedule/README.txt | 47 +
modules/schedule/readme.txt | 32 -
.../processors/schedule/ScheduleFutureImpl.java | 11 -
modules/schema-import/README.txt | 214 +
modules/schema-import/pom.xml | 5 +-
modules/schema-import/readme.txt | 214 -
.../schema-import/src/main/java/media/style.css | 19 +-
.../ignite/schema/generator/CodeGenerator.java | 659 +++
.../ignite/schema/generator/PojoGenerator.java | 414 --
.../schema/generator/SnippetGenerator.java | 138 -
.../ignite/schema/generator/XmlGenerator.java | 22 +-
.../apache/ignite/schema/model/IndexItem.java | 54 +
.../ignite/schema/model/PojoDescriptor.java | 21 +-
.../ignite/schema/ui/ConfirmCallable.java | 2 +-
.../org/apache/ignite/schema/ui/Controls.java | 42 +-
.../org/apache/ignite/schema/ui/MessageBox.java | 37 +-
.../ignite/schema/ui/SchemaImportApp.java | 305 +-
.../test/generator/CodeGeneratorTest.java | 70 +
.../test/generator/PojoGeneratorTest.java | 70 -
.../schema/test/generator/XmlGeneratorTest.java | 2 +-
.../apache/ignite/schema/test/model/Ignite.xml | 390 --
.../schema/test/model/ignite-type-metadata.xml | 362 ++
.../testsuites/IgniteSchemaImportTestSuite.java | 2 +-
modules/slf4j/README.txt | 32 +
modules/slf4j/readme.txt | 32 -
.../ignite/logger/slf4j/package-info.java | 22 +
.../org/apache/ignite/logger/slf4j/package.html | 24 -
modules/spring/README.txt | 33 +
modules/spring/readme.txt | 33 -
.../org/apache/ignite/IgniteSpringBean.java | 70 +-
.../apache/ignite/cache/spring/SpringCache.java | 142 +-
.../ignite/cache/spring/SpringCacheManager.java | 105 +-
.../cache/spring/SpringDynamicCacheManager.java | 339 --
.../ignite/cache/spring/package-info.java | 22 +
.../org/apache/ignite/cache/spring/package.html | 24 -
.../spring/IgniteSpringProcessorImpl.java | 268 --
.../util/spring/IgniteSpringHelperImpl.java | 301 ++
.../ignite/internal/GridFactorySelfTest.java | 64 +
.../internal/IgniteDynamicCacheConfigTest.java | 244 ++
.../apache/ignite/internal/TestNodeFilter.java | 36 +
.../java/org/apache/ignite/internal/cache.xml | 58 +
.../apache/ignite/internal/filtered-cache.xml | 62 +
.../apache/ignite/internal/invalid-cache.xml | 78 +
.../processors/resource/package-info.java | 22 +
.../internal/processors/resource/package.html | 24 -
.../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +-
.../spring/GridSpringCacheManagerSelfTest.java | 123 +-
.../GridSpringDynamicCacheManagerSelfTest.java | 219 -
.../GridSpringDynamicCacheTestService.java | 34 +-
.../org/apache/ignite/spring/spring-caching.xml | 10 +
.../ignite/spring/spring-dynamic-caching.xml | 43 -
.../testsuites/IgniteSpringTestSuite.java | 3 +-
modules/ssh/README.txt | 32 +
modules/ssh/licenses/jcraft-revised-bsd.txt | 4 +-
modules/ssh/readme.txt | 32 -
.../util/nodestart/IgniteNodeCallableImpl.java | 42 +-
.../util/nodestart/IgniteSshHelperImpl.java | 28 +
.../util/nodestart/IgniteSshProcessorImpl.java | 28 -
.../tools/ant/beautifier/package-info.java | 22 +
.../ignite/tools/ant/beautifier/package.html | 24 -
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 4 +-
.../apache/ignite/util/antgar/package-info.java | 22 +
.../org/apache/ignite/util/antgar/package.html | 24 -
modules/urideploy/README.txt | 33 +
modules/urideploy/readme.txt | 33 -
.../ignite/spi/deployment/uri/package-info.java | 22 +
.../ignite/spi/deployment/uri/package.html | 24 -
.../uri/scanners/file/package-info.java | 22 +
.../deployment/uri/scanners/file/package.html | 24 -
.../uri/scanners/ftp/package-info.java | 22 +
.../deployment/uri/scanners/ftp/package.html | 24 -
.../uri/scanners/http/package-info.java | 22 +
.../deployment/uri/scanners/http/package.html | 24 -
.../deployment/uri/scanners/package-info.java | 22 +
.../spi/deployment/uri/scanners/package.html | 24 -
.../ignite/spi/deployment/uri/package-info.java | 22 +
.../ignite/spi/deployment/uri/package.html | 24 -
.../uri/scanners/file/package-info.java | 22 +
.../deployment/uri/scanners/file/package.html | 24 -
.../uri/scanners/ftp/package-info.java | 22 +
.../deployment/uri/scanners/ftp/package.html | 24 -
.../uri/scanners/http/package-info.java | 22 +
.../deployment/uri/scanners/http/package.html | 24 -
.../org/apache/ignite/tools/package-info.java | 22 +
.../java/org/apache/ignite/tools/package.html | 24 -
.../licenses/jcraft-revised-bsd.txt | 4 +-
.../ignite/visor/commands/VisorConsole.scala | 6 +-
.../commands/cache/VisorCacheCommand.scala | 82 +-
.../config/VisorConfigurationCommand.scala | 15 -
.../commands/deploy/VisorDeployCommand.scala | 106 +-
.../visor/commands/logo_ignite_128x128.png | Bin 18667 -> 0 bytes
.../ignite/visor/commands/logo_ignite_48x48.png | Bin 16572 -> 0 bytes
.../commands/tasks/VisorTasksCommand.scala | 8 +-
.../scala/org/apache/ignite/visor/visor.scala | 6 +-
.../cache/VisorCacheClearCommandSpec.scala | 8 +-
.../commands/cache/VisorCacheCommandSpec.scala | 19 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 4 +-
.../ignite/visor/plugin/package-info.java | 22 +
.../org/apache/ignite/visor/plugin/package.html | 24 -
modules/web/README.txt | 34 +
modules/web/readme.txt | 34 -
.../cache/websession/IgniteWebSession.java | 286 --
.../websession/IgniteWebSessionFilter.java | 466 ---
.../websession/IgniteWebSessionListener.java | 196 -
.../ignite/cache/websession/WebSession.java | 286 ++
.../cache/websession/WebSessionFilter.java | 467 +++
.../cache/websession/WebSessionListener.java | 196 +
.../ignite/cache/websession/package-info.java | 22 +
.../apache/ignite/cache/websession/package.html | 24 -
.../IgniteServletContextListenerStartup.java | 181 -
.../startup/servlet/IgniteServletStartup.java | 187 -
.../servlet/ServletContextListenerStartup.java | 181 +
.../ignite/startup/servlet/ServletStartup.java | 187 +
.../ignite/startup/servlet/package-info.java | 22 +
.../apache/ignite/startup/servlet/package.html | 24 -
.../internal/websession/WebSessionSelfTest.java | 4 +-
modules/winservice/IgniteService.sln | 22 -
.../winservice/IgniteService/IgniteService.cs | 170 -
.../IgniteService/IgniteService.csproj | 90 -
modules/winservice/README.md | 20 -
.../config/benchmark-multicast.properties | 2 +-
modules/yardstick/config/ignite-base-config.xml | 52 +-
.../yardstick/config/ignite-store-config.xml | 10 -
modules/yardstick/pom.xml | 8 +-
.../yardstick/IgniteAbstractBenchmark.java | 2 +-
.../yardstick/IgniteBenchmarkArguments.java | 1 +
.../org/apache/ignite/yardstick/IgniteNode.java | 10 +-
.../yardstick/cache/IgniteGetBenchmark.java | 2 +-
.../cache/IgniteGetOffHeapBenchmark.java | 2 +-
.../cache/IgniteGetOffHeapValuesBenchmark.java | 2 +-
.../yardstick/cache/IgnitePutBenchmark.java | 2 +-
.../yardstick/cache/IgnitePutGetBenchmark.java | 2 +-
.../cache/IgnitePutGetOffHeapBenchmark.java | 2 +-
.../IgnitePutGetOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutGetTxBenchmark.java | 2 +-
.../cache/IgnitePutGetTxOffHeapBenchmark.java | 2 +-
.../IgnitePutGetTxOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutOffHeapBenchmark.java | 2 +-
.../cache/IgnitePutOffHeapValuesBenchmark.java | 2 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 2 +-
.../cache/IgnitePutTxOffHeapBenchmark.java | 2 +-
.../IgnitePutTxOffHeapValuesBenchmark.java | 2 +-
.../cache/IgniteSqlQueryBenchmark.java | 2 +-
.../cache/IgniteSqlQueryJoinBenchmark.java | 4 +-
.../IgniteSqlQueryJoinOffHeapBenchmark.java | 2 +-
.../cache/IgniteSqlQueryOffHeapBenchmark.java | 2 +-
.../cache/IgniteSqlQueryPutBenchmark.java | 2 +-
.../IgniteSqlQueryPutOffHeapBenchmark.java | 2 +-
.../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 2 +-
.../store/jdbc/IgniteJdbcStorePutBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStorePutGetBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStorePutTxBenchmark.java | 2 +-
pom.xml | 134 +-
.../basic-concepts/async-support.md | 92 -
.../basic-concepts/getting-started.md | 235 --
.../basic-concepts/ignite-life-cycel.md | 122 -
.../documentation/basic-concepts/maven-setup.md | 85 -
.../basic-concepts/what-is-ignite.md | 48 -
.../basic-concepts/zero-deployment.md | 73 -
wiki/documentation/clustering/aws-config.md | 59 -
wiki/documentation/clustering/cluster-config.md | 193 -
wiki/documentation/clustering/cluster-groups.md | 227 --
wiki/documentation/clustering/cluster.md | 145 -
.../documentation/clustering/leader-election.md | 76 -
wiki/documentation/clustering/network-config.md | 118 -
wiki/documentation/clustering/node-local-map.md | 52 -
.../documentation/compute-grid/checkpointing.md | 255 --
.../compute-grid/collocate-compute-and-data.md | 46 -
wiki/documentation/compute-grid/compute-grid.md | 73 -
.../documentation/compute-grid/compute-tasks.md | 122 -
.../compute-grid/distributed-closures.md | 124 -
.../compute-grid/executor-service.md | 40 -
.../compute-grid/fault-tolerance.md | 96 -
.../compute-grid/job-scheduling.md | 86 -
.../compute-grid/load-balancing.md | 76 -
.../data-grid/affinity-collocation.md | 95 -
.../data-grid/automatic-db-integration.md | 119 -
wiki/documentation/data-grid/cache-modes.md | 254 --
wiki/documentation/data-grid/cache-queries.md | 181 -
wiki/documentation/data-grid/data-grid.md | 85 -
wiki/documentation/data-grid/data-loading.md | 94 -
wiki/documentation/data-grid/evictions.md | 103 -
.../data-grid/hibernate-l2-cache.md | 190 -
wiki/documentation/data-grid/jcache.md | 116 -
wiki/documentation/data-grid/off-heap-memory.md | 197 -
.../documentation/data-grid/persistent-store.md | 128 -
wiki/documentation/data-grid/rebalancing.md | 122 -
wiki/documentation/data-grid/transactions.md | 144 -
.../data-grid/web-session-clustering.md | 253 --
.../distributed-data-structures/atomic-types.md | 114 -
.../countdownlatch.md | 41 -
.../distributed-data-structures/id-generator.md | 57 -
.../queue-and-set.md | 133 -
.../distributed-events/automatic-batching.md | 33 -
wiki/documentation/distributed-events/events.md | 118 -
.../distributed-file-system/igfs.md | 18 -
.../distributed-messaging/messaging.md | 90 -
wiki/documentation/http/configuration.md | 67 -
wiki/documentation/http/rest-api.md | 1663 --------
.../release-notes/release-notes.md | 30 -
.../service-grid/cluster-singletons.md | 111 -
.../service-grid/service-configuration.md | 50 -
.../service-grid/service-example.md | 111 -
wiki/documentation/service-grid/service-grid.md | 79 -
wiki/licence-prepender.sh | 51 -
2445 files changed, 64760 insertions(+), 88388 deletions(-)
----------------------------------------------------------------------
[20/50] incubator-ignite git commit: jetty 9.2.x support (to be
replaced by tomcat-servlet-api)
Posted by sb...@apache.org.
jetty 9.2.x support (to be replaced by tomcat-servlet-api)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b8a4b5ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b8a4b5ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b8a4b5ad
Branch: refs/heads/ignite-929
Commit: b8a4b5ad4d561eba63d79f2a0b56cd6a590734ae
Parents: 7b3cdc8
Author: Anton <av...@gridgain.com>
Authored: Mon Jul 6 20:34:42 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Mon Jul 6 20:34:42 2015 +0300
----------------------------------------------------------------------
modules/rest-http/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b8a4b5ad/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 406585d..bf4b216 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b8a4b5ad/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index be946d7..0509af2 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
[47/50] incubator-ignite git commit: # Fixed unmarshalling error
handling for cache 'get'
Posted by sb...@apache.org.
# Fixed unmarshalling error handling for cache 'get'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6d6ec778
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d6ec778
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d6ec778
Branch: refs/heads/ignite-929
Commit: 6d6ec778b43d730dd19001011aaaa49ec86c5d20
Parents: 94a42a4
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 8 15:08:33 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 8 15:08:33 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 8 ++-
.../distributed/near/GridNearGetFuture.java | 4 +-
.../cache/CacheFutureExceptionSelfTest.java | 72 +++++++++++++++++---
3 files changed, 71 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d6ec778/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 0707096..29e3551 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -445,8 +445,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
case 50: {
GridNearGetResponse res = (GridNearGetResponse)msg;
- GridPartitionedGetFuture fut = (GridPartitionedGetFuture)ctx.mvcc().future(
- res.version(), res.futureId());
+ GridCacheFuture fut = ctx.mvcc().future(res.version(), res.futureId());
if (fut == null) {
if (log.isDebugEnabled())
@@ -457,7 +456,10 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
res.error(res.classError());
- fut.onResult(nodeId, res);
+ if (fut instanceof GridNearGetFuture)
+ ((GridNearGetFuture)fut).onResult(nodeId, res);
+ else
+ ((GridPartitionedGetFuture)fut).onResult(nodeId, res);
}
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d6ec778/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 74438bb..58f6fe5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -223,7 +223,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
* @param nodeId Sender.
* @param res Result.
*/
- void onResult(UUID nodeId, GridNearGetResponse res) {
+ public void onResult(UUID nodeId, GridNearGetResponse res) {
for (IgniteInternalFuture<Map<K, V>> fut : futures())
if (isMini(fut)) {
MiniFuture f = (MiniFuture)fut;
@@ -649,7 +649,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
if (log.isDebugEnabled())
log.debug("Got removed entry while processing get response (will not retry).");
}
- catch (IgniteCheckedException e) {
+ catch (Exception e) {
// Fail.
onDone(e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d6ec778/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
index 34d2daa..372c859 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
@@ -20,6 +20,9 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import javax.cache.*;
@@ -32,31 +35,82 @@ import static java.util.concurrent.TimeUnit.*;
* Cache future self test.
*/
public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static volatile boolean fail;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
+
cfg.setGridName(gridName);
+ TcpDiscoverySpi spi = new TcpDiscoverySpi();
+
+ spi.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(spi);
+
if (gridName.equals(getTestGridName(1)))
cfg.setClientMode(true);
return cfg;
}
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
/**
* @throws Exception If failed.
*/
public void testAsyncCacheFuture() throws Exception {
- Ignite srv = startGrid(0);
+ startGrid(0);
+
+ startGrid(1);
+
+ testGet(false, false);
+
+ testGet(false, true);
+
+ testGet(true, false);
+
+ testGet(true, true);
+ }
+
+ /**
+ * @param nearCache If {@code true} creates near cache on client.
+ * @param cpyOnRead Cache copy on read flag.
+ * @throws Exception If failed.
+ */
+ private void testGet(boolean nearCache, boolean cpyOnRead) throws Exception {
+ fail = false;
+
+ Ignite srv = grid(0);
+
+ Ignite client = grid(1);
+
+ final String cacheName = nearCache ? ("NEAR-CACHE-" + cpyOnRead) : ("CACHE-" + cpyOnRead);
+
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+
+ ccfg.setCopyOnRead(cpyOnRead);
+
+ ccfg.setName(cacheName);
+
+ IgniteCache<Object, Object> cache = srv.createCache(ccfg);
- IgniteCache<String, NotSerializableClass> cache = srv.getOrCreateCache("CACHE");
cache.put("key", new NotSerializableClass());
- Ignite client = startGrid(1);
+ IgniteCache<Object, Object> clientCache = nearCache ? client.createNearCache(cacheName,
+ new NearCacheConfiguration<>()) : client.cache(cacheName);
- IgniteCache<String, NotSerializableClass> asyncCache = client.<String, NotSerializableClass>cache("CACHE").withAsync();
+ IgniteCache<Object, Object> asyncCache = clientCache.withAsync();
- System.setProperty("FAIL", "true");
+ fail = true;
asyncCache.get("key");
@@ -79,7 +133,9 @@ public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
}
});
- assertTrue(futLatch.await(60, SECONDS));
+ assertTrue(futLatch.await(5, SECONDS));
+
+ srv.destroyCache(cache.getName());
}
/**
@@ -93,10 +149,10 @@ public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc}*/
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- if (System.getProperty("FAIL") != null)
+ if (fail)
throw new RuntimeException("Deserialization failed.");
in.readObject();
}
}
-}
\ No newline at end of file
+}
\ No newline at end of file
[18/50] incubator-ignite git commit: minor fix
Posted by sb...@apache.org.
minor 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/3c4499ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3c4499ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3c4499ce
Branch: refs/heads/ignite-929
Commit: 3c4499cecf8c84d119f38762f07ac669b839faf9
Parents: b87f138
Author: Anton <av...@gridgain.com>
Authored: Mon Jul 6 20:05:14 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Mon Jul 6 20:05:14 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3c4499ce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bfa9f62..3ec880e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
<maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format>
<doxygen.exec>doxygen</doxygen.exec>
<git.exec>git</git.exec>
- <jetty.version>9.2.11.v20150529</jetty.version>
+ <jetty.version>9.0.5.v20130815</jetty.version>
</properties>
<groupId>org.apache.ignite</groupId>
[33/50] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f46ee88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f46ee88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f46ee88
Branch: refs/heads/ignite-929
Commit: 4f46ee886d4b1a40c71d0cbdab273b9eb38e3717
Parents: c04cba9 6ed5c1c
Author: agura <ag...@gridgain.com>
Authored: Tue Jul 7 19:29:18 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Tue Jul 7 19:29:18 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/interop/InteropIgnition.java | 17 ++++++++++++++++-
.../ignite/internal/interop/InteropProcessor.java | 7 +++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[46/50] incubator-ignite git commit: #ignite-1101: Add test for cache
future runtime exception.
Posted by sb...@apache.org.
#ignite-1101: Add test for cache future runtime 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/94a42a48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/94a42a48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/94a42a48
Branch: refs/heads/ignite-929
Commit: 94a42a48530998da9895e217c99eec69db71d8c9
Parents: 44b52b4
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Jul 8 14:45:49 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Jul 8 14:45:49 2015 +0300
----------------------------------------------------------------------
.../cache/CacheFutureExceptionSelfTest.java | 121 ++++---------------
1 file changed, 26 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94a42a48/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
index 27bfe17..34d2daa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
@@ -19,16 +19,11 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import javax.cache.*;
import java.io.*;
-import java.util.*;
import java.util.concurrent.*;
import static java.util.concurrent.TimeUnit.*;
@@ -39,9 +34,11 @@ import static java.util.concurrent.TimeUnit.*;
public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = StartNode.createConfiguration();
+ IgniteConfiguration cfg = new IgniteConfiguration();
+ cfg.setGridName(gridName);
- cfg.setClientMode(true);
+ if (gridName.equals(getTestGridName(1)))
+ cfg.setClientMode(true);
return cfg;
}
@@ -50,68 +47,39 @@ public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAsyncCacheFuture() throws Exception {
- final CountDownLatch readyLatch = new CountDownLatch(1);
+ Ignite srv = startGrid(0);
- GridJavaProcess node1 = null;
+ IgniteCache<String, NotSerializableClass> cache = srv.getOrCreateCache("CACHE");
+ cache.put("key", new NotSerializableClass());
- Collection<String> jvmArgs = Arrays.asList("-ea", "-DIGNITE_QUIET=false");
+ Ignite client = startGrid(1);
- try {
- node1 = GridJavaProcess.exec(
- StartNode.class.getName(), null,
- log,
- new CI1<String>() {
- @Override public void apply(String s) {
- info("Server node1: " + s);
+ IgniteCache<String, NotSerializableClass> asyncCache = client.<String, NotSerializableClass>cache("CACHE").withAsync();
- if (s.contains("Topology snapshot"))
- readyLatch.countDown();
- }
- },
- null,
- jvmArgs,
- null
- );
+ System.setProperty("FAIL", "true");
- assertTrue(readyLatch.await(60, SECONDS));
+ asyncCache.get("key");
- Ignite client = startGrid(0);
+ final CountDownLatch futLatch = new CountDownLatch(1);
- IgniteCache<String, NotSerializableClass> cache = client.getOrCreateCache("CACHE");
+ asyncCache.future().listen(new IgniteInClosure<IgniteFuture<Object>>() {
+ @Override public void apply(IgniteFuture<Object> fut) {
+ assertTrue(fut.isDone());
- cache.put("key", new NotSerializableClass());
+ try {
+ fut.get();
- System.setProperty("FAIL", "true");
-
- IgniteCache<String, NotSerializableClass> asyncCache = cache.withAsync();
-
- asyncCache.get("key");
-
- final CountDownLatch futLatch = new CountDownLatch(1);
-
- asyncCache.future().listen(new IgniteInClosure<IgniteFuture<Object>>() {
- @Override public void apply(IgniteFuture<Object> fut) {
- assertTrue(fut.isDone());
-
- try {
- fut.get();
-
- fail();
- }
- catch (CacheException e) {
- log.info("Expected error: " + e);
+ fail();
+ }
+ catch (CacheException e) {
+ log.info("Expected error: " + e);
- futLatch.countDown();
- }
+ futLatch.countDown();
}
- });
+ }
+ });
- assertTrue(futLatch.await(60, SECONDS));
- }
- finally {
- if (node1 != null)
- node1.killProcess();
- }
+ assertTrue(futLatch.await(60, SECONDS));
}
/**
@@ -131,41 +99,4 @@ public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
in.readObject();
}
}
-
- /**
- * Test class.
- */
- public static class StartNode {
- /**
- * @return Configuration.
- */
- public static IgniteConfiguration createConfiguration() {
- IgniteConfiguration cfg = new IgniteConfiguration();
-
- cfg.setPeerClassLoadingEnabled(true);
-
- cfg.setLocalHost("127.0.0.1");
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinderCleanFrequency(1000);
-
- TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder();
-
- ipFinder.setAddresses(Collections.singletonList("127.0.0.1:47500..47509"));
-
- disco.setIpFinder(ipFinder);
-
- cfg.setDiscoverySpi(disco);
-
- return cfg;
- }
-
- /**
- * @param args Main parameters.
- */
- public static void main(String[] args) {
- Ignition.start(createConfiguration());
- }
- }
-}
\ No newline at end of file
+}
\ No newline at end of file
[39/50] incubator-ignite git commit: merge from ignite-747
Posted by sb...@apache.org.
merge from ignite-747
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4031db76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4031db76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4031db76
Branch: refs/heads/ignite-929
Commit: 4031db76d2bd9992001a5b63f17af7739e82cff0
Parents: 0f1b31a
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 8 10:19:11 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 8 10:19:11 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/ServerImpl.java | 20 +++++++++++
.../tcp/internal/TcpDiscoveryNode.java | 2 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 8 ++++-
.../tcp/internal/TcpDiscoveryStatistics.java | 10 ++++--
...acheAtomicReplicatedNodeRestartSelfTest.java | 8 ++---
.../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++++++++++++++++++
.../IgniteSpiDiscoverySelfTestSuite.java | 3 ++
7 files changed, 81 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4031db76/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index f8fae34..d51293e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -2881,6 +2881,24 @@ class ServerImpl extends TcpDiscoveryImpl {
msg.verify(locNodeId);
}
+ else if (!locNodeId.equals(node.id()) && ring.node(node.id()) != null) {
+ // Local node already has node from message in local topology.
+ // Just pass it to coordinator via the ring.
+ if (ring.hasRemoteNodes())
+ sendMessageAcrossRing(msg);
+
+ if (log.isDebugEnabled())
+ log.debug("Local node already has node being added. Passing TcpDiscoveryNodeAddedMessage to " +
+ "coordinator for final processing [ring=" + ring + ", node=" + node + ", locNode="
+ + locNode + ", msg=" + msg + ']');
+
+ if (debugMode)
+ debugLog("Local node already has node being added. Passing TcpDiscoveryNodeAddedMessage to " +
+ "coordinator for final processing [ring=" + ring + ", node=" + node + ", locNode="
+ + locNode + ", msg=" + msg + ']');
+
+ return;
+ }
if (msg.verified() && !locNodeId.equals(node.id())) {
if (node.internalOrder() <= ring.maxInternalOrder()) {
@@ -3163,6 +3181,8 @@ class ServerImpl extends TcpDiscoveryImpl {
if (msg.verified() && locNodeId.equals(nodeId) && spiStateCopy() == CONNECTING) {
assert node != null;
+ assert topVer > 0 : "Invalid topology version: " + msg;
+
ring.topologyVersion(topVer);
node.order(topVer);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4031db76/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index 36ae39e..4b4df45 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -300,7 +300,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
* @param order Order of the node.
*/
public void order(long order) {
- assert order >= 0 : "Order is invalid: " + this;
+ assert order > 0 : "Order is invalid: " + this;
this.order = order;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4031db76/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
index e9eaa1d..acb479d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
@@ -34,7 +34,13 @@ public class TcpDiscoveryNodesRing {
/** Visible nodes filter. */
public static final IgnitePredicate<TcpDiscoveryNode> VISIBLE_NODES = new P1<TcpDiscoveryNode>() {
@Override public boolean apply(TcpDiscoveryNode node) {
- return node.visible();
+ if (node.visible()) {
+ assert node.order() > 0 : "Invalid node order: " + node;
+
+ return true;
+ }
+
+ return false;
}
};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4031db76/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
index da8c4ea..377d8a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
@@ -256,7 +256,10 @@ public class TcpDiscoveryStatistics {
if (maxMsgQueueTime < duration)
maxMsgQueueTime = duration;
- avgMsgQueueTime = (avgMsgQueueTime * (totalReceivedMessages() -1)) / totalProcessedMessages();
+ int totalProcMsgs = totalProcessedMessages();
+
+ if (totalProcMsgs != 0)
+ avgMsgQueueTime = (avgMsgQueueTime * (totalProcMsgs - 1)) / totalProcMsgs;
}
msgsProcStartTs.put(msg.id(), U.currentTimeMillis());
@@ -275,7 +278,10 @@ public class TcpDiscoveryStatistics {
if (startTs != null) {
long duration = U.currentTimeMillis() - startTs;
- avgMsgProcTime = (avgMsgProcTime * (totalProcessedMessages() - 1) + duration) / totalProcessedMessages();
+ int totalProcMsgs = totalProcessedMessages();
+
+ if (totalProcMsgs != 0)
+ avgMsgProcTime = (avgMsgProcTime * (totalProcMsgs - 1) + duration) / totalProcMsgs;
if (duration > maxMsgProcTime) {
maxMsgProcTime = duration;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4031db76/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
index 54409d1..b4ed18d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
@@ -26,17 +26,17 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
*/
public class IgniteCacheAtomicReplicatedNodeRestartSelfTest extends GridCacheReplicatedNodeRestartSelfTest {
/** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-747");
+ @Override public void testRestartWithPutSixNodesTwoBackups() throws Throwable {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1095");
}
/** {@inheritDoc} */
- @Override public void testRestartWithPutSixNodesTwoBackups() throws Throwable {
+ @Override public void testRestartWithPutEightNodesTwoBackups() throws Throwable {
fail("https://issues.apache.org/jira/browse/IGNITE-1095");
}
/** {@inheritDoc} */
- @Override public void testRestartWithPutEightNodesTwoBackups() throws Throwable {
+ @Override public void testRestartWithPutTenNodesTwoBackups() throws Throwable {
fail("https://issues.apache.org/jira/browse/IGNITE-1095");
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4031db76/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index cfefff4..0bf7cad 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -21,8 +21,10 @@ import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.concurrent.*;
@@ -100,6 +102,8 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
* @throws Exception If any error occurs.
*/
public void testMultiThreaded() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1100");
+
execute();
}
@@ -126,6 +130,40 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
}
/**
+ * @throws Exception If any error occurs.
+ */
+ public void testMultipleStartOnCoordinatorStop() throws Exception{
+ startGrids(GRID_CNT);
+
+ final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT + 4);
+
+ final AtomicInteger startIdx = new AtomicInteger(GRID_CNT);
+
+ IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ barrier.await();
+
+ Ignite ignite = startGrid(startIdx.getAndIncrement());
+
+ assertFalse(ignite.configuration().isClientMode());
+
+ log.info("Started node: " + ignite.name());
+
+ return null;
+ }
+ }, GRID_CNT + 3, "start-thread");
+
+ barrier.await();
+
+ U.sleep(ThreadLocalRandom.current().nextInt(10, 100));
+
+ for (int i = 0; i < GRID_CNT; i++)
+ stopGrid(i);
+
+ fut.get();
+ }
+
+ /**
* @throws Exception If failed.
*/
private void execute() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4031db76/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
index 498f50c..6f59f14 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
@@ -57,6 +57,9 @@ public class IgniteSpiDiscoverySelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(TcpDiscoveryNodeConsistentIdSelfTest.class));
+ suite.addTest(new TestSuite(TcpDiscoveryRestartTest.class));
+ suite.addTest(new TestSuite(TcpDiscoveryMultiThreadedTest.class));
+
return suite;
}
}
[03/50] incubator-ignite git commit: 1.1.0
Posted by sb...@apache.org.
1.1.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6da491f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6da491f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6da491f4
Branch: refs/heads/ignite-929
Commit: 6da491f4c80c36fe280327a57760c2da69c227d8
Parents: cff73bf
Author: Ignite Teamcity <ig...@apache.org>
Authored: Wed May 20 19:18:40 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Wed May 20 19:18:40 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 6 +++---
31 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 3ac5a80..3a24b51 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 38a593e..0e8b733 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 83eced2..9eaf485 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index c90173f..23bca5a 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index ddc2858..628a0db 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ignite-cloud</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<properties>
<jcloud.version>1.9.0</jcloud.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 15c3d5d..bc43eb4 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index e3a7b97..33e73a8 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index cc6843f..7719e56 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 980db73..bffa857 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index e4198b8..14df98d 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-gce</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index dc7a454..b087bdf 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index fba22c1..9238547 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index f7d0443..7237639 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index e808ca3..932e039 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 061e27c..571f107 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index b6e0928..69903ee 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index d855911..d4986cb 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 95800ac..a2c591d 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 3160cc2..9b784c8 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 4cda672..d11099b 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 51b5ff0..804e79e 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index d7109c2..0215709 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 26dfc14..15f3a1d 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 82a7983..c85ffb1 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index b38de40..e202fb2 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index c711902..933d0b1 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index a70dd2c..d068b31 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 96e7b17..2d01402 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 92f9aa7..5faa842 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 7298f6b..08344a0 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da491f4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26f5456..7c52c68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
<properties>
@@ -300,7 +300,7 @@
<substitution expression="${project.version}" />
</replaceregexp>
- <chmod dir="${basedir}/target/release-package" perm="755" includes="**/*.sh"/>
+ <chmod dir="${basedir}/target/release-package" perm="755" includes="**/*.sh" />
<zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip" encoding="UTF-8">
<zipfileset dir="${basedir}/target/release-package" prefix="${ignite.zip.pattern}" filemode="755">
@@ -592,7 +592,7 @@
<include name="**/*" />
</fileset>
</copy>
- <copy file="${basedir}/KEYS" todir="${basedir}/target/site" failonerror="false"/>
+ <copy file="${basedir}/KEYS" todir="${basedir}/target/site" failonerror="false" />
</target>
</configuration>
</execution>
[25/50] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44506c39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44506c39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44506c39
Branch: refs/heads/ignite-929
Commit: 44506c39da5baf887b72711795cdf50d01b87372
Parents: 9314a68 8c1ba5a
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 7 14:13:57 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 7 14:13:57 2015 +0300
----------------------------------------------------------------------
.../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
2 files changed, 172 insertions(+)
----------------------------------------------------------------------
[32/50] incubator-ignite git commit: ignite-1031 Query metrics
updated incorrectly
Posted by sb...@apache.org.
ignite-1031 Query metrics updated incorrectly
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c04cba9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c04cba9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c04cba9e
Branch: refs/heads/ignite-929
Commit: c04cba9e82d3f9a7a5d851047de92322c54cc568
Parents: 9d0aa6f
Author: agura <ag...@gridgain.com>
Authored: Tue Jul 7 19:28:38 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Tue Jul 7 19:28:38 2015 +0300
----------------------------------------------------------------------
.../cache/query/GridCacheQueryAdapter.java | 35 ++++-
.../processors/query/GridQueryProcessor.java | 5 +
.../CacheAbstractQueryMetricsSelfTest.java | 157 ++++++++++++++++++-
.../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++++
...titionedQueryMetricsDistributedSelfTest.java | 33 ++++
...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++++
.../CachePartitionedQueryMetricsSelfTest.java | 32 ----
...plicatedQueryMetricsDistributedSelfTest.java | 33 ++++
...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++++
.../CacheReplicatedQueryMetricsSelfTest.java | 32 ----
.../IgniteCacheQuerySelfTestSuite.java | 7 +-
11 files changed, 361 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 5b82c34..c2425f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -36,6 +36,7 @@ import org.jetbrains.annotations.*;
import java.util.*;
+import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*;
/**
@@ -413,12 +414,19 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
@SuppressWarnings("IfMayBeConditional")
private <R> CacheQueryFuture<R> execute(@Nullable IgniteReducer<T, R> rmtReducer,
@Nullable IgniteClosure<T, R> rmtTransform, @Nullable Object... args) {
- Collection<ClusterNode> nodes = nodes();
+ Collection<ClusterNode> nodes;
+
+ try {
+ nodes = nodes();
+ }
+ catch (IgniteCheckedException e) {
+ return queryErrorFuture(cctx, e, log);
+ }
cctx.checkSecurity(SecurityPermission.CACHE_READ);
if (nodes.isEmpty())
- return new GridCacheQueryErrorFuture<>(cctx.kernalContext(), new ClusterGroupEmptyCheckedException());
+ return queryErrorFuture(cctx, new ClusterGroupEmptyCheckedException(), log);
if (log.isDebugEnabled())
log.debug("Executing query [query=" + this + ", nodes=" + nodes + ']');
@@ -429,7 +437,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
cctx.deploy().registerClasses(args);
}
catch (IgniteCheckedException e) {
- return new GridCacheQueryErrorFuture<>(cctx.kernalContext(), e);
+ return queryErrorFuture(cctx, e, log);
}
}
@@ -457,7 +465,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
/**
* @return Nodes to execute on.
*/
- private Collection<ClusterNode> nodes() {
+ private Collection<ClusterNode> nodes() throws IgniteCheckedException {
CacheMode cacheMode = cctx.config().getCacheMode();
switch (cacheMode) {
@@ -466,6 +474,10 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
U.warn(log, "Ignoring query projection because it's executed over LOCAL cache " +
"(only local node will be queried): " + this);
+ if (type == SCAN && cctx.config().getCacheMode() == LOCAL &&
+ partition() != null && partition() >= cctx.affinity().partitions())
+ throw new IgniteCheckedException("Invalid partition number: " + partition());
+
return Collections.singletonList(cctx.localNode());
case REPLICATED:
@@ -513,6 +525,21 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
});
}
+ /**
+ * @param cctx Cache context.
+ * @param e Exception.
+ * @param log Logger.
+ */
+ private static <T> GridCacheQueryErrorFuture<T> queryErrorFuture(GridCacheContext<?, ?> cctx,
+ Exception e, IgniteLogger log) {
+
+ GridCacheQueryMetricsAdapter metrics = (GridCacheQueryMetricsAdapter)cctx.queries().metrics();
+
+ GridQueryProcessor.onExecuted(cctx, metrics, null, e, 0, 0, log);
+
+ return new GridCacheQueryErrorFuture<>(cctx.kernalContext(), e);
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridCacheQueryAdapter.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index e080c6d..6af0f40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1453,6 +1453,11 @@ public class GridQueryProcessor extends GridProcessorAdapter {
throw (IgniteCheckedException)err;
}
+ catch (Exception e) {
+ err = e;
+
+ throw new IgniteCheckedException(e);
+ }
finally {
GridCacheQueryMetricsAdapter metrics = (GridCacheQueryMetricsAdapter)cctx.queries().metrics();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
index 63912bf..3eb96b6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
@@ -33,7 +33,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
*/
public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstractTest {
/** Grid count. */
- private static final int GRID_CNT = 2;
+ protected int gridCnt;
/** Cache mode. */
protected CacheMode cacheMode;
@@ -43,7 +43,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- startGridsMultiThreaded(GRID_CNT);
+ startGridsMultiThreaded(gridCnt);
}
/** {@inheritDoc} */
@@ -122,6 +122,57 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra
}
/**
+ * Test metrics for failed SQL queries.
+ *
+ * @throws Exception In case of error.
+ */
+ public void testSqlFieldsQueryFailedMetrics() throws Exception {
+ IgniteCache<String, Integer> cache = grid(0).context().cache().jcache("A");
+
+ // Execute query.
+ SqlFieldsQuery qry = new SqlFieldsQuery("select * from UNKNOWN");
+
+ try {
+ cache.query(qry).getAll();
+ }
+ catch (Exception e) {
+ // No-op.
+ }
+
+ QueryMetrics m = cache.queryMetrics();
+
+ assert m != null;
+
+ info("Metrics: " + m);
+
+ assertEquals(1, m.executions());
+ assertEquals(1, m.fails());
+ assertTrue(m.averageTime() >= 0);
+ assertTrue(m.maximumTime() >= 0);
+ assertTrue(m.minimumTime() >= 0);
+
+ // Execute again with the same parameters.
+ try {
+ cache.query(qry).getAll();
+ }
+ catch (Exception e) {
+ // No-op.
+ }
+
+ m = cache.queryMetrics();
+
+ assert m != null;
+
+ info("Metrics: " + m);
+
+ assertEquals(2, m.executions());
+ assertEquals(2, m.fails());
+ assertTrue(m.averageTime() >= 0);
+ assertTrue(m.maximumTime() >= 0);
+ assertTrue(m.minimumTime() >= 0);
+ }
+
+ /**
* Test metrics for Scan queries.
*
* @throws Exception In case of error.
@@ -163,6 +214,57 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra
}
/**
+ * Test metrics for failed Scan queries.
+ *
+ * @throws Exception In case of error.
+ */
+ public void testScanQueryFailedMetrics() throws Exception {
+ IgniteCache<String, Integer> cache = grid(0).context().cache().jcache("A");
+
+ // Execute query.
+ ScanQuery<String, Integer> qry = new ScanQuery<>(Integer.MAX_VALUE);
+
+ try {
+ cache.query(qry).getAll();
+ }
+ catch (Exception e) {
+ // No-op.
+ }
+
+ QueryMetrics m = cache.queryMetrics();
+
+ assert m != null;
+
+ info("Metrics: " + m);
+
+ assertEquals(1, m.executions());
+ assertEquals(1, m.fails());
+ assertTrue(m.averageTime() >= 0);
+ assertTrue(m.maximumTime() >= 0);
+ assertTrue(m.minimumTime() >= 0);
+
+ // Execute again with the same parameters.
+ try {
+ cache.query(qry).getAll();
+ }
+ catch (Exception e) {
+ // No-op.
+ }
+
+ m = cache.queryMetrics();
+
+ assert m != null;
+
+ info("Metrics: " + m);
+
+ assertEquals(2, m.executions());
+ assertEquals(2, m.fails());
+ assertTrue(m.averageTime() >= 0);
+ assertTrue(m.maximumTime() >= 0);
+ assertTrue(m.minimumTime() >= 0);
+ }
+
+ /**
* Test metrics for SQL cross cache queries.
*
* @throws Exception In case of error.
@@ -202,4 +304,55 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra
assertTrue(m.maximumTime() >= 0);
assertTrue(m.minimumTime() >= 0);
}
+
+ /**
+ * Test metrics for failed SQL cross cache queries.
+ *
+ * @throws Exception In case of error.
+ */
+ public void testSqlCrossCacheQueryFailedMetrics() throws Exception {
+ IgniteCache<String, Integer> cache = grid(0).context().cache().jcache("A");
+
+ // Execute query.
+ SqlFieldsQuery qry = new SqlFieldsQuery("select * from \"G\".Integer");
+
+ try {
+ cache.query(qry).getAll();
+ }
+ catch (Exception e) {
+ // No-op
+ }
+
+ QueryMetrics m = cache.queryMetrics();
+
+ assert m != null;
+
+ info("Metrics: " + m);
+
+ assertEquals(1, m.executions());
+ assertEquals(1, m.fails());
+ assertTrue(m.averageTime() >= 0);
+ assertTrue(m.maximumTime() >= 0);
+ assertTrue(m.minimumTime() >= 0);
+
+ // Execute again with the same parameters.
+ try {
+ cache.query(qry).getAll();
+ }
+ catch (Exception e) {
+ // No-op.
+ }
+
+ m = cache.queryMetrics();
+
+ assert m != null;
+
+ info("Metrics: " + m);
+
+ assertEquals(2, m.executions());
+ assertEquals(2, m.fails());
+ assertTrue(m.averageTime() >= 0);
+ assertTrue(m.maximumTime() >= 0);
+ assertTrue(m.minimumTime() >= 0);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheLocalQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheLocalQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheLocalQueryMetricsSelfTest.java
new file mode 100644
index 0000000..d28d3a0
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheLocalQueryMetricsSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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 static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests for local cache query metrics.
+ */
+public class CacheLocalQueryMetricsSelfTest extends CacheAbstractQueryMetricsSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ gridCnt = 1;
+ cacheMode = LOCAL;
+
+ super.beforeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsDistributedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsDistributedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsDistributedSelfTest.java
new file mode 100644
index 0000000..f54a091
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsDistributedSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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 static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests for partitioned distributed cache query metrics.
+ */
+public class CachePartitionedQueryMetricsDistributedSelfTest extends CacheAbstractQueryMetricsSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ gridCnt = 2;
+ cacheMode = PARTITIONED;
+
+ super.beforeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsLocalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsLocalSelfTest.java
new file mode 100644
index 0000000..efeb5d3
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsLocalSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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 static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests for partitioned local cache query metrics.
+ */
+public class CachePartitionedQueryMetricsLocalSelfTest extends CacheAbstractQueryMetricsSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ gridCnt = 1;
+ cacheMode = PARTITIONED;
+
+ super.beforeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsSelfTest.java
deleted file mode 100644
index 666acfb..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CachePartitionedQueryMetricsSelfTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- * Tests for partitioned cache query metrics.
- */
-public class CachePartitionedQueryMetricsSelfTest extends CacheAbstractQueryMetricsSelfTest {
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- cacheMode = PARTITIONED;
-
- super.beforeTest();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsDistributedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsDistributedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsDistributedSelfTest.java
new file mode 100644
index 0000000..ae2a420
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsDistributedSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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 static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests for replicated distributed cache query metrics.
+ */
+public class CacheReplicatedQueryMetricsDistributedSelfTest extends CacheAbstractQueryMetricsSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ gridCnt = 2;
+ cacheMode = REPLICATED;
+
+ super.beforeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsLocalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsLocalSelfTest.java
new file mode 100644
index 0000000..d411f9c
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsLocalSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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 static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests for replicated local cache query metrics.
+ */
+public class CacheReplicatedQueryMetricsLocalSelfTest extends CacheAbstractQueryMetricsSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ gridCnt = 1;
+ cacheMode = REPLICATED;
+
+ super.beforeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsSelfTest.java
deleted file mode 100644
index 2be6dd3..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheReplicatedQueryMetricsSelfTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- * Tests for replicated cache query metrics.
- */
-public class CacheReplicatedQueryMetricsSelfTest extends CacheAbstractQueryMetricsSelfTest {
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- cacheMode = REPLICATED;
-
- super.beforeTest();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c04cba9e/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 181ff0c..2d7d0ce 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -116,8 +116,11 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(H2CompareBigQueryTest.class);
// Cache query metrics.
- suite.addTestSuite(CachePartitionedQueryMetricsSelfTest.class);
- suite.addTestSuite(CacheReplicatedQueryMetricsSelfTest.class);
+ suite.addTestSuite(CacheLocalQueryMetricsSelfTest.class);
+ suite.addTestSuite(CachePartitionedQueryMetricsDistributedSelfTest.class);
+ suite.addTestSuite(CachePartitionedQueryMetricsLocalSelfTest.class);
+ suite.addTestSuite(CacheReplicatedQueryMetricsDistributedSelfTest.class);
+ suite.addTestSuite(CacheReplicatedQueryMetricsLocalSelfTest.class);
//Unmarshallig query test.
suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class);
[41/50] incubator-ignite git commit: # review
Posted by sb...@apache.org.
# 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/82f49921
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82f49921
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82f49921
Branch: refs/heads/ignite-929
Commit: 82f49921969979589e04fb12f9902201a29ac7b2
Parents: 946b08b
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Jul 8 12:38:11 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Jul 8 12:38:11 2015 +0300
----------------------------------------------------------------------
.../cache/IgnitePutIndex8Benchmark.java | 42 --------------------
.../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++++++++++++++++++
2 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82f49921/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java
deleted file mode 100644
index 542a139..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.yardstick.cache.model.*;
-
-import java.util.*;
-
-/**
- * Ignite benchmark that performs put operations for entity with indexed fields.
- */
-public class IgnitePutIndex8Benchmark extends IgniteCacheAbstractBenchmark {
- /** {@inheritDoc} */
- @Override public boolean test(Map<Object, Object> ctx) throws Exception {
- int key = nextRandom(args.range());
-
- cache.put(key, new Person8(key, key + 1, key + 2, key + 3, key + 4, key + 5, key + 6, key + 7));
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-index");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82f49921/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java
new file mode 100644
index 0000000..b51ff34
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java
@@ -0,0 +1,42 @@
+/*
+ * 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.yardstick.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.yardstick.cache.model.*;
+
+import java.util.*;
+
+/**
+ * Ignite benchmark that performs put operations for entity with indexed fields.
+ */
+public class IgnitePutIndexedValue8Benchmark extends IgniteCacheAbstractBenchmark {
+ /** {@inheritDoc} */
+ @Override public boolean test(Map<Object, Object> ctx) throws Exception {
+ int key = nextRandom(args.range());
+
+ cache.put(key, new Person8(key, key + 1, key + 2, key + 3, key + 4, key + 5, key + 6, key + 7));
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteCache<Integer, Object> cache() {
+ return ignite().cache("atomic-index");
+ }
+}
[44/50] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44b52b4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44b52b4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44b52b4a
Branch: refs/heads/ignite-929
Commit: 44b52b4a8968808ad7c17d510e56c8defe8ee837
Parents: 1cf479b 1a6948e
Author: agura <ag...@gridgain.com>
Authored: Wed Jul 8 13:31:12 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Wed Jul 8 13:31:12 2015 +0300
----------------------------------------------------------------------
.../config/benchmark-index-put.properties | 64 --------
.../config/benchmark-put-indexed-val.properties | 64 ++++++++
.../cache/IgnitePutIndex1Benchmark.java | 42 -----
.../cache/IgnitePutIndex2Benchmark.java | 42 -----
.../cache/IgnitePutIndexedValue1Benchmark.java | 42 +++++
.../cache/IgnitePutIndexedValue2Benchmark.java | 42 +++++
.../cache/IgnitePutIndexedValue8Benchmark.java | 2 +-
.../ignite/yardstick/cache/model/Person1.java | 29 +---
.../ignite/yardstick/cache/model/Person2.java | 45 +-----
.../ignite/yardstick/cache/model/Person8.java | 155 ++-----------------
10 files changed, 167 insertions(+), 360 deletions(-)
----------------------------------------------------------------------
[15/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-7' into ignite-1091
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1091
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/335a7bba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/335a7bba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/335a7bba
Branch: refs/heads/ignite-929
Commit: 335a7bba58052812e04362791e2e114afb094f2c
Parents: ca92f1f a577d27
Author: Anton <av...@gridgain.com>
Authored: Mon Jul 6 12:09:31 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Mon Jul 6 12:09:31 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 8 +-
bin/ignite.sh | 6 +-
bin/include/parseargs.bat | 1 +
bin/include/parseargs.sh | 3 +
.../ignite/internal/util/IgniteUtils.java | 6 +-
.../startup/cmdline/CommandLineStartup.java | 3 +-
.../startup/cmdline/CommandLineTransformer.java | 9 +
...acheAtomicReplicatedNodeRestartSelfTest.java | 10 +
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++++
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
modules/kafka/pom.xml | 116 ++++++
.../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++
.../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++
.../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++
.../ignite/stream/kafka/SimplePartitioner.java | 53 +++
pom.xml | 1 +
17 files changed, 1155 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[07/50] incubator-ignite git commit: # IGNITE-591 Enable tests.
Posted by sb...@apache.org.
# IGNITE-591 Enable tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bac6f481
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bac6f481
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bac6f481
Branch: refs/heads/ignite-929
Commit: bac6f481dd766ac1105fcc127e7ee557f96598de
Parents: 4b06e77
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Jul 2 14:56:12 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Jul 2 14:56:12 2015 +0300
----------------------------------------------------------------------
.../hibernate/HibernateL2CacheSelfTest.java | 50 ++++++++++----------
.../HibernateL2CacheTransactionalSelfTest.java | 38 +++++++--------
.../processors/cache/GridCacheJtaSelfTest.java | 23 ++++-----
3 files changed, 55 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bac6f481/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index bb5884a..fe34ea8 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -17,32 +17,37 @@
package org.apache.ignite.cache.hibernate;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.hibernate.*;
import org.hibernate.Query;
-import org.hibernate.annotations.*;
-import org.hibernate.cache.spi.*;
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.annotations.NaturalIdCache;
+import org.hibernate.cache.spi.GeneralDataRegion;
+import org.hibernate.cache.spi.TransactionalDataRegion;
import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.*;
-import org.hibernate.exception.*;
-import org.hibernate.service.*;
-import org.hibernate.stat.*;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.service.ServiceRegistryBuilder;
+import org.hibernate.stat.NaturalIdCacheStatistics;
+import org.hibernate.stat.SecondLevelCacheStatistics;
import javax.persistence.*;
import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
-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.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.*;
import static org.hibernate.cfg.Environment.*;
@@ -51,11 +56,6 @@ import static org.hibernate.cfg.Environment.*;
* Tests Hibernate L2 cache.
*/
public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-591");
- }
-
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -1128,6 +1128,8 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNaturalIdCache() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1084");
+
for (AccessType accessType : accessTypes())
testNaturalIdCache(accessType);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bac6f481/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
index c429d9a..6f47d3b 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
@@ -17,23 +17,24 @@
package org.apache.ignite.cache.hibernate;
-import org.apache.commons.dbcp.managed.*;
-import org.apache.ignite.cache.jta.*;
-import org.apache.ignite.configuration.*;
-import org.h2.jdbcx.*;
-import org.hibernate.cache.spi.access.*;
-import org.hibernate.engine.transaction.internal.jta.*;
+import org.apache.commons.dbcp.managed.BasicManagedDataSource;
+import org.apache.ignite.cache.jta.CacheTmLookup;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.h2.jdbcx.JdbcDataSource;
+import org.hibernate.cache.spi.access.AccessType;
+import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionFactory;
-import org.hibernate.service.*;
-import org.hibernate.service.jdbc.connections.internal.*;
-import org.hibernate.service.jdbc.connections.spi.*;
-import org.hibernate.service.jta.platform.internal.*;
-import org.hibernate.service.jta.platform.spi.*;
-import org.jetbrains.annotations.*;
-import org.objectweb.jotm.*;
-
-import javax.transaction.*;
-import java.util.*;
+import org.hibernate.service.ServiceRegistryBuilder;
+import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl;
+import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.service.jta.platform.internal.AbstractJtaPlatform;
+import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.jetbrains.annotations.Nullable;
+import org.objectweb.jotm.Jotm;
+
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import java.util.Collections;
/**
*
@@ -41,11 +42,6 @@ import java.util.*;
* to used the same TransactionManager).
*/
public class HibernateL2CacheTransactionalSelfTest extends HibernateL2CacheSelfTest {
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-591");
- }
-
/** */
private static Jotm jotm;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bac6f481/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
index 37e9ed2..9b8cb15 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -17,18 +17,21 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.jta.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.jta.CacheTmLookup;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.transactions.Transaction;
-import org.objectweb.jotm.*;
+import org.objectweb.jotm.Jotm;
-import javax.transaction.*;
+import javax.transaction.Status;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.transactions.TransactionState.ACTIVE;
/**
* Abstract class for cache tests.
@@ -145,8 +148,6 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
}
/**
- * TODO: IGNITE-591.
- *
* @throws Exception If failed.
*/
@SuppressWarnings("ConstantConditions")
[28/50] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25c349f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25c349f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25c349f4
Branch: refs/heads/ignite-929
Commit: 25c349f47f70c9824c8d4ba9c4ee679ff597051e
Parents: 5dc2d2b 9d0aa6f
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 7 16:01:47 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 7 16:01:47 2015 +0300
----------------------------------------------------------------------
.../cache/eviction/fifo/FifoEvictionPolicy.java | 5 -----
.../cache/eviction/lru/LruEvictionPolicy.java | 5 -----
.../eviction/sorted/SortedEvictionPolicy.java | 19 +++++--------------
...cheConcurrentEvictionConsistencySelfTest.java | 15 +++++++++++++--
4 files changed, 18 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[12/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-7' into ignite-591
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b84fdaa5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b84fdaa5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b84fdaa5
Branch: refs/heads/ignite-929
Commit: b84fdaa508592ad9950fd17718301ae4be22953f
Parents: bb8dcf9 f72b291
Author: sevdokimov <se...@jetbrains.com>
Authored: Sat Jul 4 16:07:19 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sat Jul 4 16:07:19 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-fabric.xml | 1 +
bin/ignite.bat | 8 +-
bin/ignite.sh | 6 +-
bin/include/parseargs.bat | 1 +
bin/include/parseargs.sh | 3 +
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../ignite/compute/ComputeTaskSplitAdapter.java | 2 +-
.../configuration/CacheConfiguration.java | 105 +++---
.../configuration/NearCacheConfiguration.java | 10 +-
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 1 -
.../managers/communication/GridIoManager.java | 173 ++++++---
.../managers/communication/GridIoMessage.java | 15 +-
.../managers/communication/GridIoPolicy.java | 32 +-
.../discovery/GridDiscoveryManager.java | 32 +-
.../eventstorage/GridEventStorageManager.java | 2 +-
.../processors/cache/CacheOperationContext.java | 44 ++-
.../internal/processors/cache/CacheType.java | 8 +-
.../processors/cache/GridCacheAdapter.java | 91 +++--
.../processors/cache/GridCacheAtomicFuture.java | 12 +-
.../processors/cache/GridCacheContext.java | 4 +-
.../cache/GridCacheDeploymentManager.java | 10 +-
.../processors/cache/GridCacheIoManager.java | 12 +-
.../processors/cache/GridCacheMvccManager.java | 8 +-
.../processors/cache/GridCacheProcessor.java | 62 ++-
.../processors/cache/GridCacheProxyImpl.java | 10 +-
.../processors/cache/GridCacheSwapManager.java | 257 ++++++++-----
.../processors/cache/GridCacheUtils.java | 42 +++
.../processors/cache/IgniteCacheFutureImpl.java | 42 +++
.../processors/cache/IgniteCacheProxy.java | 38 +-
.../GridDistributedTxFinishRequest.java | 11 +-
.../GridDistributedTxPrepareRequest.java | 9 +-
.../GridDistributedTxRemoteAdapter.java | 3 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 3 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 3 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 3 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 5 +-
.../dht/atomic/GridDhtAtomicCache.java | 18 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++++++-
.../near/GridNearTxFinishRequest.java | 3 +-
.../cache/distributed/near/GridNearTxLocal.java | 3 +-
.../distributed/near/GridNearTxRemote.java | 5 +-
.../cache/transactions/IgniteInternalTx.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 11 +-
.../transactions/IgniteTxLocalAdapter.java | 3 +-
.../processors/clock/GridClockServer.java | 21 +-
.../datastructures/GridCacheAtomicLongImpl.java | 25 +-
.../GridCacheAtomicSequenceImpl.java | 11 +-
.../GridCacheAtomicStampedImpl.java | 21 +-
.../GridCacheCountDownLatchImpl.java | 16 +-
.../internal/processors/igfs/IgfsContext.java | 5 +-
.../plugin/IgnitePluginProcessor.java | 3 +-
.../internal/util/future/IgniteFutureImpl.java | 18 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 10 +-
.../util/nio/GridNioMessageTracker.java | 23 +-
.../plugin/extensions/communication/IoPool.java | 42 +++
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 5 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 7 +-
.../TcpDiscoveryMulticastIpFinder.java | 76 +++-
.../startup/cmdline/CommandLineStartup.java | 3 +-
.../startup/cmdline/CommandLineTransformer.java | 9 +
.../core/src/main/resources/ignite.properties | 2 +-
.../core/src/test/config/spark/spark-config.xml | 46 +++
modules/core/src/test/config/tests.properties | 6 +-
.../communication/GridIoManagerSelfTest.java | 2 +-
.../IgniteTopologyPrintFormatSelfTest.java | 289 ++++++++++++++
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ------
.../IgniteDaemonNodeMarshallerCacheTest.java | 192 ++++++++++
.../cache/IgniteInternalCacheTypesTest.java | 3 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 147 ++++++++
.../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++
...gniteCachePutRetryTransactionalSelfTest.java | 74 ++++
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +-
.../GridCachePartitionedFailoverSelfTest.java | 5 +
.../GridCacheEvictionFilterSelfTest.java | 2 -
.../GridP2PContinuousDeploymentSelfTest.java | 2 -
.../inmemory/GridTestSwapSpaceSpi.java | 3 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 +
.../IgniteCacheFailoverTestSuite.java | 3 +
.../testsuites/IgniteCacheTestSuite3.java | 1 -
.../testsuites/IgniteKernalSelfTestSuite.java | 1 +
modules/core/src/test/resources/helloworld.gar | Bin 6092 -> 0 bytes
modules/core/src/test/resources/helloworld1.gar | Bin 6092 -> 0 bytes
modules/core/src/test/resources/readme.txt | 6 -
modules/docker/Dockerfile | 55 +++
modules/docker/README.txt | 11 +
modules/docker/build_users_libs.sh | 39 ++
modules/docker/download_ignite.sh | 49 +++
modules/docker/execute.sh | 62 +++
modules/docker/run.sh | 34 ++
modules/extdata/p2p/pom.xml | 4 +-
modules/extdata/uri/META-INF/ignite.xml | 38 ++
.../extdata/uri/modules/uri-dependency/pom.xml | 42 +++
.../deployment/uri/tasks/GarHelloWorldBean.java | 60 +++
.../src/main/resources/gar-example.properties | 18 +
modules/extdata/uri/pom.xml | 62 ++-
.../deployment/uri/tasks/GarHelloWorldTask.java | 81 ++++
.../deployment/uri/tasks/gar-spring-bean.xml | 29 ++
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +-
.../processors/query/h2/opt/GridH2Table.java | 2 +-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +-
...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 -
.../IgniteCacheQueryNodeRestartSelfTest2.java | 5 +
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 116 ++++++
.../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++
.../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++
.../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++
.../ignite/stream/kafka/SimplePartitioner.java | 53 +++
modules/log4j/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
.../ignite/schema/model/PojoDescriptor.java | 2 +
.../apache/ignite/schema/model/PojoField.java | 1 +
.../parser/dialect/OracleMetadataDialect.java | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
.../org/apache/ignite/spark/IgniteContext.scala | 50 ++-
.../org/apache/ignite/spark/IgniteRddSpec.scala | 18 +
modules/spring/pom.xml | 2 +-
.../util/spring/IgniteSpringHelperImpl.java | 72 +++-
.../IgniteExcludeInConfigurationTest.java | 78 ++++
.../org/apache/ignite/spring/sprint-exclude.xml | 57 +++
.../testsuites/IgniteSpringTestSuite.java | 2 +
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 3 +-
.../visor/commands/open/VisorOpenCommand.scala | 319 ++++++++++++++++
.../scala/org/apache/ignite/visor/visor.scala | 230 +----------
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +
.../commands/kill/VisorKillCommandSpec.scala | 1 +
.../commands/start/VisorStartCommandSpec.scala | 1 +
.../commands/tasks/VisorTasksCommandSpec.scala | 1 +
.../commands/vvm/VisorVvmCommandSpec.scala | 1 +
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 15 +-
166 files changed, 4204 insertions(+), 929 deletions(-)
----------------------------------------------------------------------
[09/50] incubator-ignite git commit: IGNITE-591 Fix imports.
Posted by sb...@apache.org.
IGNITE-591 Fix imports.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb8dcf9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb8dcf9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb8dcf9c
Branch: refs/heads/ignite-929
Commit: bb8dcf9ce0290a4016c13184aef9796c7a2d7bde
Parents: 5314335
Author: sevdokimov <se...@jetbrains.com>
Authored: Fri Jul 3 11:09:43 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Fri Jul 3 11:09:43 2015 +0300
----------------------------------------------------------------------
.../hibernate/HibernateL2CacheSelfTest.java | 45 +++++++++-----------
.../HibernateL2CacheTransactionalSelfTest.java | 33 +++++++-------
.../processors/cache/jta/CacheJtaManager.java | 23 ++++------
.../processors/cache/GridCacheJtaSelfTest.java | 21 ++++-----
4 files changed, 55 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index fe34ea8..91d5c26 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -17,40 +17,37 @@
package org.apache.ignite.cache.hibernate;
-import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.cache.affinity.rendezvous.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
import org.hibernate.*;
import org.hibernate.Query;
-import org.hibernate.annotations.NaturalId;
-import org.hibernate.annotations.NaturalIdCache;
-import org.hibernate.cache.spi.GeneralDataRegion;
-import org.hibernate.cache.spi.TransactionalDataRegion;
+import org.hibernate.annotations.*;
+import org.hibernate.cache.spi.*;
import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.exception.ConstraintViolationException;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.stat.NaturalIdCacheStatistics;
-import org.hibernate.stat.SecondLevelCacheStatistics;
+import org.hibernate.cfg.*;
+import org.hibernate.exception.*;
+import org.hibernate.service.*;
+import org.hibernate.stat.*;
import javax.persistence.*;
import java.util.*;
-import java.util.concurrent.Callable;
+import java.util.concurrent.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+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.cache.hibernate.HibernateRegionFactory.*;
import static org.hibernate.cfg.Environment.*;
+import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.Entity;
+
/**
*
* Tests Hibernate L2 cache.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
index 6f47d3b..efc6f3e 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
@@ -17,24 +17,23 @@
package org.apache.ignite.cache.hibernate;
-import org.apache.commons.dbcp.managed.BasicManagedDataSource;
-import org.apache.ignite.cache.jta.CacheTmLookup;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.h2.jdbcx.JdbcDataSource;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
+import org.apache.commons.dbcp.managed.*;
+import org.apache.ignite.cache.jta.*;
+import org.apache.ignite.configuration.*;
+import org.h2.jdbcx.*;
+import org.hibernate.cache.spi.access.*;
+import org.hibernate.engine.transaction.internal.jta.*;
import org.hibernate.engine.transaction.spi.TransactionFactory;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jta.platform.internal.AbstractJtaPlatform;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
-import org.jetbrains.annotations.Nullable;
-import org.objectweb.jotm.Jotm;
-
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-import java.util.Collections;
+import org.hibernate.service.*;
+import org.hibernate.service.jdbc.connections.internal.*;
+import org.hibernate.service.jdbc.connections.spi.*;
+import org.hibernate.service.jta.platform.internal.*;
+import org.hibernate.service.jta.platform.spi.*;
+import org.jetbrains.annotations.*;
+import org.objectweb.jotm.*;
+
+import javax.transaction.*;
+import java.util.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
index c5a94bc..2a0d46d 100644
--- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
+++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
@@ -17,20 +17,15 @@
package org.apache.ignite.internal.processors.cache.jta;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.jta.CacheTmLookup;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.TransactionConfiguration;
-import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
-import org.jetbrains.annotations.Nullable;
-
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import java.lang.ref.WeakReference;
-import java.util.Map;
-import java.util.WeakHashMap;
+import org.apache.ignite.*;
+import org.apache.ignite.cache.jta.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
+import org.jetbrains.annotations.*;
+
+import javax.transaction.*;
+import java.lang.ref.*;
+import java.util.*;
/**
* Implementation of {@link CacheJtaManagerAdapter}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
index 9b8cb15..e1c8a77 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -17,21 +17,18 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.jta.CacheTmLookup;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.jta.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.transactions.Transaction;
-import org.objectweb.jotm.Jotm;
+import org.objectweb.jotm.*;
-import javax.transaction.Status;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
+import javax.transaction.*;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.transactions.TransactionState.ACTIVE;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.transactions.TransactionState.*;
/**
* Abstract class for cache tests.
[45/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-591
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cfeec2dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cfeec2dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cfeec2dd
Branch: refs/heads/ignite-929
Commit: cfeec2ddb63770dfe28176c3916630753162631c
Parents: 839fe79 44b52b4
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Jul 8 14:32:52 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Jul 8 14:32:52 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/ServerImpl.java | 20 ++
.../tcp/internal/TcpDiscoveryNode.java | 2 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 8 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 10 +-
...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++
.../IgniteSpiDiscoverySelfTestSuite.java | 3 +
modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++
.../config/benchmark-put-indexed-val.properties | 64 ++++++
modules/yardstick/config/ignite-base-config.xml | 23 +++
.../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++
.../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++
.../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++
.../ignite/yardstick/cache/model/Person1.java | 55 +++++
.../ignite/yardstick/cache/model/Person2.java | 67 ++++++
.../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++
16 files changed, 727 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[29/50] incubator-ignite git commit: # review
Posted by sb...@apache.org.
# 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/bc297978
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc297978
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc297978
Branch: refs/heads/ignite-929
Commit: bc2979788d7f728766e5b70314ae45c62c9596b2
Parents: 25c349f
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 7 16:51:30 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 7 16:51:30 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/loadtests/hashmap/GridCacheTestContext.java | 1 -
.../ignite/cache/hibernate/HibernateL2CacheSelfTest.java | 2 --
.../main/java/org/apache/ignite/cache/jta/CacheTmLookup.java | 2 +-
.../processors/cache/GridTmLookupLifecycleAwareSelfTest.java | 7 +++----
4 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc297978/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index f0d1af8..e9d7a45 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@ -19,7 +19,6 @@ package org.apache.ignite.loadtests.hashmap;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import org.apache.ignite.internal.processors.cache.dr.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc297978/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index 91d5c26..c819ec9 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -46,8 +46,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.*;
import static org.hibernate.cfg.Environment.*;
-import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.Entity;
-
/**
*
* Tests Hibernate L2 cache.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc297978/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
index 5a38576..f16d6d2 100644
--- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
+++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
@@ -18,7 +18,7 @@
package org.apache.ignite.cache.jta;
import org.apache.ignite.*;
-import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.configuration.*;
import org.jetbrains.annotations.*;
import javax.transaction.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc297978/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
index 261765b..f7d3902 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
@@ -44,21 +44,20 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa
/** */
private boolean configureGlobalTmLookup;
-
+
/**
*/
@SuppressWarnings("PublicInnerClass")
public static class TestTxLookup extends GridAbstractLifecycleAwareSelfTest.TestLifecycleAware
implements CacheTmLookup {
-
/** */
@IgniteInstanceResource
Ignite ignite;
-
+
/** {@inheritDoc} */
@Override public void start() {
super.start();
-
+
assertNotNull(ignite);
}
[40/50] incubator-ignite git commit: Added benchmarks.
Posted by sb...@apache.org.
Added benchmarks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/946b08ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/946b08ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/946b08ba
Branch: refs/heads/ignite-929
Commit: 946b08ba435813881920f8547d7cff36a9faf9a2
Parents: 4031db7
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jul 8 12:30:41 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jul 8 12:30:41 2015 +0300
----------------------------------------------------------------------
.../config/benchmark-index-put.properties | 64 +++++
modules/yardstick/config/ignite-base-config.xml | 23 ++
.../cache/IgnitePutIndex1Benchmark.java | 42 ++++
.../cache/IgnitePutIndex2Benchmark.java | 42 ++++
.../cache/IgnitePutIndex8Benchmark.java | 42 ++++
.../ignite/yardstick/cache/model/Person1.java | 78 ++++++
.../ignite/yardstick/cache/model/Person2.java | 104 ++++++++
.../ignite/yardstick/cache/model/Person8.java | 242 +++++++++++++++++++
8 files changed, 637 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/config/benchmark-index-put.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-index-put.properties b/modules/yardstick/config/benchmark-index-put.properties
new file mode 100644
index 0000000..fb73656
--- /dev/null
+++ b/modules/yardstick/config/benchmark-index-put.properties
@@ -0,0 +1,64 @@
+# 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.
+
+#
+# Contains benchmarks for SQL queries.
+#
+
+# JVM options.
+# JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
+
+# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
+JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" \
+ -XX:+UseParNewGC \
+ -XX:+UseConcMarkSweepGC \
+ -XX:+UseTLAB \
+ -XX:NewSize=128m \
+ -XX:MaxNewSize=128m \
+ -XX:MaxTenuringThreshold=0 \
+ -XX:SurvivorRatio=1024 \
+ -XX:+UseCMSInitiatingOccupancyOnly \
+ -XX:CMSInitiatingOccupancyFraction=60 \
+"
+
+# List of default probes.
+# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux).
+BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
+
+# Packages where the specified benchmark is searched by reflection mechanism.
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+
+# Probe point writer class name.
+# BENCHMARK_WRITER=
+
+# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default.
+SERVER_HOSTS=localhost,localhost
+
+# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default.
+DRIVER_HOSTS=localhost
+
+# Remote username.
+# REMOTE_USER=
+
+# Number of nodes, used to wait for the specified number of nodes to start.
+nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+
+# Run configuration.
+# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+CONFIGS="\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex1Benchmark -sn IgniteNode -ds atomic-indexed1-put,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex2Benchmark -sn IgniteNode -ds atomic-indexed2-put,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex8Benchmark -sn IgniteNode -ds atomic-indexed8-put\
+"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index 9d28774..b2c976a 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -104,6 +104,29 @@
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="atomic-index"/>
+
+ <property name="cacheMode" value="PARTITIONED"/>
+
+ <property name="atomicityMode" value="ATOMIC"/>
+
+ <property name="swapEnabled" value="false"/>
+
+ <property name="indexedTypes">
+ <list>
+ <value>java.lang.Integer</value>
+ <value>org.apache.ignite.yardstick.cache.model.Person1</value>
+
+ <value>java.lang.Integer</value>
+ <value>org.apache.ignite.yardstick.cache.model.Person2</value>
+
+ <value>java.lang.Integer</value>
+ <value>org.apache.ignite.yardstick.cache.model.Person8</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="query"/>
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java
new file mode 100644
index 0000000..65dd39a
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java
@@ -0,0 +1,42 @@
+/*
+ * 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.yardstick.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.yardstick.cache.model.*;
+
+import java.util.*;
+
+/**
+ * Ignite benchmark that performs put operations for entity with indexed fields.
+ */
+public class IgnitePutIndex1Benchmark extends IgniteCacheAbstractBenchmark {
+ /** {@inheritDoc} */
+ @Override public boolean test(Map<Object, Object> ctx) throws Exception {
+ int key = nextRandom(args.range());
+
+ cache.put(key, new Person1(key));
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteCache<Integer, Object> cache() {
+ return ignite().cache("atomic-index");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java
new file mode 100644
index 0000000..b4cf86f
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java
@@ -0,0 +1,42 @@
+/*
+ * 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.yardstick.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.yardstick.cache.model.*;
+
+import java.util.*;
+
+/**
+ * Ignite benchmark that performs put operations for entity with indexed fields.
+ */
+public class IgnitePutIndex2Benchmark extends IgniteCacheAbstractBenchmark {
+ /** {@inheritDoc} */
+ @Override public boolean test(Map<Object, Object> ctx) throws Exception {
+ int key = nextRandom(args.range());
+
+ cache.put(key, new Person2(key, key + 1));
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteCache<Integer, Object> cache() {
+ return ignite().cache("atomic-index");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java
new file mode 100644
index 0000000..542a139
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex8Benchmark.java
@@ -0,0 +1,42 @@
+/*
+ * 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.yardstick.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.yardstick.cache.model.*;
+
+import java.util.*;
+
+/**
+ * Ignite benchmark that performs put operations for entity with indexed fields.
+ */
+public class IgnitePutIndex8Benchmark extends IgniteCacheAbstractBenchmark {
+ /** {@inheritDoc} */
+ @Override public boolean test(Map<Object, Object> ctx) throws Exception {
+ int key = nextRandom(args.range());
+
+ cache.put(key, new Person8(key, key + 1, key + 2, key + 3, key + 4, key + 5, key + 6, key + 7));
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteCache<Integer, Object> cache() {
+ return ignite().cache("atomic-index");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java
new file mode 100644
index 0000000..0b2a0bf
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java
@@ -0,0 +1,78 @@
+/*
+ * 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.yardstick.cache.model;
+
+import org.apache.ignite.cache.query.annotations.*;
+
+import java.io.*;
+
+/**
+ * Value used for indexed put test.
+ */
+public class Person1 implements Serializable {
+ /** Value. */
+ @QuerySqlField(index = true)
+ private int val1;
+
+ /**
+ * Empty constructor.
+ */
+ public Person1() {
+ // No-op.
+ }
+
+ /**
+ * Constructs.
+ *
+ * @param val1 Indexed value.
+ */
+ public Person1(int val1) {
+ this.val1 = val1;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal1() {
+ return val1;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val1 Value.
+ */
+ public void setVal1(int val1) {
+ this.val1 = val1;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || (o instanceof Person1) && val1 == ((Person1)o).val1;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return val1;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "IndexedValue1 [val1=" + val1 + ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java
new file mode 100644
index 0000000..3b1cb9e
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java
@@ -0,0 +1,104 @@
+/*
+ * 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.yardstick.cache.model;
+
+import org.apache.ignite.cache.query.annotations.*;
+
+import java.io.*;
+
+/**
+ * Value used for indexed put test.
+ */
+public class Person2 implements Serializable {
+ /** Value 1. */
+ @QuerySqlField(index = true)
+ private int val1;
+
+ /** Value 2. */
+ @QuerySqlField(index = true)
+ private int val2;
+
+ /**
+ * Empty constructor.
+ */
+ public Person2() {
+ // No-op.
+ }
+
+ /**
+ * Constructs.
+ */
+ public Person2(int val1, int val2) {
+ this.val1 = val1;
+ this.val2 = val2;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal1() {
+ return val1;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val1 Value.
+ */
+ public void setVal1(int val1) {
+ this.val1 = val1;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal2() {
+ return val2;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val2 Value.
+ */
+ public void setVal2(int val2) {
+ this.val2 = val2;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ Person2 value2 = (Person2)o;
+
+ return val1 == value2.val1 && val2 == value2.val2;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return 31 * val1 + val2;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "IndexedValue2 [val1=" + val1 + ", val2=" + val2 + ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/946b08ba/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java
new file mode 100644
index 0000000..b8e3f7c
--- /dev/null
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java
@@ -0,0 +1,242 @@
+/*
+ * 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.yardstick.cache.model;
+
+import org.apache.ignite.cache.query.annotations.*;
+
+import java.io.*;
+
+/**
+ * Value used for indexed put test.
+ */
+public class Person8 implements Serializable {
+ /** Value 1. */
+ @QuerySqlField(index = true)
+ private int val1;
+
+ /** Value 2. */
+ @QuerySqlField(index = true)
+ private int val2;
+
+ /** Value 3. */
+ @QuerySqlField(index = true)
+ private int val3;
+
+ /** Value 4. */
+ @QuerySqlField(index = true)
+ private int val4;
+
+ /** Value 5. */
+ @QuerySqlField(index = true)
+ private int val5;
+
+ /** Value 6. */
+ @QuerySqlField(index = true)
+ private int val6;
+
+ /** Value 7. */
+ @QuerySqlField(index = true)
+ private int val7;
+
+ /** Value 8. */
+ @QuerySqlField(index = true)
+ private int val8;
+
+ /**
+ * Empty constructor.
+ */
+ public Person8() {
+ // No-op.
+ }
+
+ /**
+ * Constructs.
+ */
+ public Person8(int val1, int val2, int val3, int val4, int val5, int val6, int val7, int val8) {
+ this.val1 = val1;
+ this.val2 = val2;
+ this.val3 = val3;
+ this.val4 = val4;
+ this.val5 = val5;
+ this.val6 = val6;
+ this.val7 = val7;
+ this.val8 = val8;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal1() {
+ return val1;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val1 Value.
+ */
+ public void setVal1(int val1) {
+ this.val1 = val1;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal2() {
+ return val2;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val2 Value.
+ */
+ public void setVal2(int val2) {
+ this.val2 = val2;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal3() {
+ return val3;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val3 Value.
+ */
+ public void setVal3(int val3) {
+ this.val3 = val3;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal4() {
+ return val4;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val4 Value.
+ */
+ public void setVal4(int val4) {
+ this.val4 = val4;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal5() {
+ return val5;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val5 Value.
+ */
+ public void setVal5(int val5) {
+ this.val5 = val5;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal6() {
+ return val6;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val6 Value.
+ */
+ public void setVal6(int val6) {
+ this.val6 = val6;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal7() {
+ return val7;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val7 Value.
+ */
+ public void setVal7(int val7) {
+ this.val7 = val7;
+ }
+
+ /**
+ * @return Get value.
+ */
+ public int getVal8() {
+ return val8;
+ }
+
+ /**
+ * Set value.
+ *
+ * @param val8 Value.
+ */
+ public void setVal8(int val8) {
+ this.val8 = val8;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ Person8 p8 = (Person8)o;
+
+ return val1 == p8.val1 && val2 == p8.val2 && val3 == p8.val3 && val4 == p8.val4
+ && val5 == p8.val5 && val6 == p8.val6 && val7 == p8.val7 && val8 == p8.val8;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int result = val1;
+
+ result = 31 * result + val2;
+ result = 31 * result + val3;
+ result = 31 * result + val4;
+ result = 31 * result + val5;
+ result = 31 * result + val6;
+ result = 31 * result + val7;
+ result = 31 * result + val8;
+
+ return result;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Person8 [val1=" + val1 + ", val2=" + val2 + ", val3=" + val3 + ", val4=" + val4 + ", val5=" + val5 +
+ ", val6=" + val6 + ", val7=" + val7 + ", val8=" + val8 +']';
+ }
+}
[34/50] incubator-ignite git commit: # master: update DEFAULT_BRANCH
to master.
Posted by sb...@apache.org.
# master: update DEFAULT_BRANCH to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17ee8a6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17ee8a6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17ee8a6b
Branch: refs/heads/ignite-929
Commit: 17ee8a6b837c6266b5065b956df0918305ec8814
Parents: 9d0aa6f
Author: ashutak <as...@gridgain.com>
Authored: Tue Jul 7 20:39:14 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Jul 7 20:39:14 2015 +0300
----------------------------------------------------------------------
dev-tools/slurp.sh | 2 +-
scripts/git-patch-prop.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17ee8a6b/dev-tools/slurp.sh
----------------------------------------------------------------------
diff --git a/dev-tools/slurp.sh b/dev-tools/slurp.sh
index 7edc776..ad7bc01 100755
--- a/dev-tools/slurp.sh
+++ b/dev-tools/slurp.sh
@@ -24,7 +24,7 @@
#
# Default branch name. Need to use last version of "jiraslurp" scripts.
#
-DEFAULT_BRANCH='ignite-sprint-5'
+DEFAULT_BRANCH='master'
#
# TC URL. It is 10.30.0.229 for public TC from agents.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17ee8a6b/scripts/git-patch-prop.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-prop.sh b/scripts/git-patch-prop.sh
index 16f907e..1b531fa 100644
--- a/scripts/git-patch-prop.sh
+++ b/scripts/git-patch-prop.sh
@@ -19,6 +19,6 @@
#
# Git patch-file maker/applier properties.
#
-IGNITE_DEFAULT_BRANCH='ignite-sprint-7'
+IGNITE_DEFAULT_BRANCH='master'
PATCHES_HOME=${IGNITE_HOME}
[13/50] incubator-ignite git commit: # IGNITE-591 Deprecate
CacheConfiguration.transactionLookupClassName,
create TransactionConfiguration.txLookupClassName instead.
Posted by sb...@apache.org.
# IGNITE-591 Deprecate CacheConfiguration.transactionLookupClassName, create TransactionConfiguration.txLookupClassName instead.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/006209c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/006209c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/006209c6
Branch: refs/heads/ignite-929
Commit: 006209c6f4dff212c3aa7b48acb3bca9b303d5f8
Parents: b84fdaa
Author: sevdokimov <se...@jetbrains.com>
Authored: Sat Jul 4 17:09:48 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sat Jul 4 17:09:48 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 4 +
.../configuration/TransactionConfiguration.java | 23 +++
.../processors/cache/GridCacheAttributes.java | 3 +
.../processors/cache/GridCacheContext.java | 7 +-
.../processors/cache/GridCacheProcessor.java | 21 +--
.../cache/GridCacheSharedContext.java | 15 +-
.../cache/jta/CacheJtaManagerAdapter.java | 17 +-
.../cache/jta/CacheNoopJtaManager.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 11 --
.../loadtests/hashmap/GridCacheTestContext.java | 5 +-
.../HibernateTransactionalDataRegion.java | 12 +-
.../apache/ignite/cache/jta/CacheTmLookup.java | 3 +-
.../processors/cache/jta/CacheJtaManager.java | 167 +++++++++++--------
.../processors/cache/GridCacheJtaSelfTest.java | 43 ++++-
.../GridTmLookupLifecycleAwareSelfTest.java | 30 +++-
.../commands/cache/VisorCacheCommand.scala | 2 -
16 files changed, 234 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/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 e2308f2..63c7269 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
@@ -967,7 +967,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* Gets class name of transaction manager finder for integration for JEE app servers.
*
* @return Transaction manager finder.
+ * @deprecated Use {@link TransactionConfiguration#getTxManagerLookupClassName()} instead.
*/
+ @Deprecated
public String getTransactionManagerLookupClassName() {
return tmLookupClsName;
}
@@ -978,7 +980,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* @param tmLookupClsName Name of class implementing GridCacheTmLookup interface that is used to
* receive JTA transaction manager.
* @return {@code this} for chaining.
+ * @deprecated Use {@link TransactionConfiguration#setTxManagerLookupClassName(String)} instead.
*/
+ @Deprecated
public CacheConfiguration<K, V> setTransactionManagerLookupClassName(String tmLookupClsName) {
this.tmLookupClsName = tmLookupClsName;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index 9a4114b..5fed59f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -61,6 +61,9 @@ public class TransactionConfiguration implements Serializable {
/** Pessimistic tx log linger. */
private int pessimisticTxLogLinger = DFLT_PESSIMISTIC_TX_LOG_LINGER;
+ /** Name of class implementing GridCacheTmLookup. */
+ private String tmLookupClsName;
+
/**
* Empty constructor.
*/
@@ -78,6 +81,7 @@ public class TransactionConfiguration implements Serializable {
pessimisticTxLogLinger = cfg.getPessimisticTxLogLinger();
pessimisticTxLogSize = cfg.getPessimisticTxLogSize();
txSerEnabled = cfg.isTxSerializableEnabled();
+ tmLookupClsName = cfg.getTxManagerLookupClassName();
}
/**
@@ -202,4 +206,23 @@ public class TransactionConfiguration implements Serializable {
public void setPessimisticTxLogLinger(int pessimisticTxLogLinger) {
this.pessimisticTxLogLinger = pessimisticTxLogLinger;
}
+
+ /**
+ * Gets class name of transaction manager finder for integration for JEE app servers.
+ *
+ * @return Transaction manager finder.
+ */
+ public String getTxManagerLookupClassName() {
+ return tmLookupClsName;
+ }
+
+ /**
+ * Sets look up mechanism for available {@code TransactionManager} implementation, if any.
+ *
+ * @param tmLookupClsName Name of class implementing GridCacheTmLookup interface that is used to
+ * receive JTA transaction manager.
+ */
+ public void setTxManagerLookupClassName(String tmLookupClsName) {
+ this.tmLookupClsName = tmLookupClsName;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/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 755b89a..78c4722 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
@@ -186,7 +186,10 @@ public class GridCacheAttributes implements Serializable {
/**
* @return Transaction manager lookup class name.
+ * @deprecated Transaction manager lookup must be configured in
+ * {@link TransactionConfiguration#getTxManagerLookupClassName()}.
*/
+ @Deprecated
public String transactionManagerLookupClassName() {
return ccfg.getTransactionManagerLookupClassName();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 580e452..c454da9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -133,9 +133,6 @@ public class GridCacheContext<K, V> implements Externalizable {
/** Replication manager. */
private GridCacheDrManager drMgr;
- /** JTA manager. */
- private CacheJtaManagerAdapter jtaMgr;
-
/** Conflict resolver manager. */
private CacheConflictResolutionManager rslvrMgr;
@@ -251,7 +248,6 @@ public class GridCacheContext<K, V> implements Externalizable {
CacheDataStructuresManager dataStructuresMgr,
GridCacheTtlManager ttlMgr,
GridCacheDrManager drMgr,
- CacheJtaManagerAdapter jtaMgr,
CacheConflictResolutionManager<K, V> rslvrMgr,
CachePluginManager pluginMgr
) {
@@ -292,7 +288,6 @@ public class GridCacheContext<K, V> implements Externalizable {
this.dataStructuresMgr = add(dataStructuresMgr);
this.ttlMgr = add(ttlMgr);
this.drMgr = add(drMgr);
- this.jtaMgr = add(jtaMgr);
this.rslvrMgr = add(rslvrMgr);
this.pluginMgr = add(pluginMgr);
@@ -1018,7 +1013,7 @@ public class GridCacheContext<K, V> implements Externalizable {
* @return JTA manager.
*/
public CacheJtaManagerAdapter jta() {
- return jtaMgr;
+ return sharedCtx.jta();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/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 8124594..1acb351 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
@@ -495,7 +495,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cleanup(cfg, cfg.getEvictionPolicy(), false);
cleanup(cfg, cfg.getAffinity(), false);
cleanup(cfg, cfg.getAffinityMapper(), false);
- cleanup(cfg, cctx.jta().tmLookup(), false);
cleanup(cfg, cctx.store().configuredStore(), false);
NearCacheConfiguration nearCfg = cfg.getNearConfiguration();
@@ -1001,8 +1000,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ctx.kernalContext().query().onCacheStop(ctx);
ctx.kernalContext().continuous().onCacheStop(ctx);
- U.stopLifecycleAware(log, lifecycleAwares(cache.configuration(), ctx.jta().tmLookup(),
- ctx.store().configuredStore()));
+ U.stopLifecycleAware(log, lifecycleAwares(cache.configuration(), ctx.store().configuredStore()));
if (log.isInfoEnabled())
log.info("Stopped cache: " + cache.name());
@@ -1120,9 +1118,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
pluginMgr.validate();
- CacheJtaManagerAdapter jta = JTA.create(cfg.getTransactionManagerLookupClassName() == null);
-
- jta.createTmLookup(cfg);
+ sharedCtx.jta().registerCache(cfg);
// Skip suggestions for internal caches.
if (cacheType.userCache())
@@ -1130,8 +1126,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
Collection<Object> toPrepare = new ArrayList<>();
- toPrepare.add(jta.tmLookup());
-
if (cfgStore instanceof GridCacheLoaderWriterStore) {
toPrepare.add(((GridCacheLoaderWriterStore)cfgStore).loader());
toPrepare.add(((GridCacheLoaderWriterStore)cfgStore).writer());
@@ -1141,7 +1135,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
prepare(cfg, toPrepare);
- U.startLifecycleAware(lifecycleAwares(cfg, jta.tmLookup(), cfgStore));
+ U.startLifecycleAware(lifecycleAwares(cfg, cfgStore));
GridCacheAffinityManager affMgr = new GridCacheAffinityManager();
GridCacheEventManager evtMgr = new GridCacheEventManager();
@@ -1181,7 +1175,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
dataStructuresMgr,
ttlMgr,
drMgr,
- jta,
rslvrMgr,
pluginMgr
);
@@ -1311,7 +1304,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
dataStructuresMgr,
ttlMgr,
drMgr,
- jta,
rslvrMgr,
pluginMgr
);
@@ -1632,7 +1624,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
*/
@SuppressWarnings("unchecked")
private GridCacheSharedContext createSharedContext(GridKernalContext kernalCtx,
- Collection<CacheStoreSessionListener> storeSesLsnrs) {
+ Collection<CacheStoreSessionListener> storeSesLsnrs) throws IgniteCheckedException {
IgniteTxManager tm = new IgniteTxManager();
GridCacheMvccManager mvccMgr = new GridCacheMvccManager();
GridCacheVersionManager verMgr = new GridCacheVersionManager();
@@ -1640,6 +1632,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
GridCachePartitionExchangeManager exchMgr = new GridCachePartitionExchangeManager();
GridCacheIoManager ioMgr = new GridCacheIoManager();
+ CacheJtaManagerAdapter jta = JTA.createOptional();
+
return new GridCacheSharedContext(
kernalCtx,
tm,
@@ -1648,7 +1642,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
depMgr,
exchMgr,
ioMgr,
- storeSesLsnrs
+ storeSesLsnrs,
+ jta
);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 1071ef2..7f4daff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.processors.affinity.*;
+import org.apache.ignite.internal.processors.cache.jta.*;
import org.apache.ignite.internal.processors.cache.store.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
@@ -54,6 +55,9 @@ public class GridCacheSharedContext<K, V> {
/** Cache transaction manager. */
private IgniteTxManager txMgr;
+ /** JTA manager. */
+ private CacheJtaManagerAdapter jtaMgr;
+
/** Partition exchange manager. */
private GridCachePartitionExchangeManager<K, V> exchMgr;
@@ -94,12 +98,14 @@ public class GridCacheSharedContext<K, V> {
GridCacheDeploymentManager<K, V> depMgr,
GridCachePartitionExchangeManager<K, V> exchMgr,
GridCacheIoManager ioMgr,
- Collection<CacheStoreSessionListener> storeSesLsnrs
+ Collection<CacheStoreSessionListener> storeSesLsnrs,
+ CacheJtaManagerAdapter jtaMgr
) {
this.kernalCtx = kernalCtx;
this.mvccMgr = add(mvccMgr);
this.verMgr = add(verMgr);
this.txMgr = add(txMgr);
+ this.jtaMgr = add(jtaMgr);
this.depMgr = add(depMgr);
this.exchMgr = add(exchMgr);
this.ioMgr = add(ioMgr);
@@ -281,6 +287,13 @@ public class GridCacheSharedContext<K, V> {
}
/**
+ * @return JTA manager.
+ */
+ public CacheJtaManagerAdapter jta() {
+ return jtaMgr;
+ }
+
+ /**
* @return Exchange manager.
*/
public GridCachePartitionExchangeManager<K, V> exchange() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
index ef9204d..85fa4b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
@@ -25,15 +25,7 @@ import org.jetbrains.annotations.*;
/**
* Provides possibility to integrate cache transactions with JTA.
*/
-public abstract class CacheJtaManagerAdapter extends GridCacheManagerAdapter {
- /**
- * Creates transaction manager finder.
- *
- * @param ccfg Cache configuration.
- * @throws IgniteCheckedException If failed.
- */
- public abstract void createTmLookup(CacheConfiguration ccfg) throws IgniteCheckedException;
-
+public abstract class CacheJtaManagerAdapter extends GridCacheSharedManagerAdapter {
/**
* Checks if cache is working in JTA transaction and enlist cache as XAResource if necessary.
*
@@ -42,6 +34,13 @@ public abstract class CacheJtaManagerAdapter extends GridCacheManagerAdapter {
public abstract void checkJta() throws IgniteCheckedException;
/**
+ * @param cfg Cache configuration.
+ * @throws IgniteCheckedException If {@link CacheConfiguration#getTransactionManagerLookupClassName()} is incompatible with
+ * another caches or {@link TransactionConfiguration#getTxManagerLookupClassName()}.
+ */
+ public abstract void registerCache(CacheConfiguration<?, ?> cfg) throws IgniteCheckedException;
+
+ /**
* Gets transaction manager finder. Returns Object to avoid dependency on JTA library.
*
* @return Transaction manager finder.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
index 451357f..60e4102 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
@@ -31,7 +31,7 @@ public class CacheNoopJtaManager extends CacheJtaManagerAdapter {
}
/** {@inheritDoc} */
- @Override public void createTmLookup(CacheConfiguration ccfg) throws IgniteCheckedException {
+ @Override public void registerCache(CacheConfiguration<?, ?> cfg) {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/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 4097c4f..b983039 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
@@ -62,9 +62,6 @@ public class VisorCacheConfiguration implements Serializable {
/** Start size. */
private int startSize;
- /** Name of class implementing GridCacheTmLookup. */
- private String tmLookupClsName;
-
/** Off-heap max memory. */
private long offHeapMaxMemory;
@@ -134,7 +131,6 @@ public class VisorCacheConfiguration implements Serializable {
swapEnabled = ccfg.isSwapEnabled();
invalidate = ccfg.isInvalidate();
startSize = ccfg.getStartSize();
- tmLookupClsName = ccfg.getTransactionManagerLookupClassName();
offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
memoryMode = ccfg.getMemoryMode();
@@ -222,13 +218,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @return Name of class implementing GridCacheTmLookup.
- */
- @Nullable public String transactionManagerLookupClassName() {
- return tmLookupClsName;
- }
-
- /**
* @return Off-heap max memory.
*/
public long offsetHeapMaxMemory() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index 77d3905..f0d1af8 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@ -19,6 +19,7 @@ package org.apache.ignite.loadtests.hashmap;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import org.apache.ignite.internal.processors.cache.dr.*;
@@ -55,7 +56,8 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> {
new GridCacheDeploymentManager<K, V>(),
new GridCachePartitionExchangeManager<K, V>(),
new GridCacheIoManager(),
- null
+ null,
+ new CacheNoopJtaManager()
),
defaultCacheConfiguration(),
CacheType.USER,
@@ -71,7 +73,6 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> {
new CacheDataStructuresManager(),
new GridCacheTtlManager(),
new GridOsCacheDrManager(),
- new CacheNoopJtaManager(),
new CacheOsConflictResolutionManager<K, V>(),
new CachePluginManager(ctx, new CacheConfiguration())
);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
index 6a1fd2b..0e2526e 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
@@ -18,6 +18,7 @@
package org.apache.ignite.cache.hibernate;
import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.*;
import org.hibernate.cache.*;
import org.hibernate.cache.spi.*;
@@ -83,9 +84,14 @@ public class HibernateTransactionalDataRegion extends HibernateRegion implements
throw new CacheException("Hibernate TRANSACTIONAL access strategy must have Ignite cache with " +
"'TRANSACTIONAL' atomicity mode: " + cache.name());
- if (cache.configuration().getTransactionManagerLookupClassName() == null)
- throw new CacheException("Hibernate TRANSACTIONAL access strategy must have Ignite cache with " +
- "TransactionManagerLookup configured: " + cache.name());
+ if (cache.configuration().getTransactionManagerLookupClassName() == null) {
+ TransactionConfiguration txCfg = ignite.configuration().getTransactionConfiguration();
+
+ if (txCfg == null || txCfg.getTxManagerLookupClassName() == null)
+ throw new CacheException("Hibernate TRANSACTIONAL access strategy must have Ignite with " +
+ "TransactionManagerLookup configured (see IgniteConfiguration." +
+ "getTransactionConfiguration().getTxManagerLookupClassName()): " + cache.name());
+ }
return new HibernateTransactionalAccessStrategy(ignite, cache);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
index c909c7c..5a38576 100644
--- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
+++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java
@@ -18,6 +18,7 @@
package org.apache.ignite.cache.jta;
import org.apache.ignite.*;
+import org.apache.ignite.configuration.TransactionConfiguration;
import org.jetbrains.annotations.*;
import javax.transaction.*;
@@ -25,7 +26,7 @@ import javax.transaction.*;
/**
* Allows grid to use different transactional systems. Implement this interface
* to look up native transaction manager within your environment. Transaction
- * manager lookup is configured via {@link org.apache.ignite.configuration.CacheConfiguration#getTransactionManagerLookupClassName()}
+ * manager lookup is configured via {@link TransactionConfiguration#getTxManagerLookupClassName()}
* method.
* <p>
* The following implementations are provided out of the box:
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
index 2a0d46d..09d856b 100644
--- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
+++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
@@ -21,37 +21,60 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.jta.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
+import org.apache.ignite.lifecycle.*;
import org.jetbrains.annotations.*;
import javax.transaction.*;
-import java.lang.ref.*;
-import java.util.*;
+import java.util.concurrent.atomic.*;
/**
* Implementation of {@link CacheJtaManagerAdapter}.
*/
public class CacheJtaManager extends CacheJtaManagerAdapter {
/** */
- private static final Map<TransactionManager, ThreadLocal<WeakReference<GridCacheXAResource>>> threadLocals =
- new WeakHashMap<>();
+ private final ThreadLocal<GridCacheXAResource> xaRsrc = new ThreadLocal<>();
/** */
private volatile TransactionManager jtaTm;
/** */
- private ThreadLocal<WeakReference<GridCacheXAResource>> xaRsrc;
+ private final AtomicReference<CacheTmLookup> tmLookupRef = new AtomicReference<>();
- /** */
- private CacheTmLookup tmLookup;
+ /** {@inheritDoc} */
+ @Override protected void start0() throws IgniteCheckedException {
+ super.start0();
+
+ if (cctx.txConfig() != null) {
+ String txLookupClsName = cctx.txConfig().getTxManagerLookupClassName();
+
+ if (txLookupClsName != null)
+ tmLookupRef.set(createTmLookup(txLookupClsName));
+ }
+ }
/** {@inheritDoc} */
- @Override public void createTmLookup(CacheConfiguration ccfg) throws IgniteCheckedException {
- assert ccfg.getTransactionManagerLookupClassName() != null;
+ @Override protected void stop0(boolean cancel) {
+ CacheTmLookup tmLookup = tmLookupRef.get();
+
+ if (tmLookup instanceof LifecycleAware)
+ ((LifecycleAware)tmLookup).stop();
+ }
+ /**
+ * @throws IgniteCheckedException
+ */
+ private CacheTmLookup createTmLookup(String tmLookupClsName) throws IgniteCheckedException {
try {
- Class<?> cls = Class.forName(ccfg.getTransactionManagerLookupClassName());
+ Class<?> cls = Class.forName(tmLookupClsName);
+
+ CacheTmLookup res = (CacheTmLookup)cls.newInstance();
- tmLookup = (CacheTmLookup)cls.newInstance();
+ cctx.kernalContext().resource().injectGeneric(res);
+
+ if (res instanceof LifecycleAware)
+ ((LifecycleAware)res).start();
+
+ return res;
}
catch (Exception e) {
throw new IgniteCheckedException("Failed to instantiate transaction manager lookup.", e);
@@ -60,82 +83,90 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
/** {@inheritDoc} */
@Override public void checkJta() throws IgniteCheckedException {
- TransactionManager jtaTm = this.jtaTm;
-
if (jtaTm == null) {
try {
- jtaTm = tmLookup.getTm();
-
- if (jtaTm == null)
+ CacheTmLookup tmLookup = tmLookupRef.get();
+
+ if (tmLookup == null)
return;
-
- synchronized (threadLocals) {
- if (this.jtaTm != null)
- jtaTm = this.jtaTm;
- else {
- xaRsrc = threadLocals.get(jtaTm);
-
- if (xaRsrc == null) {
- xaRsrc = new ThreadLocal<>();
-
- threadLocals.put(jtaTm, xaRsrc);
- }
-
- this.jtaTm = jtaTm;
- }
- }
+
+ jtaTm = tmLookup.getTm();
}
catch (Exception e) {
throw new IgniteCheckedException("Failed to get transaction manager: " + e, e);
}
}
- WeakReference<GridCacheXAResource> rsrcRef = xaRsrc.get();
-
- GridCacheXAResource rsrc = rsrcRef == null ? null : rsrcRef.get();
-
- if (rsrc == null || rsrc.isFinished()) {
- try {
- Transaction jtaTx = jtaTm.getTransaction();
-
- if (jtaTx != null) {
- IgniteInternalTx tx = cctx.tm().userTx();
-
- if (tx == null) {
- TransactionConfiguration tCfg = cctx.kernalContext().config()
- .getTransactionConfiguration();
-
- tx = cctx.tm().newTx(
- /*implicit*/false,
- /*implicit single*/false,
- null,
- tCfg.getDefaultTxConcurrency(),
- tCfg.getDefaultTxIsolation(),
- tCfg.getDefaultTxTimeout(),
- /*store enabled*/true,
- /*tx size*/0
- );
- }
+ if (jtaTm != null) {
+ GridCacheXAResource rsrc = xaRsrc.get();
+
+ if (rsrc == null || rsrc.isFinished()) {
+ try {
+ Transaction jtaTx = jtaTm.getTransaction();
+
+ if (jtaTx != null) {
+ IgniteInternalTx tx = cctx.tm().userTx();
+
+ if (tx == null) {
+ TransactionConfiguration tCfg = cctx.kernalContext().config()
+ .getTransactionConfiguration();
+
+ tx = cctx.tm().newTx(
+ /*implicit*/false,
+ /*implicit single*/false,
+ null,
+ tCfg.getDefaultTxConcurrency(),
+ tCfg.getDefaultTxIsolation(),
+ tCfg.getDefaultTxTimeout(),
+ /*store enabled*/true,
+ /*tx size*/0
+ );
+ }
- rsrc = new GridCacheXAResource(tx, cctx.kernalContext());
+ rsrc = new GridCacheXAResource(tx, cctx.kernalContext());
- if (!jtaTx.enlistResource(rsrc))
- throw new IgniteCheckedException("Failed to enlist XA resource to JTA user transaction.");
+ if (!jtaTx.enlistResource(rsrc))
+ throw new IgniteCheckedException("Failed to enlist XA resource to JTA user transaction.");
- xaRsrc.set(new WeakReference<>(rsrc));
+ xaRsrc.set(rsrc);
+ }
+ }
+ catch (SystemException e) {
+ throw new IgniteCheckedException("Failed to obtain JTA transaction.", e);
+ }
+ catch (RollbackException e) {
+ throw new IgniteCheckedException("Failed to enlist XAResource to JTA transaction.", e);
}
}
- catch (SystemException e) {
- throw new IgniteCheckedException("Failed to obtain JTA transaction.", e);
- }
- catch (RollbackException e) {
- throw new IgniteCheckedException("Failed to enlist XAResource to JTA transaction.", e);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void registerCache(CacheConfiguration<?, ?> cfg) throws IgniteCheckedException {
+ String cacheLookupClsName = cfg.getTransactionManagerLookupClassName();
+
+ if (cacheLookupClsName != null) {
+ CacheTmLookup tmLookup = tmLookupRef.get();
+
+ if (tmLookup == null) {
+ tmLookup = createTmLookup(cacheLookupClsName);
+
+ if (tmLookupRef.compareAndSet(null, tmLookup))
+ return;
+
+ tmLookup = tmLookupRef.get();
}
+
+ if (!cacheLookupClsName.equals(tmLookup.getClass().getName()))
+ throw new IgniteCheckedException("Failed to start cache with CacheTmLookup that specified in cache " +
+ "configuration, because node uses another CacheTmLookup [cache" + cfg.getName() +
+ ", tmLookupClassName=" + cacheLookupClsName + ", tmLookupUsedByNode="
+ + tmLookup.getClass().getName() + ']');
}
}
/** {@inheritDoc} */
@Nullable @Override public Object tmLookup() {
- return tmLookup;
+ return tmLookupRef.get();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
index e1c8a77..29836ef 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -22,11 +22,14 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.jta.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.testframework.*;
import org.apache.ignite.transactions.Transaction;
import org.objectweb.jotm.*;
import javax.transaction.*;
+import java.util.concurrent.*;
+
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.transactions.TransactionState.*;
@@ -65,18 +68,11 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(gridName);
-
- cfg.setTransactionManagerLookupClassName(TestTmLookup.class.getName());
-
- return cfg;
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+ cfg.getTransactionConfiguration().setTxManagerLookupClassName(TestTmLookup.class.getName());
+
CacheConfiguration cfg1 = cacheConfiguration(gridName);
CacheConfiguration cfg2 = cacheConfiguration(gridName);
@@ -100,6 +96,17 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
}
/**
+ *
+ */
+ @SuppressWarnings("PublicInnerClass")
+ public static class TestTmLookup2 implements CacheTmLookup {
+ /** {@inheritDoc} */
+ @Override public TransactionManager getTm() {
+ return null;
+ }
+ }
+
+ /**
* JUnit.
*
* @throws Exception If failed.
@@ -185,4 +192,22 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
assertEquals(1, (int)cache1.get("key"));
assertEquals(1, (int)cache2.get("key"));
}
+
+ public void testUncompatibleTmLookup() {
+ final IgniteEx ignite = grid(0);
+
+ final CacheConfiguration cacheCfg = new CacheConfiguration();
+
+ cacheCfg.setName("Foo");
+ cacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
+ cacheCfg.setTransactionManagerLookupClassName(TestTmLookup2.class.getName());
+
+ GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @Override public Object call() throws IgniteException {
+ ignite.createCache(cacheCfg);
+
+ return null;
+ }
+ }, IgniteException.class, null);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
index 5465a91..261765b 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.cache.jta.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.resources.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.testframework.junits.common.*;
import org.jetbrains.annotations.*;
@@ -41,15 +42,24 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa
/** */
private boolean near;
+ /** */
+ private boolean configureGlobalTmLookup;
+
/**
*/
@SuppressWarnings("PublicInnerClass")
public static class TestTxLookup extends GridAbstractLifecycleAwareSelfTest.TestLifecycleAware
implements CacheTmLookup {
- /**
- */
- public TestTxLookup() {
- super(CACHE_NAME);
+
+ /** */
+ @IgniteInstanceResource
+ Ignite ignite;
+
+ /** {@inheritDoc} */
+ @Override public void start() {
+ super.start();
+
+ assertNotNull(ignite);
}
/** {@inheritDoc} */
@@ -74,7 +84,10 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa
ccfg.setName(CACHE_NAME);
- ccfg.setTransactionManagerLookupClassName(TestTxLookup.class.getName());
+ if (configureGlobalTmLookup)
+ cfg.getTransactionConfiguration().setTxManagerLookupClassName(TestTxLookup.class.getName());
+ else
+ ccfg.setTransactionManagerLookupClassName(TestTxLookup.class.getName());
cfg.setCacheConfiguration(ccfg);
@@ -99,4 +112,11 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa
super.testLifecycleAware();
}
}
+
+ /** {@inheritDoc} */
+ public void testLifecycleAwareGlobal() throws Exception {
+ configureGlobalTmLookup = true;
+
+ super.testLifecycleAware();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/006209c6/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 4c005af..90c2de0 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
@@ -833,8 +833,6 @@ object VisorCacheCommand {
cacheT += ("Invalidate", bool2Str(cfg.invalidate()))
cacheT += ("Start Size", cfg.startSize())
- cacheT += ("Transaction Manager Lookup", safe(cfg.transactionManagerLookupClassName()))
-
cacheT += ("Affinity Function", safe(affinityCfg.function()))
cacheT += ("Affinity Backups", affinityCfg.partitionedBackups())
cacheT += ("Affinity Partitions", safe(affinityCfg.partitions()))
[22/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96c96952
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96c96952
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96c96952
Branch: refs/heads/ignite-929
Commit: 96c969527d6b0d3508c535c097c8a9cef774dc85
Parents: f2aa6ab b8a4b5a
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 7 10:35:22 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 7 10:35:22 2015 +0300
----------------------------------------------------------------------
modules/rest-http/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[17/50] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b87f1385
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b87f1385
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b87f1385
Branch: refs/heads/ignite-929
Commit: b87f1385dc0cdc323bdea0b304d7d92e6ac5b653
Parents: f9fe999 4ff352f
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Jul 6 16:56:36 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Jul 6 16:56:36 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-fabric.xml | 1 +
bin/ignite.bat | 8 +-
bin/ignite.sh | 6 +-
bin/include/parseargs.bat | 1 +
bin/include/parseargs.sh | 3 +
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
.../ClientAbstractConnectivitySelfTest.java | 4 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 6 +-
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../org/apache/ignite/cluster/ClusterGroup.java | 18 +-
.../org/apache/ignite/cluster/ClusterNode.java | 2 +
.../configuration/CacheConfiguration.java | 105 +--
.../configuration/IgniteReflectionFactory.java | 81 +-
.../configuration/NearCacheConfiguration.java | 10 +-
.../ignite/internal/GridKernalContextImpl.java | 5 +-
.../apache/ignite/internal/IgniteKernal.java | 1 -
.../internal/cluster/ClusterGroupAdapter.java | 50 +-
.../cluster/IgniteClusterAsyncImpl.java | 12 +-
.../internal/interop/InteropIgnition.java | 31 +-
.../managers/communication/GridIoManager.java | 173 ++--
.../managers/communication/GridIoMessage.java | 15 +-
.../managers/communication/GridIoPolicy.java | 32 +-
.../discovery/GridDiscoveryManager.java | 32 +-
.../eventstorage/GridEventStorageManager.java | 2 +-
.../processors/cache/CacheOperationContext.java | 44 +-
.../internal/processors/cache/CacheType.java | 8 +-
.../processors/cache/GridCacheAdapter.java | 91 ++-
.../processors/cache/GridCacheAtomicFuture.java | 12 +-
.../processors/cache/GridCacheContext.java | 6 +-
.../cache/GridCacheDeploymentManager.java | 10 +-
.../processors/cache/GridCacheIoManager.java | 12 +-
.../processors/cache/GridCacheMvccManager.java | 8 +-
.../GridCachePartitionExchangeManager.java | 6 +-
.../processors/cache/GridCacheProcessor.java | 62 +-
.../processors/cache/GridCacheProxyImpl.java | 10 +-
.../processors/cache/GridCacheSwapManager.java | 257 +++---
.../processors/cache/GridCacheUtils.java | 42 +
.../processors/cache/IgniteCacheFutureImpl.java | 42 +
.../processors/cache/IgniteCacheProxy.java | 38 +-
.../GridDistributedTxFinishRequest.java | 11 +-
.../GridDistributedTxPrepareRequest.java | 9 +-
.../GridDistributedTxRemoteAdapter.java | 3 +-
.../distributed/dht/GridDhtLocalPartition.java | 3 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 3 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 3 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 3 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 5 +-
.../dht/atomic/GridDhtAtomicCache.java | 27 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++-
.../GridDhtPartitionsExchangeFuture.java | 46 +-
.../near/GridNearTxFinishRequest.java | 3 +-
.../cache/distributed/near/GridNearTxLocal.java | 3 +-
.../distributed/near/GridNearTxRemote.java | 5 +-
.../cache/transactions/IgniteInternalTx.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 11 +-
.../transactions/IgniteTxLocalAdapter.java | 3 +-
.../processors/clock/GridClockServer.java | 21 +-
.../datastructures/DataStructuresProcessor.java | 64 +-
.../datastructures/GridCacheAtomicLongImpl.java | 25 +-
.../GridCacheAtomicSequenceImpl.java | 11 +-
.../GridCacheAtomicStampedImpl.java | 21 +-
.../GridCacheCountDownLatchImpl.java | 16 +-
.../processors/hadoop/HadoopJobInfo.java | 4 +-
.../hadoop/counter/HadoopCounterWriter.java | 5 +-
.../internal/processors/igfs/IgfsContext.java | 5 +-
.../processors/plugin/CachePluginManager.java | 10 +-
.../plugin/IgnitePluginProcessor.java | 3 +-
.../processors/rest/GridRestProcessor.java | 4 +-
.../handlers/task/GridTaskCommandHandler.java | 12 +-
.../processors/task/GridTaskProcessor.java | 23 +-
.../processors/task/GridTaskWorker.java | 4 +-
.../internal/util/GridConfigurationFinder.java | 55 +-
.../ignite/internal/util/IgniteUtils.java | 12 +-
.../internal/util/future/IgniteFutureImpl.java | 18 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 10 +-
.../util/nio/GridNioMessageTracker.java | 23 +-
.../apache/ignite/internal/visor/VisorJob.java | 2 +
.../internal/visor/log/VisorLogSearchTask.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 4 +
.../visor/query/VisorQueryCleanupTask.java | 14 +
.../util/VisorClusterGroupEmptyException.java | 37 +
.../plugin/extensions/communication/IoPool.java | 42 +
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 156 ++--
.../ignite/spi/discovery/tcp/ServerImpl.java | 110 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
.../TcpDiscoveryMulticastIpFinder.java | 76 +-
.../startup/cmdline/CommandLineStartup.java | 3 +-
.../startup/cmdline/CommandLineTransformer.java | 9 +
.../core/src/main/resources/ignite.properties | 2 +-
.../core/src/test/config/spark/spark-config.xml | 46 ++
modules/core/src/test/config/tests.properties | 6 +-
.../internal/ClusterGroupAbstractTest.java | 777 ++++++++++++++++++
.../internal/ClusterGroupHostsSelfTest.java | 141 ++++
.../ignite/internal/ClusterGroupSelfTest.java | 251 ++++++
.../internal/GridDiscoveryEventSelfTest.java | 12 +-
.../internal/GridProjectionAbstractTest.java | 784 -------------------
.../ignite/internal/GridProjectionSelfTest.java | 251 ------
.../apache/ignite/internal/GridSelfTest.java | 2 +-
.../GridTaskFailoverAffinityRunTest.java | 170 ++++
.../communication/GridIoManagerSelfTest.java | 2 +-
.../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++
.../CacheReadThroughAtomicRestartSelfTest.java | 32 +
...heReadThroughLocalAtomicRestartSelfTest.java | 32 +
.../CacheReadThroughLocalRestartSelfTest.java | 32 +
...dThroughReplicatedAtomicRestartSelfTest.java | 32 +
...cheReadThroughReplicatedRestartSelfTest.java | 32 +
.../cache/CacheReadThroughRestartSelfTest.java | 133 ++++
.../cache/GridCacheAbstractSelfTest.java | 2 +-
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ---
.../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++
...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++++++++++
.../cache/IgniteDynamicCacheStartSelfTest.java | 37 +
.../cache/IgniteInternalCacheTypesTest.java | 3 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +-
.../GridCacheSetAbstractSelfTest.java | 22 +-
.../IgniteDataStructureWithJobTest.java | 111 +++
...ridCachePartitionNotLoadedEventSelfTest.java | 82 ++
.../distributed/IgniteCache150ClientsTest.java | 189 +++++
...teCacheClientNodePartitionsExchangeTest.java | 1 +
.../distributed/IgniteCacheManyClientsTest.java | 2 +
.../IgniteCacheTxMessageRecoveryTest.java | 5 +
.../IgniteCachePutRetryAbstractSelfTest.java | 147 ++++
.../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 +
...gniteCachePutRetryTransactionalSelfTest.java | 74 ++
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 -
.../GridCachePartitionedFailoverSelfTest.java | 5 +
...achePartitionedMultiNodeFullApiSelfTest.java | 53 +-
.../GridCacheReplicatedFailoverSelfTest.java | 5 +
...acheAtomicReplicatedNodeRestartSelfTest.java | 10 +
.../GridCacheEvictionFilterSelfTest.java | 2 -
.../IgniteCacheTxStoreSessionTest.java | 4 +
.../internal/util/IgniteUtilsSelfTest.java | 22 +
.../GridP2PContinuousDeploymentSelfTest.java | 2 -
.../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++-
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++
.../inmemory/GridTestSwapSpaceSpi.java | 3 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 7 +-
.../IgniteCacheDataStructuresSelfTestSuite.java | 1 +
.../IgniteCacheFailoverTestSuite.java | 3 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +-
.../testsuites/IgniteCacheTestSuite3.java | 1 -
.../testsuites/IgniteCacheTestSuite4.java | 8 +
.../testsuites/IgniteClientTestSuite.java | 38 +
.../testsuites/IgniteComputeGridTestSuite.java | 1 +
.../testsuites/IgniteKernalSelfTestSuite.java | 1 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
.../ignite/util/TestTcpCommunicationSpi.java | 21 +
modules/core/src/test/resources/helloworld.gar | Bin 6092 -> 0 bytes
modules/core/src/test/resources/helloworld1.gar | Bin 6092 -> 0 bytes
modules/core/src/test/resources/readme.txt | 6 -
modules/docker/Dockerfile | 55 ++
modules/docker/README.txt | 11 +
modules/docker/build_users_libs.sh | 39 +
modules/docker/download_ignite.sh | 49 ++
modules/docker/execute.sh | 62 ++
modules/docker/run.sh | 34 +
modules/extdata/p2p/pom.xml | 4 +-
.../p2p/GridP2PContinuousDeploymentTask1.java | 2 +-
modules/extdata/uri/META-INF/ignite.xml | 38 +
.../extdata/uri/modules/uri-dependency/pom.xml | 42 +
.../deployment/uri/tasks/GarHelloWorldBean.java | 60 ++
.../src/main/resources/gar-example.properties | 18 +
modules/extdata/uri/pom.xml | 62 +-
.../deployment/uri/tasks/GarHelloWorldTask.java | 81 ++
.../deployment/uri/tasks/gar-spring-bean.xml | 29 +
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 80 +-
.../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +-
.../processors/hadoop/HadoopClassLoader.java | 29 +
.../processors/hadoop/HadoopDefaultJobInfo.java | 27 +-
.../internal/processors/hadoop/HadoopUtils.java | 237 ------
.../hadoop/SecondaryFileSystemProvider.java | 3 +-
.../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 ++++++
.../hadoop/fs/HadoopFileSystemsUtils.java | 11 +
.../hadoop/fs/HadoopLazyConcurrentMap.java | 5 +
.../hadoop/jobtracker/HadoopJobTracker.java | 25 +-
.../child/HadoopChildProcessRunner.java | 3 +-
.../processors/hadoop/v2/HadoopV2Job.java | 84 +-
.../hadoop/v2/HadoopV2JobResourceManager.java | 22 +-
.../hadoop/v2/HadoopV2TaskContext.java | 37 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +-
.../processors/hadoop/HadoopMapReduceTest.java | 2 +-
.../processors/hadoop/HadoopTasksV1Test.java | 7 +-
.../processors/hadoop/HadoopTasksV2Test.java | 7 +-
.../processors/hadoop/HadoopV2JobSelfTest.java | 6 +-
.../collections/HadoopAbstractMapTest.java | 3 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +-
.../processors/query/h2/opt/GridH2Table.java | 2 +-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 5 +
.../IgniteCacheQuerySelfTestSuite.java | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 116 +++
.../ignite/stream/kafka/KafkaStreamer.java | 220 ++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 +
.../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++
.../kafka/KafkaIgniteStreamerSelfTest.java | 227 ++++++
.../ignite/stream/kafka/SimplePartitioner.java | 53 ++
modules/log4j/pom.xml | 2 +-
modules/mesos/pom.xml | 3 +-
modules/rest-http/pom.xml | 14 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
.../ignite/schema/model/PojoDescriptor.java | 2 +
.../apache/ignite/schema/model/PojoField.java | 1 +
.../parser/dialect/OracleMetadataDialect.java | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
.../org/apache/ignite/spark/IgniteContext.scala | 50 +-
.../org/apache/ignite/spark/IgniteRddSpec.scala | 18 +
modules/spring/pom.xml | 2 +-
.../util/spring/IgniteSpringHelperImpl.java | 72 +-
.../IgniteExcludeInConfigurationTest.java | 78 ++
.../org/apache/ignite/spring/sprint-exclude.xml | 57 ++
.../testsuites/IgniteSpringTestSuite.java | 2 +
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 10 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 3 +-
.../commands/cache/VisorCacheCommand.scala | 7 +-
.../visor/commands/open/VisorOpenCommand.scala | 319 ++++++++
.../scala/org/apache/ignite/visor/visor.scala | 230 +-----
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +
.../commands/kill/VisorKillCommandSpec.scala | 1 +
.../commands/start/VisorStartCommandSpec.scala | 1 +
.../commands/tasks/VisorTasksCommandSpec.scala | 1 +
.../commands/vvm/VisorVvmCommandSpec.scala | 1 +
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 6 +-
.../IgniteWebSessionSelfTestSuite.java | 2 +-
modules/yardstick/pom.xml | 2 +-
parent/pom.xml | 1 +
pom.xml | 15 +-
scripts/git-patch-prop.sh | 2 +-
259 files changed, 8315 insertions(+), 2609 deletions(-)
----------------------------------------------------------------------
[19/50] incubator-ignite git commit: minor fix
Posted by sb...@apache.org.
minor 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/7b3cdc85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7b3cdc85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7b3cdc85
Branch: refs/heads/ignite-929
Commit: 7b3cdc852893cb78e7a92daf4e68a2cca053f735
Parents: 3c4499c
Author: Anton <av...@gridgain.com>
Authored: Mon Jul 6 20:25:22 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Mon Jul 6 20:25:22 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b3cdc85/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ec880e..bfa9f62 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
<maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format>
<doxygen.exec>doxygen</doxygen.exec>
<git.exec>git</git.exec>
- <jetty.version>9.0.5.v20130815</jetty.version>
+ <jetty.version>9.2.11.v20150529</jetty.version>
</properties>
<groupId>org.apache.ignite</groupId>
[04/50] incubator-ignite git commit: Merge tag
'ignite-1.1.0-incubating'
Posted by sb...@apache.org.
Merge tag 'ignite-1.1.0-incubating'
ignite-1.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8a6a7cb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8a6a7cb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8a6a7cb6
Branch: refs/heads/ignite-929
Commit: 8a6a7cb6695093783346a3f88ff854cfff25a6db
Parents: 825e2fe 6da491f
Author: avinogradov <av...@gridgain.com>
Authored: Tue Jun 9 19:13:29 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Jun 9 19:13:29 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
DEVNOTES.txt | 70 +-
LICENSE | 238 ++
LICENSE.txt | 238 --
NOTICE | 12 +
NOTICE.txt | 12 -
RELEASE_NOTES.txt | 20 +
assembly/dependencies-fabric.xml | 50 +
assembly/dependencies-hadoop.xml | 1 -
assembly/dependencies-optional-fabric.xml | 82 -
assembly/dependencies-optional-hadoop.xml | 83 -
assembly/release-base.xml | 15 +-
assembly/release-fabric.xml | 10 +-
assembly/release-hadoop.xml | 4 -
assembly/release-schema-import.xml | 50 +
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 4 +-
bin/ignite.sh | 4 +-
bin/ignitevisorcmd.bat | 41 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/build-classpath.bat | 46 +
bin/include/build-classpath.sh | 71 +
bin/include/service.sh | 8 +-
bin/include/target-classpath.bat | 46 -
bin/include/target-classpath.sh | 71 -
config/hadoop/default-config.xml | 15 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
examples/pom-standalone.xml | 17 +-
examples/pom.xml | 105 +-
examples/schema-import/bin/db-init.sql | 17 +
examples/schema-import/pom.xml | 11 +-
.../examples/datagrid/CacheAffinityExample.java | 9 +-
.../examples/datagrid/CacheApiExample.java | 9 +-
.../examples/datagrid/CacheAsyncApiExample.java | 9 +-
.../datagrid/CacheContinuousQueryExample.java | 8 +-
.../datagrid/CacheDataStreamerExample.java | 9 +-
.../examples/datagrid/CacheEventsExample.java | 9 +-
.../examples/datagrid/CachePutGetExample.java | 10 +-
.../examples/datagrid/CacheQueryExample.java | 12 +-
.../datagrid/CacheTransactionExample.java | 8 +-
.../hibernate/HibernateL2CacheExample.java | 5 +-
.../starschema/CacheStarSchemaExample.java | 10 +-
.../store/auto/CacheAutoStoreExample.java | 8 +-
.../auto/CacheAutoStoreLoadDataExample.java | 5 +-
.../datagrid/store/auto/CacheConfig.java | 4 +-
.../store/dummy/CacheDummyStoreExample.java | 5 +-
.../hibernate/CacheHibernateStoreExample.java | 8 +-
.../store/jdbc/CacheJdbcStoreExample.java | 8 +-
.../datastructures/IgniteQueueExample.java | 28 +-
.../datastructures/IgniteSetExample.java | 30 +-
.../streaming/StreamTransformerExample.java | 100 +
.../streaming/StreamVisitorExample.java | 168 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 48 +
.../streaming/wordcount/QueryWords.java | 79 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../examples/ScalarContinuationExample.scala | 10 +-
.../examples/MessagingExamplesSelfTest.java | 2 +-
.../java8/examples/BasicExamplesSelfTest.java | 3 +
.../java8/examples/CacheExamplesSelfTest.java | 4 +
.../examples/CheckpointExamplesSelfTest.java | 3 +
.../examples/ClusterGroupExampleSelfTest.java | 3 +-
.../examples/ContinuationExamplesSelfTest.java | 3 +
.../ContinuousMapperExamplesSelfTest.java | 4 +-
.../DeploymentExamplesMultiNodeSelfTest.java | 2 +
.../examples/DeploymentExamplesSelfTest.java | 2 +
.../HibernateL2CacheExampleSelfTest.java | 3 +
.../java8/examples/IgfsExamplesSelfTest.java | 3 +
.../examples/LifecycleExamplesSelfTest.java | 3 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 2 +
.../examples/MemcacheRestExamplesSelfTest.java | 2 +
.../examples/MessagingExamplesSelfTest.java | 4 +-
.../examples/MonteCarloExamplesSelfTest.java | 3 +
.../examples/SpringBeanExamplesSelfTest.java | 3 +
.../java8/examples/TaskExamplesSelfTest.java | 2 +
ipc/shmem/README.txt | 2 +-
modules/aop/pom.xml | 25 +-
.../aop/aspectj/GridifyAspectJAspect.java | 2 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 2 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 2 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 2 +-
.../spring/GridifySetToValueSpringAspect.java | 2 +-
.../gridify/aop/spring/GridifySpringAspect.java | 2 +-
modules/aws/pom.xml | 43 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
.../s3/S3CheckpointManagerSelfTest.java | 2 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 14 +-
.../s3/S3SessionCheckpointSelfTest.java | 2 +-
.../config/grid-client-config.properties | 50 +-
modules/clients/pom.xml | 43 +-
modules/clients/readme.md | 2 -
.../client/ClientReconnectionSelfTest.java | 69 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../ClientPropertiesConfigurationSelfTest.java | 12 +-
.../rest/AbstractRestProcessorSelfTest.java | 11 +-
.../JettyRestProcessorAbstractSelfTest.java | 5 -
.../clients/src/test/resources/spring-cache.xml | 4 +-
.../src/test/resources/spring-server-node.xml | 4 +-
.../test/resources/spring-server-ssl-node.xml | 4 +-
modules/cloud/README.txt | 32 +
modules/cloud/licenses/apache-2.0.txt | 202 +
modules/cloud/pom.xml | 106 +
.../cloud/TcpDiscoveryCloudIpFinder.java | 433 ++
.../tcp/ipfinder/cloud/package-info.java | 21 +
.../TcpDiscoveryCloudIpFinderSelfTest.java | 124 +
.../tcp/ipfinder/cloud/package-info.java | 22 +
.../ignite/testsuites/IgniteCloudTestSuite.java | 112 +
modules/codegen/pom.xml | 27 +-
.../ignite/codegen/MessageCodeGenerator.java | 31 +-
modules/core/pom.xml | 96 +-
modules/core/src/main/java/META-INF/LICENSE | 238 ++
modules/core/src/main/java/META-INF/NOTICE | 12 +
.../src/main/java/org/apache/ignite/Ignite.java | 26 +
.../java/org/apache/ignite/IgniteCache.java | 35 +-
.../java/org/apache/ignite/IgniteCluster.java | 11 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 81 +-
.../java/org/apache/ignite/IgniteLogger.java | 8 +-
.../java/org/apache/ignite/IgniteServices.java | 2 +-
.../java/org/apache/ignite/IgniteState.java | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 13 +-
.../main/java/org/apache/ignite/Ignition.java | 46 +-
.../apache/ignite/cache/CacheInterceptor.java | 9 +-
.../cache/CacheServerNotFoundException.java | 12 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../apache/ignite/cache/CachingProvider.java | 5 +-
.../ignite/cache/affinity/AffinityUuid.java | 50 +
.../cache/eviction/fifo/FifoEvictionPolicy.java | 57 +-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +-
.../cache/eviction/lru/LruEvictionPolicy.java | 5 +-
.../eviction/sorted/SortedEvictionPolicy.java | 431 ++
.../sorted/SortedEvictionPolicyMBean.java | 66 +
.../cache/eviction/sorted/package-info.java | 21 +
.../apache/ignite/cache/query/QueryMetrics.java | 4 +-
.../apache/ignite/cache/query/ScanQuery.java | 2 +-
.../ignite/cache/query/SqlFieldsQuery.java | 55 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 106 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +-
.../ignite/cluster/ClusterStartNodeResult.java | 46 +
.../ignite/compute/ComputeJobContinuation.java | 2 +
.../configuration/CacheConfiguration.java | 399 +-
.../configuration/CollectionConfiguration.java | 114 +-
.../configuration/ConnectorConfiguration.java | 2 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../configuration/IgniteConfiguration.java | 474 ++-
.../ignite/configuration/TopologyValidator.java | 35 +
.../ignite/events/CacheQueryExecutedEvent.java | 12 +-
.../ignite/events/CacheQueryReadEvent.java | 12 +-
.../ignite/internal/ClusterMetricsSnapshot.java | 385 +-
.../internal/ComputeTaskInternalFuture.java | 2 +-
.../ignite/internal/GridCachePluginContext.java | 78 +
.../apache/ignite/internal/GridComponent.java | 7 +-
.../ignite/internal/GridDirectCollection.java | 3 +
.../ignite/internal/GridJobContextImpl.java | 99 +-
.../ignite/internal/GridJobExecuteRequest.java | 10 +-
.../ignite/internal/GridJobExecuteResponse.java | 4 +-
.../ignite/internal/GridKernalContextImpl.java | 20 +-
.../ignite/internal/GridPluginComponent.java | 9 +-
.../ignite/internal/GridPluginContext.java | 15 +-
.../apache/ignite/internal/GridTaskMessage.java | 30 -
.../ignite/internal/GridTaskSessionRequest.java | 6 +-
.../ignite/internal/GridUpdateNotifier.java | 66 +-
.../ignite/internal/IgniteComponentType.java | 36 +-
.../org/apache/ignite/internal/IgniteEx.java | 19 +-
.../apache/ignite/internal/IgniteKernal.java | 218 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../org/apache/ignite/internal/IgnitionEx.java | 377 +-
.../internal/MarshallerContextAdapter.java | 6 +-
.../ignite/internal/MarshallerContextImpl.java | 95 +-
.../internal/client/GridClientCacheFlag.java | 13 -
.../client/GridClientConfiguration.java | 16 +-
.../impl/connection/GridClientConnection.java | 9 -
.../GridClientConnectionManagerAdapter.java | 2 +-
.../connection/GridClientNioTcpConnection.java | 9 +-
.../router/GridTcpRouterConfiguration.java | 6 +-
.../internal/cluster/ClusterGroupAdapter.java | 163 +-
.../cluster/ClusterStartNodeResultImpl.java | 87 +
.../ClusterTopologyServerNotFoundException.java | 12 +-
.../cluster/IgniteClusterAsyncImpl.java | 5 +-
.../internal/cluster/IgniteClusterImpl.java | 37 +-
.../internal/managers/GridManagerAdapter.java | 60 +-
.../managers/communication/GridIoManager.java | 69 +-
.../communication/GridIoMessageFactory.java | 12 +-
.../GridLifecycleAwareMessageFilter.java | 35 +
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../deployment/GridDeploymentManager.java | 2 +-
.../GridDeploymentPerVersionStore.java | 3 +-
.../discovery/GridDiscoveryManager.java | 113 +-
.../eventstorage/GridEventStorageManager.java | 10 +-
.../managers/indexing/GridIndexingManager.java | 14 +-
.../processors/GridProcessorAdapter.java | 7 +-
.../affinity/GridAffinityAssignmentCache.java | 11 +-
.../affinity/GridAffinityProcessor.java | 5 +-
.../cache/CacheConflictResolutionManager.java | 30 +
.../processors/cache/CacheDistributionMode.java | 67 -
.../processors/cache/CacheEntryImpl.java | 29 +-
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../internal/processors/cache/CacheFlag.java | 108 -
.../processors/cache/CacheFlagException.java | 67 -
.../processors/cache/CacheInvokeResult.java | 24 +-
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/CacheLockImpl.java | 20 +-
.../processors/cache/CacheMetricsImpl.java | 8 +-
.../processors/cache/CacheMetricsSnapshot.java | 223 +-
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 12 +-
.../processors/cache/CacheOperationContext.java | 170 +
.../cache/CacheOsConflictResolutionManager.java | 58 +
.../processors/cache/CacheProjection.java | 1859 ---------
.../cache/CacheStoreBalancingWrapper.java | 6 +
.../cache/CacheStorePartialUpdateException.java | 2 +-
.../internal/processors/cache/CacheType.java | 77 +
.../cache/CacheVersionedEntryImpl.java | 29 +-
.../cache/DynamicCacheChangeRequest.java | 36 +-
.../cache/DynamicCacheDescriptor.java | 46 +-
.../internal/processors/cache/GridCache.java | 227 --
.../processors/cache/GridCacheAdapter.java | 1884 +++------
.../cache/GridCacheAffinityManager.java | 12 -
.../processors/cache/GridCacheAtomicFuture.java | 7 -
.../processors/cache/GridCacheAttributes.java | 8 -
.../cache/GridCacheConcurrentMap.java | 100 +-
.../processors/cache/GridCacheContext.java | 415 +-
.../cache/GridCacheDeploymentManager.java | 9 +-
.../processors/cache/GridCacheEntryEx.java | 62 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../cache/GridCacheEvictionManager.java | 17 +-
.../cache/GridCacheExplicitLockSpan.java | 2 +-
.../processors/cache/GridCacheGateway.java | 119 +-
.../processors/cache/GridCacheIoManager.java | 95 +-
.../processors/cache/GridCacheMapAdapter.java | 238 --
.../processors/cache/GridCacheMapEntry.java | 370 +-
.../cache/GridCacheMapEntryFactory.java | 2 -
.../processors/cache/GridCacheMessage.java | 7 +
.../processors/cache/GridCacheMvcc.java | 2 +-
.../cache/GridCacheMvccCandidate.java | 50 +-
.../processors/cache/GridCacheMvccManager.java | 46 +-
.../GridCachePartitionExchangeManager.java | 144 +-
.../processors/cache/GridCachePeekMode.java | 81 -
.../processors/cache/GridCacheProcessor.java | 868 ++--
.../processors/cache/GridCacheProjectionEx.java | 509 ---
.../cache/GridCacheProjectionImpl.java | 1198 ------
.../processors/cache/GridCacheProxy.java | 27 -
.../processors/cache/GridCacheProxyImpl.java | 900 +----
.../processors/cache/GridCacheReturn.java | 5 +-
.../cache/GridCacheSharedContext.java | 27 +-
.../processors/cache/GridCacheStoreManager.java | 1202 ------
.../processors/cache/GridCacheSwapManager.java | 39 +-
.../processors/cache/GridCacheTtlManager.java | 156 +-
.../processors/cache/GridCacheUtils.java | 148 +-
.../cache/GridCacheWriteBehindStore.java | 1015 -----
.../cache/GridLoadCacheCloseablePredicate.java | 30 +
.../processors/cache/IgniteCacheProxy.java | 541 +--
.../processors/cache/IgniteInternalCache.java | 1816 +++++++++
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../cache/affinity/GridCacheAffinityProxy.java | 30 +-
.../CacheDataStructuresManager.java | 14 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 383 --
...idCacheOptimisticCheckPreparedTxRequest.java | 232 --
...dCacheOptimisticCheckPreparedTxResponse.java | 179 -
.../distributed/GridCacheTxRecoveryFuture.java | 506 +++
.../distributed/GridCacheTxRecoveryRequest.java | 261 ++
.../GridCacheTxRecoveryResponse.java | 182 +
.../GridDistributedCacheAdapter.java | 35 +-
.../distributed/GridDistributedCacheEntry.java | 16 +-
.../distributed/GridDistributedLockRequest.java | 99 +-
.../GridDistributedTxRemoteAdapter.java | 7 +-
.../dht/GridClientPartitionTopology.java | 6 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 5 +
.../dht/GridDhtAffinityAssignmentResponse.java | 26 +-
.../distributed/dht/GridDhtCacheAdapter.java | 86 +-
.../distributed/dht/GridDhtCacheEntry.java | 44 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 9 +-
.../distributed/dht/GridDhtLocalPartition.java | 8 +-
.../distributed/dht/GridDhtLockFuture.java | 68 +-
.../distributed/dht/GridDhtLockRequest.java | 45 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTopologyFuture.java | 8 +
.../dht/GridDhtTransactionalCacheAdapter.java | 42 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 124 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 11 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 130 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 52 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 14 +-
.../distributed/dht/GridNoStorageCacheMap.java | 11 +-
.../dht/GridPartitionedGetFuture.java | 32 +-
.../dht/atomic/GridDhtAtomicCache.java | 298 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 21 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 60 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 71 +-
.../dht/colocated/GridDhtColocatedCache.java | 138 +-
.../colocated/GridDhtColocatedCacheEntry.java | 4 +-
.../colocated/GridDhtColocatedLockFuture.java | 88 +-
.../colocated/GridDhtDetachedCacheEntry.java | 7 +-
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../GridDhtPartitionsAbstractMessage.java | 15 +-
.../GridDhtPartitionsExchangeFuture.java | 68 +-
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 150 +-
.../distributed/near/GridNearCacheAdapter.java | 152 +-
.../distributed/near/GridNearCacheEntry.java | 40 +-
.../distributed/near/GridNearGetFuture.java | 40 +-
.../distributed/near/GridNearLockFuture.java | 54 +-
.../distributed/near/GridNearLockRequest.java | 61 +-
.../near/GridNearTransactionalCache.java | 62 +-
.../near/GridNearTxFinishFuture.java | 11 +-
.../cache/distributed/near/GridNearTxLocal.java | 24 +-
.../near/GridNearTxPrepareFuture.java | 138 +-
.../near/GridNearTxPrepareRequest.java | 64 +-
.../distributed/near/GridNearTxRemote.java | 18 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 +
.../cache/dr/os/GridOsCacheDrManager.java | 111 -
.../processors/cache/local/GridLocalCache.java | 19 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../cache/local/GridLocalLockFuture.java | 2 +
.../local/atomic/GridLocalAtomicCache.java | 293 +-
.../processors/cache/query/CacheQueries.java | 143 -
.../processors/cache/query/CacheQuery.java | 12 +-
.../CacheQueryCloseableScanBiPredicate.java | 30 +
.../query/GridCacheDistributedQueryManager.java | 3 +
.../cache/query/GridCacheLocalQueryFuture.java | 3 +
.../cache/query/GridCacheQueriesEx.java | 68 -
.../cache/query/GridCacheQueriesImpl.java | 238 --
.../cache/query/GridCacheQueriesProxy.java | 285 --
.../cache/query/GridCacheQueryAdapter.java | 2 +-
.../query/GridCacheQueryFutureAdapter.java | 3 +
.../cache/query/GridCacheQueryManager.java | 194 +-
.../cache/query/GridCacheSqlQuery.java | 137 +-
.../cache/query/GridCacheTwoStepQuery.java | 25 +-
.../continuous/CacheContinuousQueryHandler.java | 9 +-
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 4 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 7 +-
.../cache/store/CacheOsStoreManager.java | 59 +
.../cache/store/CacheStoreManager.java | 182 +
.../store/GridCacheStoreManagerAdapter.java | 1111 ++++++
.../cache/store/GridCacheWriteBehindStore.java | 1015 +++++
.../cache/transactions/IgniteInternalTx.java | 10 +-
.../transactions/IgniteTransactionsImpl.java | 18 +-
.../cache/transactions/IgniteTxAdapter.java | 29 +-
.../cache/transactions/IgniteTxEntry.java | 74 +-
.../cache/transactions/IgniteTxHandler.java | 236 +-
.../transactions/IgniteTxLocalAdapter.java | 278 +-
.../cache/transactions/IgniteTxLocalEx.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 353 +-
.../version/CacheVersionConflictResolver.java | 40 +
...ridCacheVersionAbstractConflictResolver.java | 56 -
.../GridCacheVersionConflictResolver.java | 59 -
.../cache/version/GridCacheVersionEx.java | 2 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 22 +-
.../IgniteCacheObjectProcessorImpl.java | 225 +-
.../closure/GridClosureProcessor.java | 16 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../datastreamer/DataStreamProcessor.java | 28 +-
.../datastreamer/DataStreamerCacheUpdaters.java | 15 +-
.../datastreamer/DataStreamerImpl.java | 85 +-
.../datastreamer/DataStreamerRequest.java | 38 +-
.../datastreamer/DataStreamerUpdateJob.java | 16 +-
.../CacheDataStructuresCacheKey.java | 62 +
.../CacheDataStructuresConfigurationKey.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 271 +-
.../GridAtomicCacheQueueImpl.java | 12 +-
.../datastructures/GridCacheAtomicLongImpl.java | 6 +-
.../GridCacheAtomicReferenceImpl.java | 6 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 4 +-
.../GridCacheAtomicStampedImpl.java | 6 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 4 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../datastructures/GridCacheSetImpl.java | 6 +-
.../GridTransactionalCacheQueueImpl.java | 8 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java | 2 -
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 +-
.../processors/igfs/IgfsDataManager.java | 26 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 4 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +-
.../processors/igfs/IgfsFileWorker.java | 180 -
.../processors/igfs/IgfsFileWorkerBatch.java | 228 +-
.../processors/igfs/IgfsFileWorkerTask.java | 32 -
.../processors/igfs/IgfsHelperImpl.java | 3 +-
.../internal/processors/igfs/IgfsImpl.java | 150 +-
.../processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 49 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 6 +-
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../internal/processors/igfs/IgfsThread.java | 8 +-
.../internal/processors/igfs/IgfsUtils.java | 11 +-
.../processors/job/GridJobHoldListener.java | 6 +-
.../processors/job/GridJobProcessor.java | 28 +-
.../internal/processors/job/GridJobWorker.java | 32 +-
.../DiscoveryNodeValidationProcessor.java | 27 +
.../OsDiscoveryNodeValidationProcessor.java | 72 +
.../processors/plugin/CachePluginManager.java | 142 +
.../plugin/IgnitePluginProcessor.java | 71 +-
.../portable/GridPortableInputStream.java | 26 -
.../query/GridQueryFieldMetadata.java | 2 +-
.../processors/query/GridQueryIndexing.java | 23 +-
.../processors/query/GridQueryProcessor.java | 283 +-
.../messages/GridQueryNextPageResponse.java | 90 +-
.../h2/twostep/messages/GridQueryRequest.java | 21 +-
.../processors/rest/GridRestCommand.java | 11 +-
.../processors/rest/GridRestProcessor.java | 43 +-
.../message/GridClientCacheQueryRequest.java | 366 --
.../cache/GridCacheClientQueryResult.java | 97 -
.../handlers/cache/GridCacheCommandHandler.java | 140 +-
.../cache/GridCacheQueryCommandHandler.java | 480 ---
.../top/GridTopologyCommandHandler.java | 3 +-
.../protocols/tcp/GridTcpRestNioListener.java | 24 -
.../rest/request/GridRestCacheQueryRequest.java | 143 -
.../security/GridSecurityProcessor.java | 13 +-
.../processors/security/SecurityContext.java | 8 +-
.../security/os/GridOsSecurityProcessor.java | 11 +-
.../service/GridServiceProcessor.java | 24 +-
.../processors/task/GridTaskProcessor.java | 40 +-
.../processors/task/GridTaskWorker.java | 12 +
.../timeout/GridTimeoutProcessor.java | 3 +
.../ignite/internal/util/GridJavaProcess.java | 42 +-
.../ignite/internal/util/IgniteUtils.java | 70 +-
.../util/future/GridCompoundFuture.java | 9 +-
.../internal/util/future/GridFutureAdapter.java | 20 +-
.../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 45 +-
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../ignite/internal/util/nio/GridNioServer.java | 6 +
.../util/nodestart/IgniteNodeCallable.java | 30 -
.../util/nodestart/IgniteSshHelper.java | 2 +-
.../util/nodestart/StartNodeCallable.java | 30 +
.../util/spring/IgniteSpringHelper.java | 56 +-
.../util/tostring/GridToStringBuilder.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 2 +-
.../ignite/internal/util/worker/GridWorker.java | 9 +-
.../ignite/internal/visor/cache/VisorCache.java | 107 +-
.../cache/VisorCacheAggregatedMetrics.java | 38 +-
.../visor/cache/VisorCacheClearTask.java | 3 +
.../visor/cache/VisorCacheConfiguration.java | 101 +-
.../VisorCacheConfigurationCollectorJob.java | 76 +
.../VisorCacheConfigurationCollectorTask.java | 39 +
.../cache/VisorCacheDefaultConfiguration.java | 21 -
.../visor/cache/VisorCacheMetadataTask.java | 9 +-
.../internal/visor/cache/VisorCacheMetrics.java | 102 +-
.../cache/VisorCacheMetricsCollectorTask.java | 59 +-
.../cache/VisorCacheNearConfiguration.java | 15 +-
.../visor/cache/VisorCacheNodesTask.java | 74 +
.../cache/VisorCacheQueryConfiguration.java | 9 -
.../visor/cache/VisorCacheRebalanceTask.java | 4 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../visor/cache/VisorCacheStartTask.java | 155 +
.../visor/cache/VisorCacheStopTask.java | 69 +
.../cache/VisorCacheStoreConfiguration.java | 41 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 2 +-
.../cache/VisorCacheTypeFieldMetadata.java | 36 +-
.../visor/cache/VisorCacheTypeMetadata.java | 99 +-
.../internal/visor/igfs/VisorIgfsMetrics.java | 128 +-
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../internal/visor/log/VisorLogSearchTask.java | 15 +-
.../visor/misc/VisorResolveHostNameTask.java | 2 +-
.../visor/node/VisorBasicConfiguration.java | 11 +
.../visor/node/VisorGridConfiguration.java | 12 -
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 8 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../node/VisorNodeEventsCollectorTask.java | 61 +-
.../visor/node/VisorRestConfiguration.java | 1 +
.../node/VisorSegmentationConfiguration.java | 4 +-
.../internal/visor/query/VisorQueryArg.java | 81 +
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 95 +
.../internal/visor/query/VisorQueryField.java | 66 +-
.../internal/visor/query/VisorQueryJob.java | 177 +
.../visor/query/VisorQueryNextPageTask.java | 80 +-
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 272 +-
.../internal/visor/query/VisorQueryUtils.java | 55 +-
.../internal/visor/util/VisorEventMapper.java | 13 +
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../internal/visor/util/VisorTaskUtils.java | 36 +-
.../apache/ignite/lang/IgniteAsyncSupport.java | 4 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -
.../apache/ignite/logger/java/JavaLogger.java | 12 +-
.../apache/ignite/marshaller/Marshaller.java | 14 +-
.../ignite/marshaller/MarshallerContext.java | 3 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 10 +-
.../optimized/OptimizedMarshaller.java | 8 +-
.../optimized/OptimizedMarshallerUtils.java | 9 +-
.../ignite/messaging/MessagingListenActor.java | 3 +
.../ignite/plugin/CachePluginConfiguration.java | 36 +
.../ignite/plugin/CachePluginContext.java | 65 +
.../ignite/plugin/CachePluginProvider.java | 84 +
.../org/apache/ignite/plugin/IgnitePlugin.java | 3 -
.../ignite/plugin/PluginConfiguration.java | 10 +-
.../org/apache/ignite/plugin/PluginContext.java | 16 +-
.../apache/ignite/plugin/PluginProvider.java | 9 +-
.../plugin/security/AuthenticationContext.java | 12 +-
.../security/GridSecurityCredentials.java | 184 -
.../GridSecurityCredentialsBasicProvider.java | 44 -
.../GridSecurityCredentialsProvider.java | 44 -
.../plugin/security/GridSecurityException.java | 58 -
.../plugin/security/GridSecurityPermission.java | 69 -
.../security/GridSecurityPermissionSet.java | 66 -
.../plugin/security/GridSecuritySubject.java | 62 -
.../security/GridSecuritySubjectType.java | 48 -
.../plugin/security/SecurityCredentials.java | 191 +
.../SecurityCredentialsBasicProvider.java | 44 +
.../security/SecurityCredentialsProvider.java | 44 +
.../plugin/security/SecurityException.java | 61 +
.../plugin/security/SecurityPermission.java | 69 +
.../plugin/security/SecurityPermissionSet.java | 66 +
.../ignite/plugin/security/SecuritySubject.java | 62 +
.../plugin/security/SecuritySubjectType.java | 48 +
.../segmentation/GridSegmentationPolicy.java | 47 -
.../segmentation/GridSegmentationResolver.java | 64 -
.../plugin/segmentation/SegmentationPolicy.java | 49 +
.../segmentation/SegmentationResolver.java | 65 +
.../apache/ignite/resources/LoggerResource.java | 2 +-
.../apache/ignite/resources/SpringResource.java | 2 +-
.../org/apache/ignite/services/Service.java | 2 +-
.../ignite/services/ServiceConfiguration.java | 2 +-
.../ignite/spi/IgniteNodeValidationResult.java | 66 +
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 71 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 17 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 -
.../org/apache/ignite/spi/IgniteSpiThread.java | 3 +
.../checkpoint/cache/CacheCheckpointSpi.java | 2 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 4 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 10 +-
.../jobstealing/JobStealingCollisionSpi.java | 14 +-
.../PriorityQueueCollisionSpi.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 113 +-
.../tcp/TcpCommunicationSpiMBean.java | 9 -
.../spi/discovery/DiscoveryMetricsProvider.java | 10 +
.../ignite/spi/discovery/DiscoverySpi.java | 7 +
.../spi/discovery/DiscoverySpiDataExchange.java | 5 +-
.../DiscoverySpiNodeAuthenticator.java | 2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 106 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 392 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 63 +-
.../tcp/internal/TcpDiscoveryNode.java | 82 +-
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 +-
.../TcpDiscoveryCheckFailedMessage.java | 24 +-
.../TcpDiscoveryClientReconnectMessage.java | 30 +-
.../TcpDiscoveryCustomEventMessage.java | 32 +-
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-
.../messages/TcpDiscoveryHandshakeRequest.java | 8 -
.../messages/TcpDiscoveryHandshakeResponse.java | 22 -
.../messages/TcpDiscoveryHeartbeatMessage.java | 95 +-
.../TcpDiscoveryJoinRequestMessage.java | 32 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 76 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +-
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -
.../TcpDiscoveryStatusCheckMessage.java | 30 +-
.../memory/MemoryEventStorageSpi.java | 10 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 10 +-
.../jobstealing/JobStealingFailoverSpi.java | 6 +-
.../spi/failover/never/NeverFailoverSpi.java | 8 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 4 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 12 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +-
.../WeightedRandomLoadBalancingSpi.java | 10 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 14 +-
.../ignite/startup/BasicWarmupClosure.java | 39 +-
.../startup/cmdline/CommandLineStartup.java | 12 +-
.../startup/cmdline/CommandLineTransformer.java | 3 +
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../TransactionSynchronization.java | 45 -
.../resources/META-INF/classnames.properties | 197 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../src/test/config/load/merge-sort-base.xml | 2 +-
.../GridCacheAffinityBackupsSelfTest.java | 15 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 52 +-
.../cache/IgniteWarmupClosureSelfTest.java | 82 +
.../fair/GridFairAffinityFunctionSelfTest.java | 2 -
.../IgniteFairAffinityDynamicCacheSelfTest.java | 97 +
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +-
.../internal/GridCacheProjectionRemoveTest.java | 41 -
.../internal/GridContinuousTaskSelfTest.java | 114 +
.../internal/GridDiscoveryEventSelfTest.java | 30 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 117 +
.../internal/GridLifecycleAwareSelfTest.java | 2 +-
.../internal/GridLifecycleBeanSelfTest.java | 36 +
.../GridProjectionForCachesSelfTest.java | 12 +-
.../ignite/internal/GridProjectionSelfTest.java | 82 +
.../ignite/internal/GridStartStopSelfTest.java | 8 +-
.../internal/GridUpdateNotifierSelfTest.java | 30 +-
.../internal/IgniteInternalCacheRemoveTest.java | 41 +
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +-
.../processors/cache/CacheGetFromJobTest.java | 110 +
.../CacheMetricsForClusterGroupSelfTest.java | 252 ++
.../GridCacheAbstractFailoverSelfTest.java | 182 +-
.../GridCacheAbstractFailoverTxSelfTest.java | 110 +
.../cache/GridCacheAbstractFlagsTest.java | 97 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 725 +++-
.../GridCacheAbstractIteratorsSelfTest.java | 3 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 4 +
.../cache/GridCacheAbstractSelfTest.java | 111 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../cache/GridCacheClearAllSelfTest.java | 2 +-
.../cache/GridCacheClearLocallySelfTest.java | 81 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 30 +-
...idCacheConfigurationConsistencySelfTest.java | 3 -
.../cache/GridCacheDeploymentSelfTest.java | 9 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheExAbstractFullApiSelfTest.java | 10 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 8 +-
.../GridCacheInterceptorAbstractSelfTest.java | 2 +
.../cache/GridCacheLuceneQueryIndexTest.java | 20 +-
.../cache/GridCacheMemoryModeSelfTest.java | 40 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 47 +-
.../cache/GridCacheOffHeapSelfTest.java | 662 ----
.../processors/cache/GridCacheOffHeapTest.java | 8 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 130 +-
.../cache/GridCachePartitionedWritesTest.java | 3 +-
.../GridCachePreloadingEvictionsSelfTest.java | 31 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 40 +-
.../processors/cache/GridCachePutAllTask.java | 56 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 19 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 46 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 19 +-
.../processors/cache/GridCacheTestEntryEx.java | 44 +-
...idCacheValueConsistencyAbstractSelfTest.java | 59 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 189 -
.../GridCacheWriteBehindStoreAbstractTest.java | 349 --
.../GridCacheWriteBehindStoreLocalTest.java | 30 -
...heWriteBehindStoreMultithreadedSelfTest.java | 163 -
...BehindStorePartitionedMultiNodeSelfTest.java | 215 -
...ridCacheWriteBehindStorePartitionedTest.java | 30 -
...GridCacheWriteBehindStoreReplicatedTest.java | 30 -
.../GridCacheWriteBehindStoreSelfTest.java | 267 --
...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 +
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 +
...maryWriteOrderNearEnabledStoreValueTest.java | 31 +
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 +
...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 +
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 +
...teCacheConfigurationDefaultTemplateTest.java | 111 +
.../IgniteCacheConfigurationTemplateTest.java | 448 +++
.../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +-
.../cache/IgniteCacheDynamicStopSelfTest.java | 19 +-
.../IgniteCacheEntryListenerAbstractTest.java | 4 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
.../cache/IgniteCachePeekModesAbstractTest.java | 40 +-
.../cache/IgniteCachePutAllRestartTest.java | 203 +
.../IgniteCacheStoreValueAbstractTest.java | 495 +++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 +
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +-
.../cache/IgniteCacheTxStoreValueTest.java | 49 +
.../IgniteClientAffinityAssignmentSelfTest.java | 4 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 74 +-
.../cache/IgniteExchangeFutureHistoryTest.java | 77 +
.../cache/IgniteInternalCacheTypesTest.java | 159 +
.../cache/IgnitePutAllLargeBatchSelfTest.java | 16 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 5 +-
...gniteTopologyValidatorAbstractCacheTest.java | 183 +
...iteTopologyValidatorAbstractTxCacheTest.java | 125 +
...ValidatorNearPartitionedAtomicCacheTest.java | 30 +
...logyValidatorNearPartitionedTxCacheTest.java | 30 +
...logyValidatorPartitionedAtomicCacheTest.java | 49 +
...TopologyValidatorPartitionedTxCacheTest.java | 30 +
...ologyValidatorReplicatedAtomicCacheTest.java | 49 +
...eTopologyValidatorReplicatedTxCacheTest.java | 30 +
.../cache/IgniteTxMultiNodeAbstractTest.java | 53 +-
.../IgniteTxMultiThreadedAbstractTest.java | 5 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueApiSelfAbstractTest.java | 80 +
.../GridCacheQueueCleanupSelfTest.java | 11 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +-
...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 2 +-
.../GridCacheSetAbstractSelfTest.java | 15 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 8 +-
.../IgniteCollectionAbstractTest.java | 181 +-
.../IgniteDataStructureUniqueNameTest.java | 47 +-
.../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 +
.../GridCacheLocalAtomicQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalAtomicSetSelfTest.java | 6 +
.../GridCacheLocalOffheapQueueApiSelfTest.java | 31 +
.../local/GridCacheLocalQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalSetSelfTest.java | 6 +
...artitionedAtomicOffheapQueueApiSelfTest.java | 32 +
...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 +
...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 +
...dCachePartitionedAtomicQueueApiSelfTest.java | 6 +
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 +
...micQueueFailoverDataConsistencySelfTest.java | 6 +
...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 +
...itionedAtomicQueueRotativeMultiNodeTest.java | 6 +
...chePartitionedAtomicSetFailoverSelfTest.java | 6 +
...rtitionedDataStructuresFailoverSelfTest.java | 6 +
...GridCachePartitionedNodeRestartSelfTest.java | 67 -
...artitionedOffHeapValuesQueueApiSelfTest.java | 31 +
...achePartitionedOffHeapValuesSetSelfTest.java | 32 +
...edOffheapDataStructuresFailoverSelfTest.java | 34 +
...hePartitionedOffheapSetFailoverSelfTest.java | 32 +
.../GridCachePartitionedQueueApiSelfTest.java | 6 +
...PartitionedQueueCreateMultiNodeSelfTest.java | 12 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +-
...nedQueueFailoverDataConsistencySelfTest.java | 6 +
...CachePartitionedQueueJoinedNodeSelfTest.java | 6 +
...dCachePartitionedQueueMultiNodeSelfTest.java | 6 +
...hePartitionedQueueRotativeMultiNodeTest.java | 6 +
...GridCachePartitionedSetFailoverSelfTest.java | 6 +
.../GridCachePartitionedSetSelfTest.java | 6 +
.../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +-
...eplicatedDataStructuresFailoverSelfTest.java | 6 +
.../GridCacheReplicatedQueueApiSelfTest.java | 11 +
...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 +
...cheReplicatedQueueRotativeMultiNodeTest.java | 6 +
.../GridCacheReplicatedSetSelfTest.java | 6 +
...CacheLoadingConcurrentGridStartSelfTest.java | 154 +
.../CacheNoValueClassOnServerNodeTest.java | 129 +
.../GridCacheAbstractNodeRestartSelfTest.java | 117 +-
.../GridCacheAtomicTimeoutSelfTest.java | 314 --
.../GridCacheClientModesAbstractSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 295 +-
...GridCacheLoadingConcurrentGridStartTest.java | 154 -
.../distributed/GridCacheLockAbstractTest.java | 75 +
.../GridCacheMultiNodeAbstractTest.java | 13 +-
.../GridCacheMultiNodeLockAbstractTest.java | 14 +-
.../GridCacheNodeFailureAbstractTest.java | 23 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 22 +-
...GridCachePreloadRestartAbstractSelfTest.java | 9 -
.../IgniteCacheAtomicMessageRecoveryTest.java | 32 +
.../IgniteCacheAtomicNodeJoinTest.java | 44 +
.../IgniteCacheAtomicNodeRestartTest.java | 33 +
.../IgniteCacheMessageRecoveryAbstractTest.java | 175 +
.../IgniteCacheNodeJoinAbstractTest.java | 109 +
.../IgniteCachePutGetRestartAbstractTest.java | 234 ++
.../IgniteCacheSystemTransactionsSelfTest.java | 41 +-
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 +
.../IgniteCacheTxMessageRecoveryTest.java | 32 +
...arDisabledFairAffinityPutGetRestartTest.java | 35 +
...iteCacheTxNearDisabledPutGetRestartTest.java | 30 +
.../distributed/IgniteCacheTxNodeJoinTest.java | 38 +
...xOriginatingNodeFailureAbstractSelfTest.java | 12 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 11 +-
.../IgniteTxTimeoutAbstractTest.java | 8 -
...heAbstractTransformWriteThroughSelfTest.java | 2 +-
.../dht/GridCacheColocatedFailoverSelfTest.java | 2 +-
.../dht/GridCacheDhtEntrySelfTest.java | 12 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 18 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 28 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 14 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 8 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 14 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 12 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...itionedTxOriginatingNodeFailureSelfTest.java | 19 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 156 +
.../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +
...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 +
...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 +
...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 +
...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++
.../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +
...eAtomicInvalidPartitionHandlingSelfTest.java | 19 +-
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +
...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +
...GridCacheValueConsistencyAtomicSelfTest.java | 101 -
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...micFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 +
.../near/GridCacheNearEvictionSelfTest.java | 4 +-
.../near/GridCacheNearMetricsSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 131 +-
.../near/GridCacheNearOneNodeSelfTest.java | 35 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 29 +-
.../near/GridCacheNearReadersSelfTest.java | 154 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 118 +-
.../GridCachePartitionedFailoverSelfTest.java | 2 +-
...GridCachePartitionedFilteredPutSelfTest.java | 5 +-
.../near/GridCachePartitionedFlagsTest.java | 41 -
.../GridCachePartitionedFullApiSelfTest.java | 2 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 8 -
...achePartitionedMultiNodeFullApiSelfTest.java | 70 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
.../GridCachePartitionedNodeRestartTest.java | 5 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +
.../near/GridPartitionedBackupLoadSelfTest.java | 2 +-
.../near/IgniteCacheNearReadCommittedTest.java | 4 +-
.../near/IgniteCacheNearTxRollbackTest.java | 133 +
...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 +
.../GridCacheReplicatedEvictionSelfTest.java | 8 +-
.../GridCacheReplicatedFailoverSelfTest.java | 2 +-
.../GridCacheReplicatedFlagsTest.java | 28 -
.../GridCacheReplicatedInvalidateSelfTest.java | 13 +-
...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../GridCacheReplicatedNodeRestartSelfTest.java | 4 +
...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 -
...acheAtomicReplicatedNodeRestartSelfTest.java | 32 +
...CacheReplicatedPreloadLifecycleSelfTest.java | 9 +-
.../GridCacheReplicatedPreloadSelfTest.java | 38 +-
.../eviction/GridCacheEvictionAbstractTest.java | 11 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 ++
...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ++
...acheSortedEvictionPolicyPerformanceTest.java | 135 +
.../GridCacheSortedEvictionPolicySelfTest.java | 373 ++
.../IgniteCacheExpiryPolicyAbstractTest.java | 12 +-
.../IgniteCacheExpiryPolicyTestSuite.java | 2 +
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
.../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 +
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 +
.../GridCacheLocalIsolatedNodesSelfTest.java | 102 +
.../GridCacheSwapScanQueryAbstractSelfTest.java | 58 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 26 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 191 +
.../GridCacheWriteBehindStoreAbstractTest.java | 350 ++
.../GridCacheWriteBehindStoreLocalTest.java | 30 +
...heWriteBehindStoreMultithreadedSelfTest.java | 163 +
...BehindStorePartitionedMultiNodeSelfTest.java | 216 +
...ridCacheWriteBehindStorePartitionedTest.java | 30 +
...GridCacheWriteBehindStoreReplicatedTest.java | 30 +
.../GridCacheWriteBehindStoreSelfTest.java | 268 ++
.../continuous/GridEventConsumeSelfTest.java | 10 +-
.../DataStreamProcessorSelfTest.java | 8 +-
.../DataStreamerMultiThreadedSelfTest.java | 112 +
.../processors/igfs/IgfsAbstractSelfTest.java | 26 +-
.../igfs/IgfsClientCacheSelfTest.java | 132 +
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../igfs/IgfsDualAbstractSelfTest.java | 2 +-
.../processors/igfs/IgfsOneClientNodeTest.java | 133 +
.../processors/igfs/IgfsProcessorSelfTest.java | 11 +-
.../processors/igfs/IgfsSizeSelfTest.java | 56 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 +
.../processors/igfs/IgfsStreamsSelfTest.java | 7 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 12 +-
.../GridServiceReassignmentSelfTest.java | 5 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../tostring/GridToStringBuilderSelfTest.java | 5 +-
.../GridContinuousOperationsLoadTest.java | 3 +-
.../loadtests/hashmap/GridCacheTestContext.java | 17 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../logger/java/IgniteJavaLoggerTest.java | 65 -
.../ignite/logger/java/JavaLoggerTest.java | 65 +
.../OptimizedMarshallerNodeFailoverTest.java | 71 +-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../ignite/messaging/GridMessagingSelfTest.java | 50 +
.../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../discovery/AbstractDiscoverySelfTest.java | 4 +-
...ClusterMetricsSnapshotSerializeSelfTest.java | 28 +
.../tcp/TcpClientDiscoverySelfTest.java | 13 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../testframework/GridSpiTestContext.java | 29 +-
.../ignite/testframework/GridTestUtils.java | 14 +-
.../testframework/junits/GridAbstractTest.java | 49 +-
.../junits/GridTestKernalContext.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 15 +
.../junits/IgniteTestResources.java | 8 +-
.../junits/common/GridCommonAbstractTest.java | 176 +-
.../junits/logger/GridTestLog4jLogger.java | 10 +-
.../junits/spi/GridSpiAbstractTest.java | 89 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 3 +
.../IgniteCacheDataStructuresSelfTestSuite.java | 10 +
.../IgniteCacheEvictionSelfTestSuite.java | 4 +
.../IgniteCacheFailoverTestSuite.java | 29 +-
.../IgniteCacheFullApiSelfTestSuite.java | 9 +-
.../IgniteCacheMetricsSelfTestSuite.java | 4 +
.../testsuites/IgniteCacheRestartTestSuite.java | 22 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 46 +-
.../IgniteCacheTxRecoverySelfTestSuite.java | 4 +
.../IgniteCacheWriteBehindTestSuite.java | 3 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 5 +
.../testsuites/IgniteLoggingSelfTestSuite.java | 2 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
.../IgniteTopologyValidatorTestSuit.java | 43 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../ignite/util/TestTcpCommunicationSpi.java | 54 +
modules/extdata/p2p/pom.xml | 23 +-
.../CacheNoValueClassOnServerTestClient.java | 88 +
.../apache/ignite/tests/p2p/cache/Person.java | 42 +
.../p2p/startcache/CacheAllNodesFilter.java | 31 +
.../CacheConfigurationP2PTestClient.java | 117 +
.../tests/p2p/startcache/Organization1.java | 52 +
.../tests/p2p/startcache/Organization2.java | 52 +
modules/extdata/uri/pom.xml | 25 +-
modules/gce/README.txt | 32 +
modules/gce/licenses/apache-2.0.txt | 202 +
modules/gce/pom.xml | 92 +
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 ++
.../tcp/ipfinder/gce/package-info.java | 22 +
...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 +
.../tcp/ipfinder/gce/package-info.java | 22 +
.../ignite/testsuites/IgniteGCETestSuite.java | 71 +
modules/geospatial/pom.xml | 43 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 70 +-
modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes
modules/hadoop/pom.xml | 38 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../processors/hadoop/HadoopClassLoader.java | 21 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 5 +-
.../processors/hadoop/HadoopProcessor.java | 2 +-
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 +
.../hadoop/jobtracker/HadoopJobTracker.java | 32 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 3 +
.../external/HadoopExternalTaskExecutor.java | 3 +
.../processors/hadoop/v2/HadoopDaemon.java | 125 +
.../processors/hadoop/v2/HadoopV2Job.java | 69 +-
.../hadoop/v2/HadoopV2TaskContext.java | 9 +
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 3 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 16 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +-
modules/hibernate/pom.xml | 32 +-
.../HibernateAccessStrategyAdapter.java | 14 +-
.../hibernate/HibernateCollectionRegion.java | 2 +-
.../cache/hibernate/HibernateEntityRegion.java | 2 +-
.../hibernate/HibernateGeneralDataRegion.java | 4 +-
.../hibernate/HibernateNaturalIdRegion.java | 2 +-
.../HibernateNonStrictAccessStrategy.java | 6 +-
.../hibernate/HibernateQueryResultsRegion.java | 2 +-
.../HibernateReadOnlyAccessStrategy.java | 4 +-
.../HibernateReadWriteAccessStrategy.java | 10 +-
.../ignite/cache/hibernate/HibernateRegion.java | 6 +-
.../cache/hibernate/HibernateRegionFactory.java | 10 +-
.../hibernate/HibernateTimestampsRegion.java | 2 +-
.../HibernateTransactionalAccessStrategy.java | 12 +-
.../HibernateTransactionalDataRegion.java | 2 +-
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../HibernateL2CacheConfigurationSelfTest.java | 2 +-
.../hibernate/HibernateL2CacheSelfTest.java | 2 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +
.../testsuites/IgniteHibernateTestSuite.java | 2 +
modules/indexing/pom.xml | 43 +-
.../processors/query/h2/IgniteH2Indexing.java | 209 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 92 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 7 +-
.../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +-
.../query/h2/opt/GridH2RowDescriptor.java | 14 +-
.../processors/query/h2/opt/GridH2Table.java | 10 +-
.../query/h2/opt/GridH2ValueCacheObject.java | 191 +
.../query/h2/opt/GridLuceneIndex.java | 84 +-
.../processors/query/h2/sql/GridSqlElement.java | 8 -
.../query/h2/sql/GridSqlFunction.java | 6 +-
.../query/h2/sql/GridSqlPlaceholder.java | 51 +
.../processors/query/h2/sql/GridSqlQuery.java | 203 +
.../query/h2/sql/GridSqlQueryParser.java | 127 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 158 +-
.../processors/query/h2/sql/GridSqlSelect.java | 211 +-
.../query/h2/sql/GridSqlSubquery.java | 8 +-
.../processors/query/h2/sql/GridSqlUnion.java | 134 +
.../query/h2/twostep/GridMapQueryExecutor.java | 147 +-
.../query/h2/twostep/GridMergeIndex.java | 23 +-
.../h2/twostep/GridMergeIndexUnsorted.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 161 +-
.../query/h2/twostep/GridResultPage.java | 81 +-
.../query/h2/twostep/msg/GridH2Array.java | 124 +
.../query/h2/twostep/msg/GridH2Boolean.java | 112 +
.../query/h2/twostep/msg/GridH2Byte.java | 113 +
.../query/h2/twostep/msg/GridH2Bytes.java | 113 +
.../query/h2/twostep/msg/GridH2CacheObject.java | 148 +
.../query/h2/twostep/msg/GridH2Date.java | 115 +
.../query/h2/twostep/msg/GridH2Decimal.java | 134 +
.../query/h2/twostep/msg/GridH2Double.java | 113 +
.../query/h2/twostep/msg/GridH2Float.java | 113 +
.../query/h2/twostep/msg/GridH2Geometry.java | 134 +
.../query/h2/twostep/msg/GridH2Integer.java | 113 +
.../query/h2/twostep/msg/GridH2JavaObject.java | 113 +
.../query/h2/twostep/msg/GridH2Long.java | 113 +
.../query/h2/twostep/msg/GridH2Null.java | 78 +
.../query/h2/twostep/msg/GridH2Short.java | 113 +
.../query/h2/twostep/msg/GridH2String.java | 115 +
.../query/h2/twostep/msg/GridH2Time.java | 116 +
.../query/h2/twostep/msg/GridH2Timestamp.java | 133 +
.../query/h2/twostep/msg/GridH2Uuid.java | 133 +
.../h2/twostep/msg/GridH2ValueMessage.java | 49 +
.../twostep/msg/GridH2ValueMessageFactory.java | 201 +
.../cache/CacheConfigurationP2PTest.java | 179 +
.../cache/CacheConfigurationP2PTestServer.java | 49 +
.../GridCacheAbstractFieldsQuerySelfTest.java | 1274 ------
.../cache/GridCacheCrossCacheQuerySelfTest.java | 122 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 129 +-
.../cache/GridCacheOffHeapSelfTest.java | 624 +++
.../cache/GridCacheQueryMetricsSelfTest.java | 32 +-
.../GridCacheQuerySerializationSelfTest.java | 144 +
...idCacheReduceQueryMultithreadedSelfTest.java | 15 +-
.../processors/cache/GridCacheSwapSelfTest.java | 143 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 19 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 256 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 30 +-
.../IgniteCacheCollocatedQuerySelfTest.java | 209 +
.../cache/IgniteCacheLargeResultSelfTest.java | 104 +
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 2 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 3 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 26 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 45 +-
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 -
...GridCachePartitionedFieldsQuerySelfTest.java | 110 -
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 -
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 +
.../IgniteCachePartitionedQuerySelfTest.java | 5 +-
...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 -
.../GridCacheReplicatedFieldsQuerySelfTest.java | 157 -
...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 -
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 +
.../IgniteCacheReplicatedQuerySelfTest.java | 18 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 27 +-
...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 368 ++
.../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 +
.../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 +
...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 +
...TtlOffheapTransactionalAbstractSelfTest.java | 29 +
...cheTtlOffheapTransactionalLocalSelfTest.java | 34 +
...OffheapTransactionalPartitionedSelfTest.java | 34 +
.../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 +
.../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 +
...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 +
...eTtlOnheapTransactionalAbstractSelfTest.java | 29 +
...acheTtlOnheapTransactionalLocalSelfTest.java | 34 +
...lOnheapTransactionalPartitionedSelfTest.java | 34 +
.../query/h2/GridH2IndexRebuildTest.java | 74 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 132 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 375 ++
.../query/h2/sql/BaseH2CompareQueryTest.java | 856 ++++
.../query/h2/sql/GridQueryParsingTest.java | 36 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 677 ++++
.../IgniteCacheQuerySelfTestSuite.java | 15 +-
.../IgniteCacheWithIndexingTestSuite.java | 53 +
.../IgniteH2IndexingSpiTestSuite.java | 7 -
.../processors/query/h2/sql/bigQuery.sql | 55 +
modules/jcl/pom.xml | 16 +-
.../ignite/logger/jcl/IgniteJclLogger.java | 167 -
.../org/apache/ignite/logger/jcl/JclLogger.java | 167 +
.../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -
.../apache/ignite/logger/jcl/JclLoggerTest.java | 48 +
.../ignite/testsuites/IgniteJclTestSuite.java | 2 +-
modules/jta/pom.xml | 30 +-
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../processors/cache/GridCacheJtaSelfTest.java | 6 +-
modules/log4j/pom.xml | 16 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 8 +-
modules/rest-http/pom.xml | 14 +-
.../http/jetty/GridJettyRestHandler.java | 11 +-
modules/scalar/pom.xml | 51 +-
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 -
modules/schedule/pom.xml | 36 +-
modules/schema-import/pom.xml | 20 +-
.../ignite/schema/generator/CodeGenerator.java | 101 +-
.../ignite/schema/ui/SchemaImportApp.java | 8 +-
modules/slf4j/pom.xml | 14 +-
.../ignite/logger/slf4j/GridSlf4jLogger.java | 138 -
.../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +
modules/spring/pom.xml | 20 +-
.../org/apache/ignite/IgniteSpringBean.java | 21 +
.../util/spring/IgniteSpringHelperImpl.java | 217 +-
.../ignite/internal/GridFactorySelfTest.java | 3 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +-
.../IgniteStartFromStreamConfigurationTest.java | 50 +
.../testsuites/IgniteSpringTestSuite.java | 2 +
modules/ssh/pom.xml | 20 +-
.../util/nodestart/IgniteNodeCallableImpl.java | 308 --
.../util/nodestart/IgniteSshHelperImpl.java | 4 +-
.../util/nodestart/StartNodeCallableImpl.java | 309 ++
...gniteProjectionStartStopRestartSelfTest.java | 287 +-
.../IgniteStartStopRestartTestSuite.java | 1 +
modules/tools/pom.xml | 11 +-
.../ant/beautifier/GridJavadocAntTask.java | 10 +-
.../ignite/tools/classgen/ClassesGenerator.java | 2 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 +-
modules/urideploy/README.txt | 2 +-
modules/urideploy/licenses/edtftp-license.pdf | Bin 58355 -> 0 bytes
modules/urideploy/licenses/jtidy-license.txt | 50 -
.../urideploy/licenses/jtidy-mit-license.txt | 50 +
modules/urideploy/pom.xml | 58 +-
.../uri/GridUriDeploymentClassLoader.java | 4 +-
.../GridUriDeploymentFileResourceLoader.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 184 +-
.../uri/scanners/GridUriDeploymentScanner.java | 286 --
.../GridUriDeploymentScannerListener.java | 2 +-
.../uri/scanners/UriDeploymentScanner.java | 47 +
.../scanners/UriDeploymentScannerContext.java | 92 +
.../scanners/UriDeploymentScannerManager.java | 221 ++
.../file/GridUriDeploymentFileScanner.java | 311 --
.../scanners/file/UriDeploymentFileScanner.java | 327 ++
.../ftp/GridUriDeploymentFtpClient.java | 199 -
.../ftp/GridUriDeploymentFtpConfiguration.java | 115 -
.../ftp/GridUriDeploymentFtpException.java | 43 -
.../scanners/ftp/GridUriDeploymentFtpFile.java | 119 -
.../ftp/GridUriDeploymentFtpScanner.java | 234 --
.../uri/scanners/ftp/package-info.java | 22 -
.../http/GridUriDeploymentHttpScanner.java | 423 --
.../scanners/http/UriDeploymentHttpScanner.java | 478 +++
...loymentMultiScannersErrorThrottlingTest.java | 3 -
.../GridUriDeploymentMultiScannersSelfTest.java | 3 +-
.../GridFileDeploymentUndeploySelfTest.java | 4 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 46 -
.../uri/scanners/ftp/package-info.java | 22 -
modules/visor-console/pom.xml | 28 +-
.../ignite/visor/commands/VisorConsole.scala | 303 +-
.../visor/commands/VisorConsoleCommand.scala | 77 -
.../ignite/visor/commands/VisorTextTable.scala | 539 ---
.../visor/commands/ack/VisorAckCommand.scala | 42 +-
.../commands/alert/VisorAlertCommand.scala | 35 +-
.../commands/cache/VisorCacheClearCommand.scala | 54 +-
.../commands/cache/VisorCacheCommand.scala | 453 ++-
.../commands/cache/VisorCacheScanCommand.scala | 69 +-
.../commands/cache/VisorCacheStopCommand.scala | 135 +
.../commands/cache/VisorCacheSwapCommand.scala | 66 +-
.../commands/common/VisorConsoleCommand.scala | 90 +
.../visor/commands/common/VisorTextTable.scala | 543 +++
.../config/VisorConfigurationCommand.scala | 437 +-
.../commands/deploy/VisorDeployCommand.scala | 47 +-
.../commands/disco/VisorDiscoveryCommand.scala | 66 +-
.../commands/events/VisorEventsCommand.scala | 358 +-
.../visor/commands/gc/VisorGcCommand.scala | 127 +-
.../visor/commands/kill/VisorKillCommand.scala | 53 +-
.../visor/commands/node/VisorNodeCommand.scala | 47 +-
.../visor/commands/ping/VisorPingCommand.scala | 41 +-
.../commands/start/VisorStartCommand.scala | 53 +-
.../commands/tasks/VisorTasksCommand.scala | 82 +-
.../commands/top/VisorTopologyCommand.scala | 36 +-
.../visor/commands/vvm/VisorVvmCommand.scala | 32 +-
.../scala/org/apache/ignite/visor/visor.scala | 301 +-
.../ignite/visor/VisorTextTableSpec.scala | 3 +-
modules/visor-plugins/pom.xml | 14 +-
modules/web/pom.xml | 26 +-
modules/yardstick/README.md | 3 +-
.../yardstick/config/benchmark-store.properties | 5 +-
modules/yardstick/pom.xml | 22 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
.../cache/IgniteCacheAbstractBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +-
parent/pom.xml | 710 ++++
pom.xml | 1505 ++-----
scripts/git-apply-patch.sh | 94 +
scripts/git-format-patch.sh | 87 +
scripts/git-patch-functions.sh | 171 +
scripts/git-patch-prop.sh | 24 +
1197 files changed, 56447 insertions(+), 36058 deletions(-)
----------------------------------------------------------------------
[24/50] incubator-ignite git commit: merge from ignite-882
Posted by sb...@apache.org.
merge from ignite-882
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9314a68e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9314a68e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9314a68e
Branch: refs/heads/ignite-929
Commit: 9314a68e31f1b449665a26335868e39478ff2f98
Parents: 96c9695
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 7 14:13:19 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 7 14:13:19 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/ServerImpl.java | 26 ++++++++++++++++++++
.../GridCachePartitionedNodeRestartTest.java | 5 ----
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
.../GridCacheReplicatedFailoverSelfTest.java | 5 ----
.../GridCacheReplicatedNodeRestartSelfTest.java | 5 ----
5 files changed, 27 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9314a68e/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 94a2290..f8fae34 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -2076,6 +2076,9 @@ class ServerImpl extends TcpDiscoveryImpl {
boolean nextNew = (msg instanceof TcpDiscoveryNodeAddedMessage &&
((TcpDiscoveryNodeAddedMessage)msg).node().id().equals(nextId));
+ if (!nextNew)
+ nextNew = hasPendingAddMessage(nextId);
+
if (!nextNew) {
if (log.isDebugEnabled())
log.debug("Failed to restore ring because next node order received " +
@@ -2364,6 +2367,29 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/**
+ * Checks whether pending messages queue contains unprocessed {@link TcpDiscoveryNodeAddedMessage} for
+ * the node with {@code nodeId}.
+ *
+ * @param nodeId Node ID.
+ * @return {@code true} if contains, {@code false} otherwise.
+ */
+ private boolean hasPendingAddMessage(UUID nodeId) {
+ if (pendingMsgs.msgs.isEmpty())
+ return false;
+
+ for (TcpDiscoveryAbstractMessage pendingMsg : pendingMsgs.msgs) {
+ if (pendingMsg instanceof TcpDiscoveryNodeAddedMessage) {
+ TcpDiscoveryNodeAddedMessage addMsg = (TcpDiscoveryNodeAddedMessage)pendingMsg;
+
+ if (addMsg.node().id().equals(nodeId) && addMsg.id().compareTo(pendingMsgs.discardId) > 0)
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
* Processes join request message.
*
* @param msg Join request message.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9314a68e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
index 9529f9d..2096836 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
@@ -30,11 +30,6 @@ import static org.apache.ignite.transactions.TransactionConcurrency.*;
*/
public class GridCachePartitionedNodeRestartTest extends GridCacheAbstractNodeRestartSelfTest {
/** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-882");
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9314a68e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
index 62cc6b1..2d8f431 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
@@ -32,7 +32,7 @@ import static org.apache.ignite.transactions.TransactionConcurrency.*;
public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAbstractNodeRestartSelfTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-882");
+ fail("https://issues.apache.org/jira/browse/IGNITE-1090");
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9314a68e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
index 4269ea6..3461dd4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
@@ -28,11 +28,6 @@ import static org.apache.ignite.cache.CacheMode.*;
*/
public class GridCacheReplicatedFailoverSelfTest extends GridCacheAbstractFailoverTxSelfTest {
/** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-882");
- }
-
- /** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
return REPLICATED;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9314a68e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
index dfdfd7e..8ce96cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
@@ -29,11 +29,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
*/
public class GridCacheReplicatedNodeRestartSelfTest extends GridCacheAbstractNodeRestartSelfTest {
/** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-882");
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
[23/50] incubator-ignite git commit: #ignite-1101: Add test for cache
future runtime exception.
Posted by sb...@apache.org.
#ignite-1101: Add test for cache future runtime 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/8c1ba5af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c1ba5af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c1ba5af
Branch: refs/heads/ignite-929
Commit: 8c1ba5afe37d1e9f38d99738874046076556915f
Parents: 96c9695
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Jul 7 13:40:11 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Jul 7 13:40:11 2015 +0300
----------------------------------------------------------------------
.../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
2 files changed, 172 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c1ba5af/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
new file mode 100644
index 0000000..27bfe17
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
@@ -0,0 +1,171 @@
+/*
+ * 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.configuration.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.*;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static java.util.concurrent.TimeUnit.*;
+
+/**
+ * Cache future self test.
+ */
+public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = StartNode.createConfiguration();
+
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testAsyncCacheFuture() throws Exception {
+ final CountDownLatch readyLatch = new CountDownLatch(1);
+
+ GridJavaProcess node1 = null;
+
+ Collection<String> jvmArgs = Arrays.asList("-ea", "-DIGNITE_QUIET=false");
+
+ try {
+ node1 = GridJavaProcess.exec(
+ StartNode.class.getName(), null,
+ log,
+ new CI1<String>() {
+ @Override public void apply(String s) {
+ info("Server node1: " + s);
+
+ if (s.contains("Topology snapshot"))
+ readyLatch.countDown();
+ }
+ },
+ null,
+ jvmArgs,
+ null
+ );
+
+ assertTrue(readyLatch.await(60, SECONDS));
+
+ Ignite client = startGrid(0);
+
+ IgniteCache<String, NotSerializableClass> cache = client.getOrCreateCache("CACHE");
+
+ cache.put("key", new NotSerializableClass());
+
+ System.setProperty("FAIL", "true");
+
+ IgniteCache<String, NotSerializableClass> asyncCache = cache.withAsync();
+
+ asyncCache.get("key");
+
+ final CountDownLatch futLatch = new CountDownLatch(1);
+
+ asyncCache.future().listen(new IgniteInClosure<IgniteFuture<Object>>() {
+ @Override public void apply(IgniteFuture<Object> fut) {
+ assertTrue(fut.isDone());
+
+ try {
+ fut.get();
+
+ fail();
+ }
+ catch (CacheException e) {
+ log.info("Expected error: " + e);
+
+ futLatch.countDown();
+ }
+ }
+ });
+
+ assertTrue(futLatch.await(60, SECONDS));
+ }
+ finally {
+ if (node1 != null)
+ node1.killProcess();
+ }
+ }
+
+ /**
+ * Test class.
+ */
+ private static class NotSerializableClass implements Serializable {
+ /** {@inheritDoc}*/
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ out.writeObject(this);
+ }
+
+ /** {@inheritDoc}*/
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ if (System.getProperty("FAIL") != null)
+ throw new RuntimeException("Deserialization failed.");
+
+ in.readObject();
+ }
+ }
+
+ /**
+ * Test class.
+ */
+ public static class StartNode {
+ /**
+ * @return Configuration.
+ */
+ public static IgniteConfiguration createConfiguration() {
+ IgniteConfiguration cfg = new IgniteConfiguration();
+
+ cfg.setPeerClassLoadingEnabled(true);
+
+ cfg.setLocalHost("127.0.0.1");
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinderCleanFrequency(1000);
+
+ TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder();
+
+ ipFinder.setAddresses(Collections.singletonList("127.0.0.1:47500..47509"));
+
+ disco.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(disco);
+
+ return cfg;
+ }
+
+ /**
+ * @param args Main parameters.
+ */
+ public static void main(String[] args) {
+ Ignition.start(createConfiguration());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c1ba5af/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 0a31f49..39702a3 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
@@ -132,6 +132,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheObjectToStringSelfTest.class);
suite.addTestSuite(GridCacheLoadOnlyStoreAdapterSelfTest.class);
suite.addTestSuite(GridCacheGetStoreErrorSelfTest.class);
+ suite.addTestSuite(CacheFutureExceptionSelfTest.class);
suite.addTestSuite(GridCacheAsyncOperationsLimitSelfTest.class);
suite.addTestSuite(GridCacheTtlManagerSelfTest.class);
suite.addTestSuite(GridCacheLifecycleAwareSelfTest.class);