You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/06 17:06:48 UTC
[01/50] [abbrv] incubator-ignite git commit: # ignite-571 minor
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-437-sqltests-p2 c6816a33f -> ca6fd6986
# ignite-571 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/28072aa2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28072aa2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28072aa2
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 28072aa218f759c092c380a8c1b2a929f7c9a38c
Parents: 14a1916
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 14:07:22 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 14:07:22 2015 +0300
----------------------------------------------------------------------
.../near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java | 5 ++---
...CachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28072aa2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index 43f886d..0b86d52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -108,7 +108,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
c.setCacheConfiguration(cc);
- c.setNearCacheConfiguration(mode());
+ c.setNearCacheConfiguration(nearCacheConfiguration());
return c;
}
@@ -116,7 +116,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
/**
* @return Distribution mode.
*/
- protected NearCacheConfiguration mode() {
+ protected NearCacheConfiguration nearCacheConfiguration() {
return new NearCacheConfiguration();
}
@@ -309,7 +309,6 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
*/
public void testMultipleOperations() throws Exception {
IgniteCache<Integer, String> cache = jcache(0);
- //GridCache<Integer, String> cache = cache(0);
try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) {
cache.put(1, "val");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28072aa2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java
index 00cb260..bfaa255 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.configuration.*;
public class GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest
extends GridCachePartitionedBasicStoreMultiNodeSelfTest {
/** {@inheritDoc} */
- @Override protected NearCacheConfiguration mode() {
+ @Override protected NearCacheConfiguration nearCacheConfiguration() {
return null;
}
}
[23/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cc2d36e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cc2d36e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cc2d36e
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5cc2d36ebd4eb2a759220891ed8027d3641e2893
Parents: 9a523ce cef5227
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 19:23:34 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 19:23:34 2015 +0300
----------------------------------------------------------------------
.../ignite/events/CacheQueryExecutedEvent.java | 11 +++++------
.../apache/ignite/events/CacheQueryReadEvent.java | 11 +++++------
.../processors/cache/GridCacheMapEntry.java | 4 ++--
.../cache/query/GridCacheQueryManager.java | 18 +++++++++---------
.../continuous/CacheContinuousQueryHandler.java | 4 ++--
.../processors/query/GridQueryProcessor.java | 4 ++--
.../GridCacheContinuousQueryAbstractSelfTest.java | 4 ++--
.../query/h2/twostep/GridMapQueryExecutor.java | 4 ++--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 ++++----
9 files changed, 33 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[28/50] [abbrv] incubator-ignite git commit: # sprint-3 - comment
update
Posted by sb...@apache.org.
# sprint-3 - comment update
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20d3ff80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20d3ff80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20d3ff80
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 20d3ff80f97c57fd4f79c226c741a895f4e9cc5e
Parents: 580f051
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sun Apr 5 14:18:26 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sun Apr 5 14:18:26 2015 -0700
----------------------------------------------------------------------
.../ignite/examples/streaming/numbers/StreamRandomNumbers.java | 2 +-
.../examples/java8/streaming/numbers/StreamRandomNumbers.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20d3ff80/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java b/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
index f1e55d2..02030fb 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
@@ -57,7 +57,7 @@ public class StreamRandomNumbers {
// Allow data updates.
stmr.allowOverwrite(true);
- // Configure data transformation to count instances of the same word.
+ // Configure data transformation to count instances of the same number.
stmr.receiver(new StreamTransformer<Integer, Long>() {
@Override public Object process(MutableEntry<Integer, Long> e, Object... objects)
throws EntryProcessorException {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20d3ff80/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
index 630f4e3..e52b674 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
@@ -56,7 +56,7 @@ public class StreamRandomNumbers {
// Allow data updates.
stmr.allowOverwrite(true);
- // Configure data transformation to count instances of the same word.
+ // Configure data transformation to count instances of the same number.
stmr.receiver(StreamTransformer.from((e, arg) -> {
Long val = e.getValue();
[21/50] [abbrv] incubator-ignite git commit: # patch-scripts: review
Posted by sb...@apache.org.
# patch-scripts: 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/a95e8de4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a95e8de4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a95e8de4
Branch: refs/heads/ignite-437-sqltests-p2
Commit: a95e8de4377eeb6a840031d0254096f063590d36
Parents: 015420f
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 18:55:48 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 18:55:48 2015 +0300
----------------------------------------------------------------------
scripts/git-apply-patch.sh | 32 +++++++++++++----------
scripts/git-format-patch.sh | 35 +++++++++++++------------
scripts/git-patch-functions.sh | 51 ++++++++++++++++++++++++++++++++-----
scripts/git-patch-prop.sh | 10 +++-----
4 files changed, 86 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-apply-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-apply-patch.sh b/scripts/git-apply-patch.sh
old mode 100644
new mode 100755
index 448421b..500b0a5
--- a/scripts/git-apply-patch.sh
+++ b/scripts/git-apply-patch.sh
@@ -17,7 +17,7 @@
#
#
-# Git patch-file applyer.
+# Git patch-file applier.
#
echo 'Usage: scripts/git-apply-patch.sh <ignite-task> [-ih|--ignitehome <path>] [-idb|--ignitedefbranch <branch-name>] [-ph|--patchhome <path>]'
echo "It should be called from IGNITE_HOME directory."
@@ -26,6 +26,20 @@ echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set yo
echo
#
+# Init home and import properties and functions.
+#
+if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
+ then IGNITE_HOME=$PWD
+fi
+
+. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
+. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
+
+if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
+ then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
+fi
+
+#
# Ignite task.
#
IGNITE_TASK=$1
@@ -42,32 +56,24 @@ do
IGNITE_HOME="$2"
shift
;;
+
-idb|--ignitedefbranch)
IGNITE_DEFAULT_BRANCH="$2"
shift
;;
+
-ph|--patchhome)
PATCHES_HOME="$2"
shift
;;
*)
- # unknown option
+
+ echo "Unknown parameter: ${key}"
;;
esac
shift
done
-if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
- then IGNITE_HOME=$PWD
-fi
-
-. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
-. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
-
-if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
- then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
-fi
-
echo "IGNITE_HOME : ${IGNITE_HOME}"
echo "Master branch : ${IGNITE_DEFAULT_BRANCH}"
echo "Ignite task : ${IGNITE_TASK}"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
old mode 100644
new mode 100755
index 575a7bb..970347f
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -26,6 +26,20 @@ echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set yo
echo
#
+# Init home and import properties and functions.
+#
+if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
+ then IGNITE_HOME=$PWD
+fi
+
+. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
+. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
+
+if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
+ then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
+fi
+
+#
# Read command line params.
#
while [[ $# > 1 ]]
@@ -37,35 +51,24 @@ do
IGNITE_HOME="$2"
shift
;;
+
-idb|--ignitedefbranch)
IGNITE_DEFAULT_BRANCH="$2"
shift
;;
+
-ph|--patchhome)
PATCHES_HOME="$2"
shift
;;
+
*)
- # unknown option
+ echo "Unknown parameter: ${key}"
;;
esac
shift
done
-#
-# Init home and import properties and functions.
-#
-if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
- then IGNITE_HOME=$PWD
-fi
-
-. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
-. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
-
-if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
- then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
-fi
-
IGNITE_CURRENT_BRANCH=$( determineCurrentBranch ${IGNITE_HOME} )
echo "IGNITE_HOME : ${IGNITE_HOME}"
@@ -81,4 +84,4 @@ echo
requireCleanWorkTree ${IGNITE_HOME}
-formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} _ignite.patch
\ No newline at end of file
+formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} .patch
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index ab9bec3..796bccd 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -23,6 +23,16 @@
#
# Define functions.
#
+
+#
+# Formats patch. Create patch in one commit from user who run script and with default comment.
+#
+# Params:
+# - Git home.
+# - Default branch.
+# - Patch with patch.
+# - Suffix for created patch-file.
+#
formatPatch () {
GIT_HOME=$1
DEFAULT_BRANCH=$2
@@ -33,11 +43,10 @@ formatPatch () {
git checkout ${DEFAULT_BRANCH}
git checkout -b tmppatch
-
- git merge --no-edit ${PATCHED_BRANCH}
-# Or we can 'squashe' merge to make only one commit.
-# git merge --squash ${PATCHED_BRANCH}
-# git commit -a -m "# PATCHED_BRANCH"
+
+ # Merge to make only one commit.
+ git merge --squash ${PATCHED_BRANCH}
+ git commit -a -m "# ${PATCHED_BRANCH}"
PATCH_FILE=${PATCHES_HOME}'/'${DEFAULT_BRANCH}_${PATCHED_BRANCH}${PATCH_SUFFIX}
@@ -52,6 +61,13 @@ formatPatch () {
echo "Patch created: ${PATCH_FILE}"
}
+#
+# Determines current branch.
+#
+# Params:
+# - Git home.
+# Return - Current branch.
+#
determineCurrentBranch () {
GIT_HOME=$1
@@ -62,6 +78,13 @@ determineCurrentBranch () {
echo "$CURRENT_BRANCH"
}
+#
+# Checks that given git repository has clean work tree (there is no uncommited changes).
+# Exit with code 1 in error case.
+#
+# Params:
+# - Git home.
+#
requireCleanWorkTree () {
cd $1 # At git home.
@@ -94,6 +117,14 @@ requireCleanWorkTree () {
fi
}
+#
+# Applies patch. Applies patch file created by formatPatch method.
+#
+# Params:
+# - Git home.
+# - Default branch.
+# - File with patch.
+#
applyPatch () {
GIT_HOME=$1
DEFAULT_BRANCH=$2
@@ -110,10 +141,18 @@ applyPatch () {
fi
echo "Patch $PATCH_FILE will be applied to $DEFAULT_BRANCH branch."
-# git apply ${PATCH_FILE}
+
git am ${PATCH_FILE}
}
+#
+# Checks that given default branch and current branch are equal.
+# Exit with code 1 in error case.
+#
+# Params:
+# - Git home.
+# - Default branch.
+#
currentAndDefaultBranchesShouldBeEqual () {
GIT_HOME=$1
DEFAULT_BRANCH=$2
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-patch-prop.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-prop.sh b/scripts/git-patch-prop.sh
index 7eb3639..9c52583 100644
--- a/scripts/git-patch-prop.sh
+++ b/scripts/git-patch-prop.sh
@@ -17,12 +17,8 @@
#
#
-# Git patch-file maker/applyer properties.
+# Git patch-file maker/applier properties.
#
-if [ "${IGNITE_DEFAULT_BRANCH}" = "" ]
- then IGNITE_DEFAULT_BRANCH='sprint-2'
-fi
+IGNITE_DEFAULT_BRANCH='ignite-sprint-3'
-if [ "${PATCHES_HOME}" = "" ]
- then PATCHES_HOME=${GG_HOME}
-fi
\ No newline at end of file
+PATCHES_HOME=${IGNITE_HOME}
[46/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-540' into ignite-sprint-3
Posted by sb...@apache.org.
Merge branch 'ignite-540' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5421701a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5421701a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5421701a
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5421701acaa5c7d92f39fdc234df165d7ec5459b
Parents: aae951e e1db407
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Apr 6 15:01:15 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Apr 6 15:01:15 2015 +0300
----------------------------------------------------------------------
.../query/h2/twostep/GridReduceQueryExecutor.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[44/50] [abbrv] incubator-ignite git commit: ignite-667
Posted by sb...@apache.org.
ignite-667
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aae951e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aae951e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aae951e7
Branch: refs/heads/ignite-437-sqltests-p2
Commit: aae951e7703a559685fc1d1f26d841b40eacb29c
Parents: 5c575f6
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 14:52:31 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 14:52:31 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 49 +++++++++++++++++++------------------------------
1 file changed, 19 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aae951e7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8affeef..5ba2437 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -535,6 +535,25 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>module-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>install</phase>
+ <configuration>
+ <stylesheetfile>
+ ${project.basedir}/${project.parent.relativePath}/../assembly/docfiles/javadoc.css
+ </stylesheetfile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -644,36 +663,6 @@
</profile>
<profile>
- <id>release</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>module-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <stylesheetfile>
- ${project.basedir}/${project.parent.relativePath}/../assembly/docfiles/javadoc.css
- </stylesheetfile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>surefire-fork-count-1</id>
<activation>
<property>
[40/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec153eae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec153eae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec153eae
Branch: refs/heads/ignite-437-sqltests-p2
Commit: ec153eae19050e309cafe7cc894311abd0d51d17
Parents: 9a3373f 9e9a5c9
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 13:55:32 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 13:55:32 2015 +0300
----------------------------------------------------------------------
modules/clients/readme.md | 2 -
.../processors/cache/CacheDistributionMode.java | 67 --------------------
.../IgniteCollectionAbstractTest.java | 23 -------
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +--
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +++++--
.../org/apache/ignite/yardstick/IgniteNode.java | 11 ++--
14 files changed, 44 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
[03/50] [abbrv] incubator-ignite git commit: # ignite-668
Posted by sb...@apache.org.
# ignite-668
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/682bec6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/682bec6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/682bec6a
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 682bec6a5d2df9e91521622c82dd867a58f73be2
Parents: f9af2d5
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 14:53:53 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 14:53:53 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 10 +++----
.../cache/IgniteInternalCacheTypesTest.java | 29 +++++++++++++++++++-
.../processors/igfs/IgfsStartCacheTest.java | 20 +++++++++++++-
3 files changed, 52 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/682bec6a/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 1d04fd2..0455ff0 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
@@ -2302,15 +2302,15 @@ public class GridCacheProcessor extends GridProcessorAdapter {
IgniteCache<K,V> cache = (IgniteCache<K, V>)jCacheProxies.get(masked);
- if (cache == null) {
- DynamicCacheDescriptor desc = registeredCaches.get(masked);
+ DynamicCacheDescriptor desc = registeredCaches.get(masked);
+
+ if (desc != null && !desc.cacheType().userCache())
+ throw new IllegalStateException("Failed to get cache because it is a system cache: " + cacheName);
+ if (cache == null) {
if (desc == null || desc.cancelled())
throw new IllegalArgumentException("Cache is not started: " + cacheName);
- if (!desc.cacheType().userCache())
- throw new IllegalStateException("Failed to get cache because it is a system cache: " + cacheName);
-
DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId());
req.cacheName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/682bec6a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
index 37bde6c..c9da7c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
@@ -25,8 +25,11 @@ import org.apache.ignite.internal.util.typedef.internal.*;
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 java.util.concurrent.*;
+
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
/**
@@ -98,7 +101,31 @@ public class IgniteInternalCacheTypesTest extends GridCommonAbstractTest {
* @param ignite Ignite.
* @param userCaches User caches.
*/
- private void checkCacheTypes(Ignite ignite, String... userCaches) {
+ private void checkCacheTypes(final Ignite ignite, String... userCaches) {
+ GridTestUtils.assertThrows(log(), new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ ignite.cache(CU.UTILITY_CACHE_NAME);
+
+ return null;
+ }
+ }, IllegalStateException.class, null);
+
+ GridTestUtils.assertThrows(log(), new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ ignite.cache(CU.MARSH_CACHE_NAME);
+
+ return null;
+ }
+ }, IllegalStateException.class, null);
+
+ GridTestUtils.assertThrows(log(), new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ ignite.cache(CU.ATOMICS_CACHE_NAME);
+
+ return null;
+ }
+ }, IllegalStateException.class, null);
+
checkCache(ignite, CU.UTILITY_CACHE_NAME, UTILITY_CACHE_POOL, false, true);
checkCache(ignite, CU.MARSH_CACHE_NAME, MARSH_CACHE_POOL, false, false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/682bec6a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
index 09fa455..b5162e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
@@ -26,8 +26,10 @@ import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
import java.io.*;
+import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
@@ -123,7 +125,23 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
/**
* @param ignite Ignite.
*/
- private void checkIgfsCaches(Ignite ignite) {
+ private void checkIgfsCaches(final Ignite ignite) {
+ GridTestUtils.assertThrows(log(), new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ ignite.cache("dataCache");
+
+ return null;
+ }
+ }, IllegalStateException.class, null);
+
+ GridTestUtils.assertThrows(log(), new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ ignite.cache("metaCache");
+
+ return null;
+ }
+ }, IllegalStateException.class, null);
+
checkCache(((IgniteKernal)ignite).internalCache("dataCache"));
checkCache(((IgniteKernal)ignite).internalCache("metaCache"));
}
[22/50] [abbrv] incubator-ignite git commit: # patch-scripts: review 2
Posted by sb...@apache.org.
# patch-scripts: review 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a523ceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a523ceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a523ceb
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 9a523ceb1486b4b25dc47a6e0629681d1394d216
Parents: a95e8de
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 19:11:03 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 19:11:03 2015 +0300
----------------------------------------------------------------------
scripts/git-apply-patch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a523ceb/scripts/git-apply-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-apply-patch.sh b/scripts/git-apply-patch.sh
index 500b0a5..c5f686f 100755
--- a/scripts/git-apply-patch.sh
+++ b/scripts/git-apply-patch.sh
@@ -89,6 +89,6 @@ currentAndDefaultBranchesShouldBeEqual ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH}
requireCleanWorkTree ${IGNITE_HOME}
-IGNITE_PATCH_FILE=${PATCHES_HOME}/${IGNITE_DEFAULT_BRANCH}_${IGNITE_TASK}_ignite.patch
+IGNITE_PATCH_FILE=${PATCHES_HOME}/${IGNITE_DEFAULT_BRANCH}_${IGNITE_TASK}.patch
applyPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_PATCH_FILE}
[47/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-sprint-3' into ignite-437-sqltests-p2
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc7a9f8d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc7a9f8d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
[27/50] [abbrv] incubator-ignite git commit: ignite-328
IgniteMessaging.remoteListen ignores forOldest() projection
Posted by sb...@apache.org.
ignite-328 IgniteMessaging.remoteListen ignores forOldest() projection
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6572efba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6572efba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6572efba
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 6572efba2304756a0abb9a5453d9e1e0899ff865
Parents: 580f051
Author: Andrey Gura <ag...@gridgain.com>
Authored: Wed Apr 1 16:41:17 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Sun Apr 5 23:30:14 2015 +0300
----------------------------------------------------------------------
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../ignite/messaging/GridMessagingSelfTest.java | 50 ++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6572efba/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index c1d31af..0daffcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -806,7 +806,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
* @param isOldest Oldest flag.
*/
private AgeClusterGroup(ClusterGroupAdapter parent, boolean isOldest) {
- super(parent.ctx, parent.subjId, parent.p, parent.ids);
+ super(parent.ctx, parent.subjId, (IgnitePredicate<ClusterNode>) null);
this.isOldest = isOldest;
@@ -823,6 +823,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
lastTopVer = ctx.discovery().topologyVersion();
this.node = isOldest ? U.oldest(super.nodes(), null) : U.youngest(super.nodes(), null);
+ this.p = F.nodeForNodes(node);
}
finally {
unguard();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6572efba/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
index 4c844fc..c033750 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
@@ -67,6 +67,9 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
/** */
private static final Integer I_TOPIC_2 = 2;
+ /** Message count. */
+ private static AtomicInteger MSG_CNT;
+
/** */
public static final String EXT_RESOURCE_CLS_NAME = "org.apache.ignite.tests.p2p.TestUserResource";
@@ -161,6 +164,8 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
+ MSG_CNT = new AtomicInteger();
+
ignite1 = startGrid(1);
ignite2 = startGrid(2);
}
@@ -1088,4 +1093,49 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
assertEquals(1, msgCnt.get());
}
+
+ /**
+ * Tests that message listener registers only for one oldest node.
+ *
+ * @throws Exception If an error occurred.
+ */
+ public void testRemoteListenForOldest() throws Exception {
+ remoteListenForOldest(ignite1);
+
+ // Restart oldest node.
+ stopGrid(1);
+
+ ignite1 = startGrid(1);
+
+ MSG_CNT.set(0);
+
+ // Ignite2 is oldest now.
+ remoteListenForOldest(ignite2);
+ }
+
+ /**
+ * @param expOldestIgnite Expected oldest ignite.
+ */
+ private void remoteListenForOldest(Ignite expOldestIgnite) throws InterruptedException {
+ ClusterGroup grp = ignite1.cluster().forOldest();
+
+ assertEquals(1, grp.nodes().size());
+ assertEquals(expOldestIgnite.cluster().localNode().id(), grp.node().id());
+
+ ignite1.message(grp).remoteListen(null, new P2<UUID, Object>() {
+ @Override public boolean apply(UUID nodeId, Object msg) {
+ System.out.println("Received new message [msg=" + msg + ", senderNodeId=" + nodeId + ']');
+
+ MSG_CNT.incrementAndGet();
+
+ return true;
+ }
+ });
+
+ ignite1.message().send(null, MSG_1);
+
+ Thread.sleep(3000);
+
+ assertEquals(1, MSG_CNT.get());
+ }
}
[49/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-gg-9966' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-gg-9966' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60aaaaa0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60aaaaa0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60aaaaa0
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 60aaaaa08b1b6b7a15de11e533081dc444b5226e
Parents: 5421701 2f1ecc5
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 6 16:31:26 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 6 16:31:26 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 --
.../apache/ignite/internal/IgniteKernal.java | 25 +----
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 6 +-
.../DiscoveryNodeValidationProcessor.java | 27 +++++
.../OsDiscoveryNodeValidationProcessor.java | 72 +++++++++++++
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +------------------
.../testframework/GridSpiTestContext.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
18 files changed, 186 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
[06/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-675
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-675
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3502ff05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3502ff05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3502ff05
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 3502ff057224815f8c033f71243f643d2635013d
Parents: c88e8a7 3af6914
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 15:33:03 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 15:33:03 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridCacheNearReadersSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[41/50] [abbrv] incubator-ignite git commit: ignite-678
Posted by sb...@apache.org.
ignite-678
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c575f6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c575f6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c575f6f
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5c575f6fdfeae91e075c9b7f74d46850bbf1b8b5
Parents: ec153ea
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 14:02:27 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 14:02:27 2015 +0300
----------------------------------------------------------------------
pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c575f6f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5390fe5..cd2d723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,9 @@
<profile>
<id>dev-libs</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
[16/50] [abbrv] incubator-ignite git commit: # ignite-sprint-3 minor
Posted by sb...@apache.org.
# ignite-sprint-3 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a28bc74c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a28bc74c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a28bc74c
Branch: refs/heads/ignite-437-sqltests-p2
Commit: a28bc74ce45c50730f0ccb1511f120ceaa34b74f
Parents: 3061522
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 17:19:18 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 17:19:18 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a28bc74c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 01c6135..5924129 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -3993,14 +3993,14 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
assert cctx.deferredDelete();
if (deleted) {
- assert !deletedUnlocked();
+ assert !deletedUnlocked() : this;
flags |= IS_DELETED_MASK;
cctx.decrementPublicSize(this);
}
else {
- assert deletedUnlocked();
+ assert deletedUnlocked() : this;
flags &= ~IS_DELETED_MASK;
[36/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-571' into ignite-571
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-571' into ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41388900
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41388900
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41388900
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 413889005e6ab9b193f19cc3b2bf4c5538cbfabd
Parents: 426f023 70d539c
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 11:48:06 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 11:48:06 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-668
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-668
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/093489e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/093489e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/093489e4
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 093489e43fda61817c30464400ab21bda1d3c81a
Parents: 682bec6 3af6914
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 15:04:56 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 15:04:56 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridCacheNearReadersSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[11/50] [abbrv] incubator-ignite git commit: # ignite-sprint-3 minor
Posted by sb...@apache.org.
# ignite-sprint-3 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d214c21e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d214c21e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d214c21e
Branch: refs/heads/ignite-437-sqltests-p2
Commit: d214c21e850de6d1a8b746985e23f9400bc3d224
Parents: d2d6def
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 16:33:40 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 16:33:40 2015 +0300
----------------------------------------------------------------------
.../atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d214c21e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 1c507ca..1f63214 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -103,6 +103,11 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
delay = false;
}
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
/**
* @throws Exception If failed.
*/
[37/50] [abbrv] incubator-ignite git commit: # ignite-571
Posted by sb...@apache.org.
# ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6924f0fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6924f0fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6924f0fa
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 6924f0fa92f8c812182f3b9977b7dba1d16ac8ea
Parents: 4138890
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 12:01:22 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 12:01:22 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../cache/distributed/near/GridCacheNearEvictionSelfTest.java | 2 +-
.../near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java | 4 ++--
.../src/main/java/org/apache/ignite/yardstick/IgniteNode.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 99b95ce..442f598 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -83,7 +83,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
nearCfg.setNearEvictionPolicy(new FifoEvictionPolicy(10));
- cfg.setNearCacheConfiguration(nearCfg);
+ cacheCfg.setNearConfiguration(nearCfg);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 4b1c933..ec3a3e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -62,7 +62,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
NearCacheConfiguration nearCfg = new NearCacheConfiguration();
- c.setNearCacheConfiguration(nearCfg);
+ cc.setNearConfiguration(nearCfg);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index 0b86d52..05eab37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -106,9 +106,9 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
cc.setWriteThrough(true);
cc.setLoadPreviousValue(true);
- c.setCacheConfiguration(cc);
+ cc.setNearConfiguration(nearCacheConfiguration());
- c.setNearCacheConfiguration(nearCacheConfiguration());
+ c.setCacheConfiguration(cc);
return c;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index ad6cffa..8638623 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -79,7 +79,7 @@ public class IgniteNode implements BenchmarkServer {
c.setClientMode(true);
if (args.isNearCache())
- c.setNearCacheConfiguration(new NearCacheConfiguration());
+ cc.setNearConfiguration(new NearCacheConfiguration());
cc.setWriteSynchronizationMode(args.syncMode());
[34/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-571
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/426f023b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/426f023b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/426f023b
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 426f023be10ade518e3cd7756a6484af4bd0fe67
Parents: 28072aa dd944bf
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 10:44:17 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 10:44:17 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 189 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
56 files changed, 1214 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/426f023b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
[50/50] [abbrv] incubator-ignite git commit: ignite-437: full query
Posted by sb...@apache.org.
ignite-437: full query
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca6fd698
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca6fd698
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca6fd698
Branch: refs/heads/ignite-437-sqltests-p2
Commit: ca6fd6986eb9fdf474cb2bc832e6e7798bd10e27
Parents: bc7a9f8
Author: Artem Shutak <as...@gridgain.com>
Authored: Mon Apr 6 18:06:20 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Mon Apr 6 18:06:20 2015 +0300
----------------------------------------------------------------------
.../h2/sql/AbstractH2CompareQueryTest.java | 16 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 12 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 146 ++++++++++++++-----
3 files changed, 127 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca6fd698/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
index c5cd5a4..1df9887 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@ -32,8 +32,6 @@ import org.jetbrains.annotations.*;
import java.sql.*;
import java.util.*;
-import static org.apache.ignite.cache.CacheDistributionMode.*;
-
/**
* Abstract test framework to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
* which have the same data models and data content.
@@ -84,9 +82,7 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest
cc.setName(name);
cc.setCacheMode(mode);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setEvictNearSynchronized(false);
cc.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- cc.setDistributionMode(PARTITIONED_ONLY);
setIndexedTypes(cc, mode);
@@ -105,9 +101,9 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest
Ignite ignite = startGrids(4);
- pCache = ignite.jcache("part");
+ pCache = ignite.cache("part");
- rCache = ignite.jcache("repl");
+ rCache = ignite.cache("repl");
awaitPartitionMapExchange();
@@ -223,11 +219,15 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest
if (args == null)
args = new Object[] {null};
- log.info("Sql=\"" + sql + "\", args=" + Arrays.toString(args));
+ info("Sql query:\n" + sql + "\nargs=" + Arrays.toString(args));
List<List<?>> h2Res = executeH2Query(sql, args);
+
+ info("H2 res =" + h2Res);
+
+ List<List<?>> cacheRes = cache.query(new SqlFieldsQuery(sql).setArgs(args)).getAll();
- List<List<?>> cacheRes = cache.queryFields(new SqlFieldsQuery(sql).setArgs(args)).getAll();
+ info("Ignite res =" + cacheRes);
assertRsEquals(h2Res, cacheRes, ordering);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca6fd698/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 8ba1e68..1c9866e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -36,8 +36,8 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
if (mode == CacheMode.PARTITIONED)
cc.setIndexedTypes(
Integer.class, Organization.class,
- CacheAffinityKey.class, Person.class,
- CacheAffinityKey.class, Purchase.class
+ AffinityKey.class, Person.class,
+ AffinityKey.class, Purchase.class
);
else if (mode == CacheMode.REPLICATED)
cc.setIndexedTypes(
@@ -587,8 +587,8 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
/**
* @return Custom affinity key to guarantee that person is always collocated with organization.
*/
- public CacheAffinityKey<Integer> key() {
- return new CacheAffinityKey<>(id, orgId);
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, orgId);
}
/** {@inheritDoc} */
@@ -731,8 +731,8 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
/**
* @return Custom affinity key to guarantee that purchase is always collocated with person.
*/
- public CacheAffinityKey<Integer> key() {
- return new CacheAffinityKey<>(id, personId);
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, personId);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca6fd698/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
index 25c9c04..08f7597 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
@@ -27,9 +27,99 @@ import java.util.*;
import java.util.Date;
/**
- * TODO: Add test class description.
+ * Executes one big query (and subqueries of the big query) to compare query results from h2 database instance and
+ * * mixed ignite caches (replicated and partitioned) which have the same data models and data content.
*/
public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
+ /** Big repitable select of the big query. */
+ private static final String BSELECT =
+ " select date, orderId, rootOrderId, origOrderId \n" +
+ " from \"part\".OrderT1 where alias='CUSTOM'\n" +
+ " union all\n" +
+ " select date, orderId, rootOrderId, origOrderId \n" +
+ " from \"part\".OrderT2 where alias='CUSTOM'";
+
+ /** Big query "cop" part. */
+ private static final String BQ_COP =
+ " select rootOrderId as custOrderId, co.date, co.orderId, replace(co.alias,'_ALGO','') as alias, \n" +
+ " op.parentAlgo\n" +
+ " from (\n" +
+ indent1(BSELECT) +
+ " ) co, OrderParams op\n" +
+ " where co.date = op.date and co.orderId = op.orderId and dateToLong(co.date)+co.archSeq =\n" +
+ " (\n" +
+ " select max(dateToLong(date)+archSeq) \n" +
+ " from (\n" +
+ indent4(BSELECT) +
+ " ) \n" +
+ " where origOrderId = co.origOrderId and date = co.date\n" +
+ " ) and co.alias='CUSTOM'";
+
+ /** Big query "oep" part. */
+ private static final String BQ_OEP =
+ " select e.date, e.rootOrderId as eRootOrderId, e.rootOrderId, sum(e.execShares) as execShares, \n" +
+ " sum(e.execShares*e.price)/sum(e.execShares) as price,\n" +
+ " max(e.execDatetime) as execTime, min(e.execDatetime) as ordTime, max(e.status) as status,\n" +
+ " case when min(e.lastMkt) = max(e.lastMkt) then min(e.lastMkt) else min('XOFF') end as execMeet\n" +
+ " from Exec e\n" +
+ " group by e.date, e.rootOrderId";
+
+ /** Big query "cc" part. */
+ private static final String BQ_CC =
+ " select top 1 refOrderId, date from Cancel";
+
+ /** Full the big query. */
+ private static final String BIG_QUERY =
+ " select * \n" +
+ " from (\n" +
+ indent2(BQ_COP) +
+ " ) cop \n" +
+ " inner join (\n" +
+ indent2(BQ_OEP) +
+ " ) oep on (cop.date = oep.date and cop.custOrderId = oep.eRootOrderId)\n" +
+ " left outer join (\n" +
+ indent2(BQ_CC) +
+ " ) cc on (cc.refOrderId = cop.orderId and cc.date = cop.date)\n" +
+ " where cop.alias='CUSTOM'";
+
+ /**
+ * @param st String to format.
+ * @return Formatted string.
+ * @see H2CompareBigQueryTest#indent(String, String)
+ */
+ private static String indent1(String st) {
+ return indent(st, " ");
+ }
+
+ /**
+ * @param st String to format.
+ * @return Formatted string.
+ * @see H2CompareBigQueryTest#indent(String, String)
+ */
+ private static String indent2(String st) {
+ return indent(st, " ");
+ }
+
+ /**
+ * @param st String to format.
+ * @return Formatted string.
+ * @see H2CompareBigQueryTest#indent(String, String)
+ */
+ private static String indent4(String st) {
+ return indent(st, " ");
+ }
+
+ /**
+ * Formats string to adding an indent befor each line.
+ *
+ * @param st String to format.
+ * @param indent Indent.
+ * @return Formatted string.
+ */
+ private static String indent(String st, String indent) {
+ return indent + st.replace("\n", "\n" + indent) + '\n';
+ }
+
/** {@inheritDoc} */
@Override protected void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) {
if (mode == CacheMode.PARTITIONED)
@@ -82,9 +172,12 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
/**
* @throws Exception If failed.
*/
- protected void checkAllDataEquals() throws Exception {
+ @Override protected void checkAllDataEquals() throws Exception {
compareQueryRes0("select _key, _val, orderId, rootOrderId, date, alias from \"part\".ORDERT1");
compareQueryRes0("select _key, _val, orderId, rootOrderId, date, alias from \"part\".ORDERT2");
+// compareQueryRes0("select _key, _val, orderId, rootOrderId, date, alias from \"repl\".OrderParams\n");
+// compareQueryRes0("select _key, _val, orderId, rootOrderId, date, alias from \"part\".Exec\n");
+// compareQueryRes0("select _key, _val, orderId, rootOrderId, date, alias from \"part\".Cancel\n");
}
/**
@@ -119,38 +212,15 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
/**
* @throws Exception If failed.
*/
+ public void testBigQuery() throws Exception {
+ compareQueryRes0(BIG_QUERY);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testBigQueryPart1() throws Exception {
- compareQueryRes0(
- " select" +
- " root_order_id as cust_order_id," +
- " co.date, co.order_id," +
- " replace(co.alias,'_ALGO','') as alias, co.portfolio," +
- " co.symbol, co.side, co.order_datetime, co.ord_size, co.currency, co.exchange," +
- " co.ord_type, co.lim_price, co.comment, co.tif, co.exec_inst," +
- " co.rule80, co.sndr_compid, co.target_subid," +
- " co.OnBehalfOfSubID, co.SenderLocationID, co.ss_exempt, co.locate_reqd, co.locate_brkr," +
- " cpp.parent_algo" +
- " from (" +
- " select" +
- " date, order_id, order_datetime, orig_order_id, portfolio, alias, symbol," +
- " side, currency, exchange, ord_size, ord_type, lim_price, comment, tif, exec_inst," +
- " rule80, tag_22, tag_48, sndr_compid," +
- " target_subid, OnBehalfOfSubID, SenderLocationID, ss_exempt, locate_reqd, locate_brkr," +
- " source, arch_seq, 0 as bench, ext_order_id," +
- " root_order_id" +
- " from GetsCustOrder where alias='CUSTOM'" +
- " union all" +
- " select" +
- " date, order_id, order_datetime, ref_order_id as orig_order_id, portfolio, alias, symbol," +
- " side, currency, exchange, isnull(leaves_qty,ord_size), ord_type, lim_price, comment, tif, exec_inst," +
- " isnull(rule80,'A'), tag_22, tag_48, sndr_compid," +
- " target_subid, OnBehalfOfSubID, SenderLocationID, ss_exempt, locate_reqd, locate_brkr," +
- " source, arch_seq, 0 as bench, ext_order_id," +
- " root_order_id" +
- " from GetsCustReplace where alias='CUSTOM'" +
- " ) co, GetsOrderAlgoParams cpp" +
- " where co.date = cpp.date and co.order_id = cpp.order_id " +
- " and dateToLong(co.date)+co.arch_seq =(BigQueryPartSelectMax) and co.alias='CUSTOM'");
+ compareQueryRes0(BQ_COP);
}
/** {@inheritDoc} */
@@ -183,6 +253,11 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
conn.commit();
}
+ /**
+ * Insert {@link OrderT1} at h2 database.
+ *
+ * @param o OrderT1.
+ */
private void insertInDb(OrderT1 o) throws SQLException {
try(PreparedStatement st = conn.prepareStatement(
"insert into \"part\".OrderT1 (_key, _val, orderId, rootOrderId, date, alias) values(?, ?, ?, ?, ?, ?)")) {
@@ -197,6 +272,11 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
}
}
+ /**
+ * Insert {@link OrderT2} at h2 database.
+ *
+ * @param o OrderT2.
+ */
private void insertInDb(OrderT2 o) throws SQLException {
try(PreparedStatement st = conn.prepareStatement(
"insert into \"part\".OrderT2 (_key, _val, orderId, rootOrderId, date, alias) values(?, ?, ?, ?, ?, ?)")) {
[13/50] [abbrv] incubator-ignite git commit: minor
Posted by sb...@apache.org.
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/e1003419
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1003419
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1003419
Branch: refs/heads/ignite-437-sqltests-p2
Commit: e100341949e19883e25d37968ade163364cbaa1b
Parents: 3061522
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Apr 3 17:06:52 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Apr 3 17:06:52 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/plugin/PluginContext.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1003419/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
index 0704700..f2a972c 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
import java.util.*;
@@ -45,20 +46,20 @@ public interface PluginContext {
/**
* Gets a collection of all grid nodes. Remote nodes are discovered via underlying
- * {@link org.apache.ignite.spi.discovery.DiscoverySpi} implementation used.
+ * {@link DiscoverySpi} implementation used.
*
* @return Collection of grid nodes.
* @see #localNode()
- * @see org.apache.ignite.spi.discovery.DiscoverySpi
+ * @see DiscoverySpi
*/
public Collection<ClusterNode> nodes();
/**
- * Gets local grid node. Instance of local node is provided by underlying {@link org.apache.ignite.spi.discovery.DiscoverySpi}
+ * Gets local grid node. Instance of local node is provided by underlying {@link DiscoverySpi}
* implementation used.
*
* @return Local grid node.
- * @see org.apache.ignite.spi.discovery.DiscoverySpi
+ * @see DiscoverySpi
*/
public ClusterNode localNode();
[35/50] [abbrv] incubator-ignite git commit: # ignite-sprint-3 Change
debug output.
Posted by sb...@apache.org.
# ignite-sprint-3 Change debug output.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0619855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0619855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0619855
Branch: refs/heads/ignite-437-sqltests-p2
Commit: e06198559a65f0d91081a86e8fe68524bb91afa8
Parents: dd944bf
Author: Andrey Novikov <an...@gridgain.com>
Authored: Mon Apr 6 15:37:14 2015 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Mon Apr 6 15:37:14 2015 +0700
----------------------------------------------------------------------
.../internal/visor/util/VisorTaskUtils.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0619855/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 1209a40..909dc22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -678,8 +678,8 @@ public class VisorTaskUtils {
log.warning(msg);
}
else
- X.println("[" + DEBUG_DATE_FMT.get().format(time) + "]" +
- String.format("%30s %s", "<" + Thread.currentThread().getName() + ">", msg));
+ X.println(String.format("[%s][%s]%s",
+ DEBUG_DATE_FMT.get().format(time), Thread.currentThread().getName(), msg));
}
/**
@@ -734,6 +734,16 @@ public class VisorTaskUtils {
}
/**
+ * Log message.
+ *
+ * @param log Logger.
+ * @param msg Message.
+ */
+ public static void log(@Nullable IgniteLogger log, String msg) {
+ log0(log, U.currentTimeMillis(), " " + msg);
+ }
+
+ /**
* Checks if address can be reached using one argument InetAddress.isReachable() version or ping command if failed.
*
* @param addr Address to check.
@@ -810,7 +820,7 @@ public class VisorTaskUtils {
*
* @param input Input bytes.
* @return Zipped byte array.
- * @throws java.io.IOException If failed.
+ * @throws IOException If failed.
*/
public static byte[] zipBytes(byte[] input) throws IOException {
return zipBytes(input, 4096);
@@ -822,7 +832,7 @@ public class VisorTaskUtils {
* @param input Input bytes.
* @param initBufSize Initial buffer size.
* @return Zipped byte array.
- * @throws java.io.IOException If failed.
+ * @throws IOException If failed.
*/
public static byte[] zipBytes(byte[] input, int initBufSize) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream(initBufSize);
[45/50] [abbrv] incubator-ignite git commit: # IGNITE-540 Revert
changes in generateColumnsFromQuery().
Posted by sb...@apache.org.
# IGNITE-540 Revert changes in generateColumnsFromQuery().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1db4076
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1db4076
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1db4076
Branch: refs/heads/ignite-437-sqltests-p2
Commit: e1db4076f1719364a8498d7e6f6a52d13a454443
Parents: 39ee717
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Apr 6 14:59:26 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Apr 6 14:59:26 2015 +0300
----------------------------------------------------------------------
.../h2/twostep/GridReduceQueryExecutor.java | 29 ++++++++------------
1 file changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1db4076/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index acdc1bf..02c7c55 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -445,25 +445,20 @@ public class GridReduceQueryExecutor implements GridMessageListener {
String name = expr.getAlias();
long precision = expr.getPrecision();
int displaySize = expr.getDisplaySize();
+ DataType dt = DataType.getDataType(type);
+ if (precision > 0 && (dt.defaultPrecision == 0 ||
+ (dt.defaultPrecision > precision && dt.defaultPrecision < Byte.MAX_VALUE))) {
+ // dont' set precision to MAX_VALUE if this is the default
+ precision = dt.defaultPrecision;
+ }
int scale = expr.getScale();
-
- if (type != Value.UNKNOWN) {
- DataType dt = DataType.getDataType(type);
-
- if (precision > 0 && (dt.defaultPrecision == 0 ||
- (dt.defaultPrecision > precision && dt.defaultPrecision < Byte.MAX_VALUE))) {
- // dont' set precision to MAX_VALUE if this is the default
- precision = dt.defaultPrecision;
- }
-
- if (scale > 0 && (dt.defaultScale == 0 ||
- (dt.defaultScale > scale && dt.defaultScale < precision)))
- scale = dt.defaultScale;
-
- if (scale > precision)
- precision = scale;
+ if (scale > 0 && (dt.defaultScale == 0 ||
+ (dt.defaultScale > scale && dt.defaultScale < precision))) {
+ scale = dt.defaultScale;
+ }
+ if (scale > precision) {
+ precision = scale;
}
-
Column col = new Column(name, type, precision, scale, displaySize);
cols.add(col);
}
[17/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea777d40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea777d40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea777d40
Branch: refs/heads/ignite-437-sqltests-p2
Commit: ea777d40f6a7e452b87a0ea592e8e0dea2e068f5
Parents: a28bc74 015420f
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 17:19:33 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 17:19:33 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/internal/GridCachePluginContext.java | 6 ++
.../processors/cache/GridCacheProcessor.java | 64 +++++++++++++-------
.../processors/plugin/CachePluginManager.java | 51 ++++++++++++----
.../ignite/plugin/CachePluginContext.java | 11 ++++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +--
7 files changed, 106 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[29/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sprint-3
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b806d88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b806d88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b806d88
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5b806d8840aabd5cb9619c077d936f91f515e244
Parents: 6572efb 20d3ff8
Author: agura <ag...@gridgain.com>
Authored: Mon Apr 6 00:22:46 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Mon Apr 6 00:22:46 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/streaming/numbers/StreamRandomNumbers.java | 2 +-
.../examples/java8/streaming/numbers/StreamRandomNumbers.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[09/50] [abbrv] incubator-ignite git commit: # patch-scripts:
Implemented (format and apply ).
Posted by sb...@apache.org.
# patch-scripts: Implemented (format and apply ).
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/82a93c5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82a93c5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82a93c5c
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 82a93c5cdb0d8cad85af5e8de57e9fde0c1a1a97
Parents: 3af6914
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 16:30:44 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 16:30:44 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
scripts/git-apply-patch.sh | 88 ++++++++++++++++++++++++
scripts/git-format-patch.sh | 84 +++++++++++++++++++++++
scripts/git-patch-functions.sh | 132 ++++++++++++++++++++++++++++++++++++
scripts/git-patch-prop.sh | 28 ++++++++
5 files changed, 333 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82a93c5c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index cd1e894..296e130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,6 @@ xcuserdata/
atlassian-ide-plugin.xml
*.iml
target
-target/*
/libs/
pom-installed.xml
+git-patch-prop-local.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82a93c5c/scripts/git-apply-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-apply-patch.sh b/scripts/git-apply-patch.sh
new file mode 100644
index 0000000..448421b
--- /dev/null
+++ b/scripts/git-apply-patch.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+#
+# 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.
+#
+
+#
+# Git patch-file applyer.
+#
+echo 'Usage: scripts/git-apply-patch.sh <ignite-task> [-ih|--ignitehome <path>] [-idb|--ignitedefbranch <branch-name>] [-ph|--patchhome <path>]'
+echo "It should be called from IGNITE_HOME directory."
+echo "Patch will be applied to DEFAULT_BRANCH from PATCHES_HOME."
+echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set your own local properties (to rewrite settings at git-patch-prop-local.sh). "
+echo
+
+#
+# Ignite task.
+#
+IGNITE_TASK=$1
+
+#
+# Read command line params.
+#
+while [[ $# > 1 ]]
+do
+ key="$1"
+
+ case $key in
+ -ih|--ignitehome)
+ IGNITE_HOME="$2"
+ shift
+ ;;
+ -idb|--ignitedefbranch)
+ IGNITE_DEFAULT_BRANCH="$2"
+ shift
+ ;;
+ -ph|--patchhome)
+ PATCHES_HOME="$2"
+ shift
+ ;;
+ *)
+ # unknown option
+ ;;
+ esac
+ shift
+done
+
+if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
+ then IGNITE_HOME=$PWD
+fi
+
+. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
+. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
+
+if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
+ then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
+fi
+
+echo "IGNITE_HOME : ${IGNITE_HOME}"
+echo "Master branch : ${IGNITE_DEFAULT_BRANCH}"
+echo "Ignite task : ${IGNITE_TASK}"
+echo
+echo "PATCHES_HOME : ${PATCHES_HOME}"
+echo
+
+#
+# Main script logic.
+#
+
+currentAndDefaultBranchesShouldBeEqual ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH}
+
+requireCleanWorkTree ${IGNITE_HOME}
+
+IGNITE_PATCH_FILE=${PATCHES_HOME}/${IGNITE_DEFAULT_BRANCH}_${IGNITE_TASK}_ignite.patch
+
+applyPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_PATCH_FILE}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82a93c5c/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
new file mode 100644
index 0000000..575a7bb
--- /dev/null
+++ b/scripts/git-format-patch.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+#
+# 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.
+#
+
+#
+# Git patch-file maker.
+#
+echo 'Usage: scripts/git-format-patch.sh [-ih|--ignitehome <path>] [-idb|--ignitedefbranch <branch-name>] [-ph|--patchhome <path>]'
+echo "It should be called from IGNITE_HOME directory."
+echo "Patch will be created at PATCHES_HOME between Master branch (IGNITE_DEFAULT_BRANCH) and Current branch."
+echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set your own local properties (to rewrite settings at git-patch-prop-local.sh). "
+echo
+
+#
+# Read command line params.
+#
+while [[ $# > 1 ]]
+do
+ key="$1"
+
+ case $key in
+ -ih|--ignitehome)
+ IGNITE_HOME="$2"
+ shift
+ ;;
+ -idb|--ignitedefbranch)
+ IGNITE_DEFAULT_BRANCH="$2"
+ shift
+ ;;
+ -ph|--patchhome)
+ PATCHES_HOME="$2"
+ shift
+ ;;
+ *)
+ # unknown option
+ ;;
+ esac
+ shift
+done
+
+#
+# Init home and import properties and functions.
+#
+if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
+ then IGNITE_HOME=$PWD
+fi
+
+. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
+. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
+
+if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
+ then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
+fi
+
+IGNITE_CURRENT_BRANCH=$( determineCurrentBranch ${IGNITE_HOME} )
+
+echo "IGNITE_HOME : ${IGNITE_HOME}"
+echo "Master branch : ${IGNITE_DEFAULT_BRANCH}"
+echo "Current branch : ${IGNITE_CURRENT_BRANCH}"
+echo
+echo "PATCHES_HOME : ${PATCHES_HOME}"
+echo
+
+#
+# Main script logic.
+#
+
+requireCleanWorkTree ${IGNITE_HOME}
+
+formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} _ignite.patch
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82a93c5c/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
new file mode 100644
index 0000000..ab9bec3
--- /dev/null
+++ b/scripts/git-patch-functions.sh
@@ -0,0 +1,132 @@
+#!/bin/bash
+#
+# 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.
+#
+
+#
+# Git patch functions.
+#
+
+#
+# Define functions.
+#
+formatPatch () {
+ GIT_HOME=$1
+ DEFAULT_BRANCH=$2
+ PATCHED_BRANCH=$3
+ PATCH_SUFFIX=$4
+
+ cd ${GIT_HOME}
+
+ git checkout ${DEFAULT_BRANCH}
+ git checkout -b tmppatch
+
+ git merge --no-edit ${PATCHED_BRANCH}
+# Or we can 'squashe' merge to make only one commit.
+# git merge --squash ${PATCHED_BRANCH}
+# git commit -a -m "# PATCHED_BRANCH"
+
+ PATCH_FILE=${PATCHES_HOME}'/'${DEFAULT_BRANCH}_${PATCHED_BRANCH}${PATCH_SUFFIX}
+
+ git format-patch ${DEFAULT_BRANCH} --stdout > ${PATCH_FILE}
+ echo "Patch file created."
+
+ git checkout ${PATCHED_BRANCH}
+
+ git branch -D tmppatch # Delete tmp branch.
+
+ echo
+ echo "Patch created: ${PATCH_FILE}"
+}
+
+determineCurrentBranch () {
+ GIT_HOME=$1
+
+ cd ${GIT_HOME}
+
+ CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+ echo "$CURRENT_BRANCH"
+}
+
+requireCleanWorkTree () {
+ cd $1 # At git home.
+
+ # Update the index
+ git update-index -q --ignore-submodules --refresh
+ err=0
+
+ # Disallow unstaged changes in the working tree
+ if ! git diff-files --quiet --ignore-submodules --
+ then
+ echo $0", ERROR:"
+ echo >&2 "You have unstaged changes."
+ git diff-files --name-status -r --ignore-submodules -- >&2
+ err=1
+ fi
+
+ # Disallow uncommitted changes in the index
+ if ! git diff-index --cached --quiet HEAD --ignore-submodules --
+ then
+ echo $0", ERROR:"
+ echo >&2 "Your index contains uncommitted changes."
+ git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
+ err=1
+ fi
+
+ if [ $err = 1 ]
+ then
+ echo >&2 "Please commit or stash them."
+ exit 1
+ fi
+}
+
+applyPatch () {
+ GIT_HOME=$1
+ DEFAULT_BRANCH=$2
+ PATCH_FILE=$3
+
+ cd ${GIT_HOME}
+
+ if [ ! -f ${PATCH_FILE} ]
+ then
+ echo $0", ERROR:"
+ echo "Expected patch file not found: $PATCH_FILE."
+
+ exit 1
+ fi
+
+ echo "Patch $PATCH_FILE will be applied to $DEFAULT_BRANCH branch."
+# git apply ${PATCH_FILE}
+ git am ${PATCH_FILE}
+}
+
+currentAndDefaultBranchesShouldBeEqual () {
+ GIT_HOME=$1
+ DEFAULT_BRANCH=$2
+
+ cd ${GIT_HOME}
+
+ CURRENT_BRANCH=$( determineCurrentBranch ${GIT_HOME} )
+
+ if [ "$CURRENT_BRANCH" != "$DEFAULT_BRANCH" ]
+ then
+ echo $0", ERROR:"
+ echo "You are not on an expected branch. Your current branch at $GIT_HOME is $CURRENT_BRANCH, should be $DEFAULT_BRANCH."
+
+ exit 1
+ fi
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82a93c5c/scripts/git-patch-prop.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-prop.sh b/scripts/git-patch-prop.sh
new file mode 100644
index 0000000..7eb3639
--- /dev/null
+++ b/scripts/git-patch-prop.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# 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.
+#
+
+#
+# Git patch-file maker/applyer properties.
+#
+if [ "${IGNITE_DEFAULT_BRANCH}" = "" ]
+ then IGNITE_DEFAULT_BRANCH='sprint-2'
+fi
+
+if [ "${PATCHES_HOME}" = "" ]
+ then PATCHES_HOME=${GG_HOME}
+fi
\ No newline at end of file
[43/50] [abbrv] incubator-ignite git commit: # IGNITE-540 Remove
temporary code.
Posted by sb...@apache.org.
# IGNITE-540 Remove temporary code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39ee7171
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39ee7171
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39ee7171
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 39ee71715228a2fe1557617adc4dee5289b0c221
Parents: 8a5180c
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Apr 6 14:43:08 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Apr 6 14:43:08 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ee7171/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 7941f12..acdc1bf 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -463,9 +463,6 @@ public class GridReduceQueryExecutor implements GridMessageListener {
if (scale > precision)
precision = scale;
}
- else {
- System.out.println("1");
- }
Column col = new Column(name, type, precision, scale, displaySize);
cols.add(col);
@@ -492,7 +489,7 @@ public class GridReduceQueryExecutor implements GridMessageListener {
Query prepare = (Query)ses.prepare(qry.query(), false);
- ArrayList<Parameter> parsedParams = prepare.getParameters();
+ List<Parameter> parsedParams = prepare.getParameters();
for (int i = Math.min(parsedParams.size(), qry.parameters().length); --i >= 0; ) {
Object val = qry.parameters()[i];
[20/50] [abbrv] incubator-ignite git commit: ignite-sprint-3 - minor
fix for query events
Posted by sb...@apache.org.
ignite-sprint-3 - minor fix for query events
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cef5227a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cef5227a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cef5227a
Branch: refs/heads/ignite-437-sqltests-p2
Commit: cef5227afb48638c1c4aa0ce26eaaa2244a5edc1
Parents: ea777d4
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 3 18:38:02 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 3 18:38:02 2015 +0300
----------------------------------------------------------------------
.../ignite/events/CacheQueryExecutedEvent.java | 11 +++++------
.../apache/ignite/events/CacheQueryReadEvent.java | 11 +++++------
.../cache/query/GridCacheQueryManager.java | 18 +++++++++---------
.../continuous/CacheContinuousQueryHandler.java | 4 ++--
.../processors/query/GridQueryProcessor.java | 4 ++--
.../GridCacheContinuousQueryAbstractSelfTest.java | 4 ++--
.../query/h2/twostep/GridMapQueryExecutor.java | 4 ++--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 ++++----
8 files changed, 31 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
index 04f83c2..22892bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
@@ -19,10 +19,9 @@ package org.apache.ignite.events;
import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -67,7 +66,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
private static final long serialVersionUID = 3738753361235304496L;
/** Query type. */
- private final CacheQueryType qryType;
+ private final String qryType;
/** Cache name. */
private final String cacheName;
@@ -112,7 +111,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
ClusterNode node,
String msg,
int type,
- CacheQueryType qryType,
+ String qryType,
@Nullable String cacheName,
@Nullable String clsName,
@Nullable String clause,
@@ -139,9 +138,9 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
/**
* Gets query type.
*
- * @return Query type.
+ * @return Query type. Can be {@code "SQL"}, {@code "TEXT"}, {@code "SCAN"} or {@code "SPI"}.
*/
- public CacheQueryType queryType() {
+ public String queryType() {
return qryType;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
index a399d8a..78acdc1 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
@@ -19,10 +19,9 @@ package org.apache.ignite.events;
import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -67,7 +66,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
private static final long serialVersionUID = -1984731272984397445L;
/** Query type. */
- private final CacheQueryType qryType;
+ private final String qryType;
/** Cache name. */
private final String cacheName;
@@ -130,7 +129,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
ClusterNode node,
String msg,
int type,
- CacheQueryType qryType,
+ String qryType,
@Nullable String cacheName,
@Nullable String clsName,
@Nullable String clause,
@@ -165,9 +164,9 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
/**
* Gets query type.
*
- * @return Query type.
+ * @return Query type. Can be {@code "SQL"}, {@code "TEXT"}, {@code "SCAN"} or {@code "SPI"}.
*/
- public CacheQueryType queryType() {
+ public String queryType() {
return qryType;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 6c8cf9a..d571243 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -511,7 +511,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -533,7 +533,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Scan query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SCAN,
+ CacheQueryType.SCAN.name(),
cctx.namex(),
null,
null,
@@ -554,7 +554,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Full text query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.FULL_TEXT,
+ CacheQueryType.FULL_TEXT.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -628,7 +628,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL fields query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL_FIELDS,
+ CacheQueryType.SQL_FIELDS.name(),
cctx.namex(),
null,
qry.clause(),
@@ -660,7 +660,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SPI query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SPI,
+ CacheQueryType.SPI.name(),
cctx.namex(),
null,
null,
@@ -1119,7 +1119,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL fields query result set row read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SQL_FIELDS,
+ CacheQueryType.SQL_FIELDS.name(),
cctx.namex(),
null,
qry.clause(),
@@ -1318,7 +1318,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL query entry read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -1339,7 +1339,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Full text query entry read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.FULL_TEXT,
+ CacheQueryType.FULL_TEXT.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -1360,7 +1360,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Scan query entry read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SCAN,
+ CacheQueryType.SCAN.name(),
cctx.namex(),
null,
null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 1fd1ded..ad78b92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -172,7 +172,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
ctx.discovery().localNode(),
"Continuous query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.CONTINUOUS,
+ CacheQueryType.CONTINUOUS.name(),
cacheName,
null,
null,
@@ -236,7 +236,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
ctx.discovery().localNode(),
"Continuous query executed.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.CONTINUOUS,
+ CacheQueryType.CONTINUOUS.name(),
cacheName,
null,
null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/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 048a0c8..ba8479f 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
@@ -564,7 +564,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
ctx.discovery().localNode(),
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
null,
null,
sqlQry,
@@ -631,7 +631,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
ctx.discovery().localNode(),
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
null,
null,
sql,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index a22e0c7..5a78f9f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -909,7 +909,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
CacheQueryReadEvent qe = (CacheQueryReadEvent)evt;
- assertEquals(CONTINUOUS, qe.queryType());
+ assertEquals(CONTINUOUS.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals(grid(0).localNode().id(), qe.subjectId());
@@ -933,7 +933,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
- assertEquals(CONTINUOUS, qe.queryType());
+ assertEquals(CONTINUOUS.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals(grid(0).localNode().id(), qe.subjectId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 959d1cc..08ad38d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -209,7 +209,7 @@ public class GridMapQueryExecutor implements GridMessageListener {
node,
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
null,
qry.query(),
@@ -537,7 +537,7 @@ public class GridMapQueryExecutor implements GridMessageListener {
cctx.localNode(),
"SQL fields query result set row read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
null,
qry.query(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 88effe1..3dcf9ac 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -1004,7 +1004,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryReadEvent<Integer, Integer> qe = (CacheQueryReadEvent<Integer, Integer>)evt;
- assertEquals(SCAN, qe.queryType());
+ assertEquals(SCAN.name(), qe.queryType());
assertNull(qe.cacheName());
assertNull(qe.className());
@@ -1027,7 +1027,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
- assertEquals(SCAN, qe.queryType());
+ assertEquals(SCAN.name(), qe.queryType());
assertNull(qe.cacheName());
assertNull(qe.className());
@@ -1080,7 +1080,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryReadEvent<UUID, Person> qe = (CacheQueryReadEvent<UUID, Person>)evt;
- assertEquals(FULL_TEXT, qe.queryType());
+ assertEquals(FULL_TEXT.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals("Person", qe.className());
@@ -1103,7 +1103,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
- assertEquals(FULL_TEXT, qe.queryType());
+ assertEquals(FULL_TEXT.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals("Person", qe.className());
[26/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-675
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-675
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dac23c45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dac23c45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dac23c45
Branch: refs/heads/ignite-437-sqltests-p2
Commit: dac23c45e1e317daee1ca6e31d60e3c742ad8c25
Parents: 3502ff0 580f051
Author: sboikov <se...@inria.fr>
Authored: Sun Apr 5 20:08:05 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sun Apr 5 20:08:05 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 64 ++++---
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../processors/plugin/CachePluginManager.java | 51 ++++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 ++++++++++
scripts/git-format-patch.sh | 87 ++++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
27 files changed, 548 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
[24/50] [abbrv] incubator-ignite git commit: ignite-666: Exclude
**/*.sql pattern from RAT exclude list
Posted by sb...@apache.org.
ignite-666: Exclude **/*.sql pattern from RAT exclude list
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/580f0511
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/580f0511
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/580f0511
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 580f0511771c414fc8e12937701f73946623b265
Parents: 5cc2d36
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 19:52:57 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 19:52:57 2015 +0300
----------------------------------------------------------------------
examples/schema-import/bin/db-init.sql | 17 +++++++++++++++++
parent/pom.xml | 1 -
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580f0511/examples/schema-import/bin/db-init.sql
----------------------------------------------------------------------
diff --git a/examples/schema-import/bin/db-init.sql b/examples/schema-import/bin/db-init.sql
index 4568959..f02236a 100644
--- a/examples/schema-import/bin/db-init.sql
+++ b/examples/schema-import/bin/db-init.sql
@@ -1,3 +1,20 @@
+--
+-- 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.
+--
+
-- Script of database initialization for Schema Import Demo.
drop table PERSON;
create table PERSON(id integer not null, first_name varchar(50), last_name varchar(50), salary double not null, PRIMARY KEY(id));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580f0511/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f475b85..8affeef 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -598,7 +598,6 @@
<exclude>**/keystore/*.jks</exclude><!--bin-files-->
<exclude>**/keystore/*.pem</exclude><!--auto generated files-->
<exclude>**/keystore/*.pfx</exclude><!--bin-files-->
- <exclude>**/*.sql</exclude><!--sql files -->
<!--special excludes-->
<exclude>DEVNOTES.txt</exclude>
<exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD license-->
[18/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfc3a01b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfc3a01b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfc3a01b
Branch: refs/heads/ignite-437-sqltests-p2
Commit: dfc3a01ba170025e91c4782e8b4636316e39587e
Parents: 6dc40be 09a3a82
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Apr 3 17:41:27 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Apr 3 17:41:27 2015 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 38 +--
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../processors/cache/CacheProjection.java | 36 ---
.../processors/cache/GridCacheAdapter.java | 257 +------------------
.../cache/GridCacheDeploymentManager.java | 7 +-
.../processors/cache/GridCacheEntryEx.java | 55 +---
.../processors/cache/GridCacheMapEntry.java | 232 +----------------
.../processors/cache/GridCachePeekMode.java | 81 ------
.../cache/GridCacheProjectionImpl.java | 11 -
.../processors/cache/GridCacheProxyImpl.java | 24 --
.../processors/cache/GridCacheUtils.java | 11 -
.../distributed/dht/GridDhtCacheAdapter.java | 9 +-
.../dht/atomic/GridDhtAtomicCache.java | 29 +--
.../dht/colocated/GridDhtColocatedCache.java | 30 +--
.../distributed/near/GridNearCacheAdapter.java | 72 +-----
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../resources/META-INF/classnames.properties | 1 -
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 40 +--
...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 24 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 103 +++-----
.../near/GridCacheNearOneNodeSelfTest.java | 33 +--
.../near/GridCacheNearReadersSelfTest.java | 154 +++++------
.../GridCacheReplicatedPreloadSelfTest.java | 11 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../processors/igfs/IgfsSizeSelfTest.java | 46 +---
.../junits/common/GridCommonAbstractTest.java | 42 +++
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
32 files changed, 314 insertions(+), 1091 deletions(-)
----------------------------------------------------------------------
[12/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3061522f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3061522f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3061522f
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 3061522f91779a45ecaba336abd25a2e3904cd3e
Parents: d214c21 b78dbff
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 16:35:04 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 16:35:04 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
scripts/git-apply-patch.sh | 88 ++++++++++++++++++++++++
scripts/git-format-patch.sh | 84 +++++++++++++++++++++++
scripts/git-patch-functions.sh | 132 ++++++++++++++++++++++++++++++++++++
scripts/git-patch-prop.sh | 28 ++++++++
5 files changed, 333 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[38/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-571
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/70d539cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/70d539cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/70d539cd
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 70d539cd3d239302ebafefdadae2b99a53d022a4
Parents: 28072aa dd944bf
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 6 12:28:22 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 6 12:28:22 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 189 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
56 files changed, 1214 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70d539cd/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
[08/50] [abbrv] incubator-ignite git commit: # IGNITE-540 Sql param
substitution does not work in a case.
Posted by sb...@apache.org.
# IGNITE-540 Sql param substitution does not work in a case.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8a5180c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8a5180c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8a5180c5
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 8a5180c5f83013eff0e09f7698313fb947fdc756
Parents: 3af6914
Author: sevdokimov <se...@gridgain.com>
Authored: Fri Apr 3 16:18:26 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri Apr 3 16:18:26 2015 +0300
----------------------------------------------------------------------
.../h2/twostep/GridReduceQueryExecutor.java | 43 ++++++++++++++------
1 file changed, 31 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5180c5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index b660f7e..7941f12 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -445,20 +445,28 @@ public class GridReduceQueryExecutor implements GridMessageListener {
String name = expr.getAlias();
long precision = expr.getPrecision();
int displaySize = expr.getDisplaySize();
- DataType dt = DataType.getDataType(type);
- if (precision > 0 && (dt.defaultPrecision == 0 ||
- (dt.defaultPrecision > precision && dt.defaultPrecision < Byte.MAX_VALUE))) {
- // dont' set precision to MAX_VALUE if this is the default
- precision = dt.defaultPrecision;
- }
int scale = expr.getScale();
- if (scale > 0 && (dt.defaultScale == 0 ||
- (dt.defaultScale > scale && dt.defaultScale < precision))) {
- scale = dt.defaultScale;
+
+ if (type != Value.UNKNOWN) {
+ DataType dt = DataType.getDataType(type);
+
+ if (precision > 0 && (dt.defaultPrecision == 0 ||
+ (dt.defaultPrecision > precision && dt.defaultPrecision < Byte.MAX_VALUE))) {
+ // dont' set precision to MAX_VALUE if this is the default
+ precision = dt.defaultPrecision;
+ }
+
+ if (scale > 0 && (dt.defaultScale == 0 ||
+ (dt.defaultScale > scale && dt.defaultScale < precision)))
+ scale = dt.defaultScale;
+
+ if (scale > precision)
+ precision = scale;
}
- if (scale > precision) {
- precision = scale;
+ else {
+ System.out.println("1");
}
+
Column col = new Column(name, type, precision, scale, displaySize);
cols.add(col);
}
@@ -481,7 +489,18 @@ public class GridReduceQueryExecutor implements GridMessageListener {
data.tableName = "T___";
data.schema = ses.getDatabase().getSchema(ses.getCurrentSchemaName());
data.create = true;
- data.columns = generateColumnsFromQuery((Query)ses.prepare(qry.query(), false));
+
+ Query prepare = (Query)ses.prepare(qry.query(), false);
+
+ ArrayList<Parameter> parsedParams = prepare.getParameters();
+
+ for (int i = Math.min(parsedParams.size(), qry.parameters().length); --i >= 0; ) {
+ Object val = qry.parameters()[i];
+
+ parsedParams.get(i).setValue(DataType.convertToValue(ses, val, Value.UNKNOWN));
+ }
+
+ data.columns = generateColumnsFromQuery(prepare);
return new GridMergeTable(data);
}
[19/50] [abbrv] incubator-ignite git commit: #ignite-gg-9966: review.
Posted by sb...@apache.org.
#ignite-gg-9966: 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/4c99d6cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c99d6cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c99d6cd
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 4c99d6cd179b2c805c0a1732c170e1a492463e0f
Parents: dfc3a01
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Apr 3 18:08:37 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Apr 3 18:08:37 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 4 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 10 ++-
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 6 +-
.../DiscoveryNodeValidationProcessor.java | 27 +++++++
.../OsDiscoveryNodeValidationProcessor.java | 74 ++++++++++++++++++
.../spi/NodeVersionValidatorProcessor.java | 27 -------
.../spi/OsNodeVersionValidatorProcessor.java | 80 --------------------
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++++++++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ----------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../testframework/GridSpiTestContext.java | 2 +-
17 files changed, 189 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
index 47923e0..9f08d6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
@@ -106,7 +106,7 @@ public interface GridComponent {
* @param node Joining node.
* @return Validation result or {@code null} in case of success.
*/
- @Nullable public IgniteSpiNodeValidationResult validateNode(ClusterNode node);
+ @Nullable public IgniteNodeValidationResult validateNode(ClusterNode node);
/**
* Gets unique component type to distinguish components providing discovery data. Must return non-null value
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index e999a49..1ff483e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -53,7 +53,7 @@ import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.internal.processors.segmentation.*;
import org.apache.ignite.internal.processors.service.*;
import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.spi.*;
+import org.apache.ignite.internal.processors.nodevalidation.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.*;
@@ -476,7 +476,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
dataStructuresProc = (DataStructuresProcessor)comp;
else if (comp instanceof ClusterProcessor)
cluster = (ClusterProcessor)comp;
- else if (!(comp instanceof NodeVersionValidatorProcessor))
+ else if (!(comp instanceof DiscoveryNodeValidationProcessor))
assert (comp instanceof GridPluginComponent) : "Unknown manager class: " + comp.getClass();
if (addToList)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
index dca2e91..305a7e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
@@ -83,14 +83,14 @@ public class GridPluginComponent implements GridComponent {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
try {
plugin.validateNewNode(node);
return null;
}
catch (PluginValidationException e) {
- return new IgniteSpiNodeValidationResult(e.nodeId(), e.getMessage(), e.remoteMessage());
+ return new IgniteNodeValidationResult(e.nodeId(), e.getMessage(), e.remoteMessage());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 48109931..e8fd1ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -56,7 +56,7 @@ import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.internal.processors.segmentation.*;
import org.apache.ignite.internal.processors.service.*;
import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.spi.*;
+import org.apache.ignite.internal.processors.nodevalidation.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.*;
@@ -735,7 +735,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Start processors before discovery manager, so they will
// be able to start receiving messages once discovery completes.
- startProcessor(createComponent(NodeVersionValidatorProcessor.class, ctx));
+ startProcessor(createComponent(DiscoveryNodeValidationProcessor.class, ctx));
startProcessor(new GridClockSyncProcessor(ctx));
startProcessor(new GridAffinityProcessor(ctx));
startProcessor(createComponent(GridSegmentationProcessor.class, ctx));
@@ -1157,6 +1157,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Stick in some system level attributes
add(ATTR_JIT_NAME, U.getCompilerMx() == null ? "" : U.getCompilerMx().getName());
+ add(ATTR_BUILD_VER, VER_STR);
+ add(ATTR_BUILD_DATE, BUILD_TSTAMP_STR);
add(ATTR_MARSHALLER, cfg.getMarshaller().getClass().getName());
add(ATTR_USER_NAME, System.getProperty("user.name"));
add(ATTR_GRID_NAME, gridName);
@@ -2726,8 +2728,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
if (cls.equals(IgniteCacheObjectProcessor.class))
return (T)new IgniteCacheObjectProcessorImpl(ctx);
- if (cls.equals(NodeVersionValidatorProcessor.class))
- return (T)new OsNodeVersionValidatorProcessor(ctx);
+ if (cls.equals(DiscoveryNodeValidationProcessor.class))
+ return (T)new OsDiscoveryNodeValidationProcessor(ctx);
Class<T> implCls = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 982ca86..665f205 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -469,9 +469,9 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
}
}
- @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
for (GridComponent comp : ctx) {
- IgniteSpiNodeValidationResult err = comp.validateNode(node);
+ IgniteNodeValidationResult err = comp.validateNode(node);
if (err != null)
return err;
@@ -612,7 +612,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
index f00aac3..39ccd7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
@@ -113,7 +113,7 @@ public abstract class GridProcessorAdapter implements GridProcessor {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/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 c366520..ec708b9 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
@@ -1871,7 +1871,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return validateHashIdResolvers(node);
}
@@ -1879,7 +1879,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param node Joining node.
* @return Validation result or {@code null} in case of success.
*/
- @Nullable private IgniteSpiNodeValidationResult validateHashIdResolvers(ClusterNode node) {
+ @Nullable private IgniteNodeValidationResult validateHashIdResolvers(ClusterNode node) {
for (DynamicCacheDescriptor desc : registeredCaches.values()) {
CacheConfiguration cfg = desc.cacheConfiguration();
@@ -1906,7 +1906,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
", hashIdResolverClass=" + hashIdRslvr.getClass().getName() + ", existingNodeId=" +
topNode.id() + ']';
- return new IgniteSpiNodeValidationResult(topNode.id(), errMsg, sndMsg);
+ return new IgniteNodeValidationResult(topNode.id(), errMsg, sndMsg);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
new file mode 100644
index 0000000..d0f4624
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
@@ -0,0 +1,27 @@
+/*
+ * 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.nodevalidation;
+
+import org.apache.ignite.internal.processors.*;
+
+/**
+ * Node Version Validation.
+ */
+public interface DiscoveryNodeValidationProcessor extends GridProcessor {
+ //No-op.
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
new file mode 100644
index 0000000..628d7c9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
@@ -0,0 +1,74 @@
+/*
+ * 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.nodevalidation;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.*;
+import org.jetbrains.annotations.*;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteVersionUtils.*;
+
+/**
+ * Node validation.
+ */
+public class OsDiscoveryNodeValidationProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor {
+ /**
+ * @param ctx Kernal context.
+ */
+ public OsDiscoveryNodeValidationProcessor(GridKernalContext ctx) {
+ super(ctx);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
+ ClusterNode locNode = ctx.discovery().localNode();
+
+ // Check version.
+ String locBuildVer = locNode.attribute(ATTR_BUILD_VER);
+ String rmtBuildVer = node.attribute(ATTR_BUILD_VER);
+
+ if (!F.eq(rmtBuildVer, locBuildVer)) {
+ // OS nodes don't support rolling updates.
+ if (!locBuildVer.equals(rmtBuildVer)) {
+ String errMsg = "Local node and remote node have different version numbers " +
+ "(node will not join, Ignite does not support rolling updates, " +
+ "so versions must be exactly the same) " +
+ "[locBuildVer=" + locBuildVer + ", rmtBuildVer=" + rmtBuildVer +
+ ", locNodeAddrs=" + U.addressesAsString(locNode) +
+ ", rmtNodeAddrs=" + U.addressesAsString(node) +
+ ", locNodeId=" + locNode.id() + ", rmtNodeId=" + node.id() + ']';
+
+ LT.warn(log, null, errMsg);
+
+ // Always output in debug.
+ if (log.isDebugEnabled())
+ log.debug(errMsg);
+
+ return new IgniteNodeValidationResult(node.id(), errMsg, errMsg);
+ }
+ }
+
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java
deleted file mode 100644
index 5ac1af0..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java
+++ /dev/null
@@ -1,27 +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.spi;
-
-import org.apache.ignite.internal.processors.*;
-
-/**
- * Node Version Validator.
- */
-public interface NodeVersionValidatorProcessor extends GridProcessor {
- //No-op.
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java
deleted file mode 100644
index 3d151f3..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java
+++ /dev/null
@@ -1,80 +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.spi;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
-
-/**
- * Node validator.
- */
-public class OsNodeVersionValidatorProcessor extends GridProcessorAdapter implements NodeVersionValidatorProcessor {
- /**
- * @param ctx Kernal context.
- */
- public OsNodeVersionValidatorProcessor(GridKernalContext ctx) {
- super(ctx);
- }
-
- /** {@inheritDoc} */
- @Override public void start() throws IgniteCheckedException {
- ctx.addNodeAttribute(ATTR_BUILD_VER, VER_STR);
- ctx.addNodeAttribute(ATTR_BUILD_DATE, BUILD_TSTAMP_STR);
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
- ClusterNode locNode = ctx.discovery().localNode();
-
- // Check version.
- String locBuildVer = locNode.attribute(ATTR_BUILD_VER);
- String rmtBuildVer = node.attribute(ATTR_BUILD_VER);
-
- if (!F.eq(rmtBuildVer, locBuildVer)) {
- // OS nodes don't support rolling updates.
- if (!locBuildVer.equals(rmtBuildVer)) {
- String errMsg = "Local node and remote node have different version numbers " +
- "(node will not join, Ignite does not support rolling updates, " +
- "so versions must be exactly the same) " +
- "[locBuildVer=" + locBuildVer + ", rmtBuildVer=" + rmtBuildVer +
- ", locNodeAddrs=" + U.addressesAsString(locNode) +
- ", rmtNodeAddrs=" + U.addressesAsString(node) +
- ", locNodeId=" + locNode.id() + ", rmtNodeId=" + node.id() + ']';
-
- LT.warn(log, null, errMsg);
-
- // Always output in debug.
- if (log.isDebugEnabled())
- log.debug(errMsg);
-
- return new IgniteSpiNodeValidationResult(node.id(), errMsg, errMsg);
- }
- }
-
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
new file mode 100644
index 0000000..0c3746c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
@@ -0,0 +1,66 @@
+/*
+ * 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.spi;
+
+import java.util.*;
+
+/**
+ * Result of joining node validation.
+ */
+public class IgniteNodeValidationResult {
+ /** Offending node ID. */
+ private final UUID nodeId;
+
+ /** Error message to be logged locally. */
+ private final String msg;
+
+ /** Error message to be sent to joining node. */
+ private final String sndMsg;
+
+ /**
+ * @param nodeId Offending node ID.
+ * @param msg Message logged locally.
+ * @param sndMsg Message sent to joining node.
+ */
+ public IgniteNodeValidationResult(UUID nodeId, String msg, String sndMsg) {
+ this.nodeId = nodeId;
+ this.msg = msg;
+ this.sndMsg = sndMsg;
+ }
+
+ /**
+ * @return Offending node ID.
+ */
+ public UUID nodeId() {
+ return nodeId;
+ }
+
+ /**
+ * @return Message to be logged locally.
+ */
+ public String message() {
+ return msg;
+ }
+
+ /**
+ * @return Message to be sent to joining node.
+ */
+ public String sendMessage() {
+ return sndMsg;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index bb66872..1c9b4db 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -664,7 +664,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
index 75b637d..5eef37a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
@@ -302,7 +302,7 @@ public interface IgniteSpiContext {
* @param node Joining node.
* @return Validation result or {@code null} in case of success.
*/
- @Nullable public IgniteSpiNodeValidationResult validateNode(ClusterNode node);
+ @Nullable public IgniteNodeValidationResult validateNode(ClusterNode node);
/**
* Gets collection of authenticated subjects together with their permissions.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java
deleted file mode 100644
index 2c60bc7..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java
+++ /dev/null
@@ -1,66 +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.spi;
-
-import java.util.*;
-
-/**
- * Result of joining node validation.
- */
-public class IgniteSpiNodeValidationResult {
- /** Offending node ID. */
- private final UUID nodeId;
-
- /** Error message to be logged locally. */
- private final String msg;
-
- /** Error message to be sent to joining node. */
- private final String sndMsg;
-
- /**
- * @param nodeId Offending node ID.
- * @param msg Message logged locally.
- * @param sndMsg Message sent to joining node.
- */
- public IgniteSpiNodeValidationResult(UUID nodeId, String msg, String sndMsg) {
- this.nodeId = nodeId;
- this.msg = msg;
- this.sndMsg = sndMsg;
- }
-
- /**
- * @return Offending node ID.
- */
- public UUID nodeId() {
- return nodeId;
- }
-
- /**
- * @return Message to be logged locally.
- */
- public String message() {
- return msg;
- }
-
- /**
- * @return Message to be sent to joining node.
- */
- public String sendMessage() {
- return sndMsg;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d17f9b3..a4cb816 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -3216,7 +3216,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
}
- IgniteSpiNodeValidationResult err = getSpiContext().validateNode(node);
+ IgniteNodeValidationResult err = getSpiContext().validateNode(node);
if (err != null) {
boolean ping = node.id().equals(err.nodeId()) ? pingNode(node) : pingNode(err.nodeId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
index a754910..a4e011a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
@@ -469,7 +469,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
[30/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-668' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-668' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cad2ab38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cad2ab38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cad2ab38
Branch: refs/heads/ignite-437-sqltests-p2
Commit: cad2ab38051171499023a8f716f670a6f2144bf3
Parents: 5b806d8 223a9cd
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 09:11:26 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 09:11:26 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheType.java | 77 +++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 133 +++++++++++-----
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 ++-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++---
.../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 --------------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
23 files changed, 592 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
[39/50] [abbrv] incubator-ignite git commit: ignite-678
Posted by sb...@apache.org.
ignite-678
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a3373f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a3373f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a3373f2
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 9a3373f2e64fcc86b9921eb2fd7a1aac14933429
Parents: e061985
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 13:54:57 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 13:54:57 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 5 ---
pom.xml | 95 +++++++++++++++++++++++++++++++++++++---
2 files changed, 89 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a3373f2/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index c3e6d35..3bd0997 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -86,11 +86,6 @@
</fileSet>
<fileSet>
- <directory>libs</directory>
- <outputDirectory>/libs</outputDirectory>
- </fileSet>
-
- <fileSet>
<directory>examples</directory>
<outputDirectory>/examples</outputDirectory>
<includes>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a3373f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 32da7eb..5390fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,10 +99,7 @@
</profile>
<profile>
- <id>clean-libs</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <id>dev-libs</id>
<build>
<plugins>
<plugin>
@@ -128,6 +125,29 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>dev-libs</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <copy todir="${basedir}/libs">
+ <fileset dir="${basedir}/target/release-package/libs"/>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -323,7 +343,7 @@
<descriptors>
<descriptor>${basedir}/assembly/dependencies-${ignite.edition}.xml</descriptor>
</descriptors>
- <outputDirectory>${basedir}</outputDirectory>
+ <outputDirectory>${basedir}/target/release-package</outputDirectory>
<finalName>libs</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
@@ -340,7 +360,7 @@
<descriptor>${basedir}/assembly/dependencies-optional-${ignite.edition}.xml
</descriptor>
</descriptors>
- <outputDirectory>${basedir}/libs</outputDirectory>
+ <outputDirectory>${basedir}/target/release-package/libs</outputDirectory>
<finalName>optional</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
@@ -453,5 +473,68 @@
<module>examples</module>
</modules>
</profile>
+
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.ju-n.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ <phase>install</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <includes>
+ <include>ignite-${project.version}-source-release.zip</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <algorithms>
+ <algorithm>MD5</algorithm>
+ <algorithm>SHA-1</algorithm>
+ </algorithms>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>apache-sources-pack</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>deploy</phase>
+ <configuration>
+ <target>
+ <zip destfile="${basedir}/target/sources-pack-${project.version}.zip" encoding="UTF-8">
+ <zipfileset dir="${basedir}/target" prefix="sources-pack-${project.version}">
+ <include name="ignite-${project.version}-source-release.zip" />
+ <include name="ignite-${project.version}-source-release.zip.asc" />
+ <include name="ignite-${project.version}-source-release.zip.md5" />
+ <include name="ignite-${project.version}-source-release.zip.sha1" />
+ </zipfileset>
+ </zip>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[15/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/015420fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/015420fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/015420fd
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 015420fd166bb1b0450457c39b43ec62583cd201
Parents: c280901 e100341
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 17:11:44 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 17:11:44 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/plugin/PluginContext.java | 9 +++++----
.../GridCacheAtomicInvalidPartitionHandlingSelfTest.java | 5 +++++
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[14/50] [abbrv] incubator-ignite git commit: # ignite-598: fix bugs
and support remote validation.
Posted by sb...@apache.org.
# ignite-598: fix bugs and support remote validation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c280901d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c280901d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c280901d
Branch: refs/heads/ignite-437-sqltests-p2
Commit: c280901d67d7273573f4bf326d8d7304523d28be
Parents: b78dbff
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 17:10:05 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 17:10:05 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/internal/GridCachePluginContext.java | 6 ++
.../processors/cache/GridCacheProcessor.java | 64 +++++++++++++-------
.../processors/plugin/CachePluginManager.java | 51 ++++++++++++----
.../ignite/plugin/CachePluginContext.java | 11 ++++
.../ignite/plugin/CachePluginProvider.java | 4 +-
6 files changed, 101 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c280901d/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 22148ad..f7f8e26 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
@@ -407,7 +407,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Cache name. If not provided or {@code null}, then this will be considered a default
+ * Cache name or {@code null} if not provided, then this will be considered a default
* cache which can be accessed via {@link Ignite#cache(String)} method. Otherwise, if name
* is provided, the cache will be accessed via {@link Ignite#cache(String)} method.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c280901d/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
index 2334bae..7c80db6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal;
import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.plugin.*;
@@ -64,6 +65,11 @@ public class GridCachePluginContext<C extends CachePluginConfiguration> implemen
@Override public Ignite grid() {
return ctx.grid();
}
+
+ /** {@inheritDoc} */
+ @Override public ClusterNode localNode() {
+ return ctx.discovery().localNode();
+ }
/** {@inheritDoc} */
@Override public IgniteLogger log(Class<?> cls) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c280901d/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 c366520..f21eabc 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
@@ -627,6 +627,17 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ClusterNode locNode = ctx.discovery().localNode();
+ // Init cache plugin managers.
+ final Map<String, CachePluginManager> cache2PluginMgr = new HashMap<>();
+
+ for (DynamicCacheDescriptor desc : registeredCaches.values()) {
+ CacheConfiguration locCcfg = desc.cacheConfiguration();
+
+ CachePluginManager pluginMgr = new CachePluginManager(ctx, locCcfg);
+
+ cache2PluginMgr.put(locCcfg.getName(), pluginMgr);
+ }
+
if (!getBoolean(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) {
for (ClusterNode n : ctx.discovery().remoteNodes()) {
checkTransactionConfiguration(n);
@@ -640,8 +651,18 @@ public class GridCacheProcessor extends GridProcessorAdapter {
for (DynamicCacheDescriptor desc : registeredCaches.values()) {
CacheConfiguration rmtCfg = desc.remoteConfiguration(n.id());
- if (rmtCfg != null)
- checkCache(desc.cacheConfiguration(), rmtCfg, n);
+ if (rmtCfg != null) {
+ CacheConfiguration locCfg = desc.cacheConfiguration();
+
+ checkCache(locCfg, rmtCfg, n);
+
+ // Check plugin cache configurations.
+ CachePluginManager pluginMgr = cache2PluginMgr.get(locCfg.getName());
+
+ assert pluginMgr != null : " Map=" + cache2PluginMgr;
+
+ pluginMgr.validateRemotes(rmtCfg, n);
+ }
}
}
}
@@ -661,7 +682,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (filter.apply(locNode)) {
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg);
- GridCacheContext ctx = createCache(ccfg, cacheObjCtx);
+ CachePluginManager pluginMgr = cache2PluginMgr.get(ccfg.getName());
+
+ assert pluginMgr != null : " Map=" + cache2PluginMgr;
+
+ GridCacheContext ctx = createCache(ccfg, pluginMgr, cacheObjCtx);
ctx.dynamicDeploymentId(desc.deploymentId());
@@ -975,17 +1000,24 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/**
* @param cfg Cache configuration to use to create cache.
+ * @param pluginMgr Cache plugin manager.
* @return Cache context.
* @throws IgniteCheckedException If failed to create cache.
*/
@SuppressWarnings({"unchecked"})
- private GridCacheContext createCache(CacheConfiguration<?, ?> cfg, CacheObjectContext cacheObjCtx) throws IgniteCheckedException {
+ private GridCacheContext createCache(CacheConfiguration<?, ?> cfg, @Nullable CachePluginManager pluginMgr,
+ CacheObjectContext cacheObjCtx) throws IgniteCheckedException {
assert cfg != null;
CacheStore cfgStore = cfg.getCacheStoreFactory() != null ? cfg.getCacheStoreFactory().create() : null;
validate(ctx.config(), cfg, cfgStore);
+ if (pluginMgr == null)
+ pluginMgr = new CachePluginManager(ctx, cfg);
+
+ pluginMgr.validate();
+
CacheJtaManagerAdapter jta = JTA.create(cfg.getTransactionManagerLookupClassName() == null);
jta.createTmLookup(cfg);
@@ -1017,16 +1049,10 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CacheContinuousQueryManager contQryMgr = new CacheContinuousQueryManager();
CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager();
GridCacheTtlManager ttlMgr = new GridCacheTtlManager();
- CachePluginManager pluginMgr = new CachePluginManager(ctx, cfg);
- pluginMgr.validate();
-
- CacheConflictResolutionManager rslvrMgr = pluginMgr.createComponent(ctx, cfg,
- CacheConflictResolutionManager.class);
-
- GridCacheDrManager drMgr = pluginMgr.createComponent(ctx, cfg,GridCacheDrManager.class);
-
- CacheStoreManager storeMgr = pluginMgr.createComponent(ctx, cfg, CacheStoreManager.class);
+ CacheConflictResolutionManager rslvrMgr = pluginMgr.createComponent(CacheConflictResolutionManager.class);
+ GridCacheDrManager drMgr = pluginMgr.createComponent(GridCacheDrManager.class);
+ CacheStoreManager storeMgr = pluginMgr.createComponent(CacheStoreManager.class);
storeMgr.initialize(cfgStore, sesHolders);
@@ -1156,7 +1182,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
evictMgr = new GridCacheEvictionManager();
evtMgr = new GridCacheEventManager();
pluginMgr = new CachePluginManager(ctx, cfg);
- drMgr = pluginMgr.createComponent(ctx, cfg, GridCacheDrManager.class);
+ drMgr = pluginMgr.createComponent(GridCacheDrManager.class);
cacheCtx = new GridCacheContext(
ctx,
@@ -1358,7 +1384,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg);
- GridCacheContext cacheCtx = createCache(ccfg, cacheObjCtx);
+ GridCacheContext cacheCtx = createCache(ccfg, null, cacheObjCtx);
cacheCtx.startTopologyVersion(topVer);
@@ -2028,14 +2054,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
true);
}
}
-
- // TODO 10006: implement remote configs validation.
- // Check plugin configurations.
-// for (CachePluginConfiguration locPluginCcfg : locCfg.getPluginConfigurations()) {
-// CachePluginProvider provider = ...;
-//
-// provider.validateRemote(locCfg, locPluginCcfg, rmtCfg, rmtNode);
-// }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c280901d/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
index 580ff49..640271a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.plugin;
import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -31,60 +32,71 @@ import java.util.*;
* Cache plugin manager.
*/
public class CachePluginManager extends GridCacheManagerAdapter {
+ /** Providers list. To have providers order. */
+ private final List<CachePluginProvider> providersList = new ArrayList<>();
+
+ /** */
+ private final Map<CachePluginContext, CachePluginProvider> providersMap = new HashMap<>();
+
/** */
- private final List<CachePluginProvider> providers = new ArrayList<>();
+ private final GridKernalContext ctx;
+
+ /** */
+ private final CacheConfiguration cfg;
/**
* @param ctx Context.
* @param cfg Cache config.
*/
public CachePluginManager(GridKernalContext ctx, CacheConfiguration cfg) {
+ this.ctx = ctx;
+ this.cfg = cfg;
+
if (cfg.getPluginConfigurations() != null) {
for (CachePluginConfiguration cachePluginCfg : cfg.getPluginConfigurations()) {
CachePluginContext pluginCtx = new GridCachePluginContext(ctx, cfg, cachePluginCfg);
CachePluginProvider provider = cachePluginCfg.createProvider(pluginCtx);
- providers.add(provider);
+ providersList.add(provider);
+ providersMap.put(pluginCtx, provider);
}
}
}
/** {@inheritDoc} */
@Override protected void onKernalStart0() throws IgniteCheckedException {
- for (CachePluginProvider provider : providers)
+ for (CachePluginProvider provider : providersList)
provider.onIgniteStart();
}
/** {@inheritDoc} */
@Override protected void onKernalStop0(boolean cancel) {
- for (ListIterator<CachePluginProvider> iter = providers.listIterator(); iter.hasPrevious();)
+ for (ListIterator<CachePluginProvider> iter = providersList.listIterator(); iter.hasPrevious();)
iter.previous().onIgniteStop(cancel);
}
/** {@inheritDoc} */
@Override protected void start0() throws IgniteCheckedException {
- for (CachePluginProvider provider : providers)
+ for (CachePluginProvider provider : providersList)
provider.start();
}
/** {@inheritDoc} */
@Override protected void stop0(boolean cancel) {
- for (ListIterator<CachePluginProvider> iter = providers.listIterator(); iter.hasPrevious();)
+ for (ListIterator<CachePluginProvider> iter = providersList.listIterator(); iter.hasPrevious();)
iter.previous().stop(cancel);
}
/**
* Creates optional component.
*
- * @param ctx Kernal context.
- * @param cfg Cache configuration.
* @param cls Component class.
* @return Created component.
*/
@SuppressWarnings("unchecked")
- public <T> T createComponent(GridKernalContext ctx, CacheConfiguration cfg, Class<T> cls) {
- for (CachePluginProvider provider : providers) {
+ public <T> T createComponent(Class<T> cls) {
+ for (CachePluginProvider provider : providersList) {
T res = (T)provider.createComponent(cls);
if (res != null)
@@ -107,7 +119,24 @@ public class CachePluginManager extends GridCacheManagerAdapter {
* @throws IgniteCheckedException If validation failed.
*/
public void validate() throws IgniteCheckedException {
- for (CachePluginProvider provider : providers)
+ for (CachePluginProvider provider : providersList)
provider.validate();
}
+
+ /**
+ * Checks that remote caches has configuration compatible with the local.
+ *
+ * @param rmtCfg Remote cache configuration.
+ * @param rmtNode Remote rmtNode.
+ * @throws IgniteCheckedException If failed.
+ */
+ @SuppressWarnings("unchecked")
+ public void validateRemotes(CacheConfiguration rmtCfg, ClusterNode rmtNode) throws IgniteCheckedException {
+ for (Map.Entry<CachePluginContext, CachePluginProvider> entry : providersMap.entrySet()) {
+ CachePluginContext cctx = entry.getKey();
+ CachePluginProvider provider = entry.getValue();
+
+ provider.validateRemote(cctx.igniteCacheConfiguration(), cctx.cacheConfiguration(), rmtCfg, rmtNode);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c280901d/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
index 580b40d..f034312 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
@@ -18,7 +18,9 @@
package org.apache.ignite.plugin;
import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
/**
* Cache plugin context.
@@ -45,6 +47,15 @@ public interface CachePluginContext<C extends CachePluginConfiguration> {
public Ignite grid();
/**
+ * Gets local grid node. Instance of local node is provided by underlying {@link DiscoverySpi}
+ * implementation used.
+ *
+ * @return Local grid node.
+ * @see DiscoverySpi
+ */
+ public ClusterNode localNode();
+
+ /**
* Gets logger for given class.
*
* @param cls Class to get logger for.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c280901d/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
index 4006a70..ea5f795 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
@@ -77,8 +77,8 @@ public interface CachePluginProvider<C extends CachePluginConfiguration> {
* @param locCfg Local configuration.
* @param locPluginCcfg Local plugin configuration.
* @param rmtCfg Remote configuration.
- * @param node Node.
+ * @param rmtNode Remote node.
*/
- public void validateRemote(CacheConfiguration locCfg, C locPluginCcfg, CacheConfiguration rmtCfg, ClusterNode node)
+ public void validateRemote(CacheConfiguration locCfg, C locPluginCcfg, CacheConfiguration rmtCfg, ClusterNode rmtNode)
throws IgniteCheckedException;
}
[10/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b78dbfff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b78dbfff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b78dbfff
Branch: refs/heads/ignite-437-sqltests-p2
Commit: b78dbfff1c61165288ff46b8cf1407f83eba2089
Parents: 82a93c5 d2d6def
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 16:32:20 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 16:32:20 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +++++++
.../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 6 +++---
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 -------
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[04/50] [abbrv] incubator-ignite git commit: # ignite-sprint-3 fixed
test
Posted by sb...@apache.org.
# ignite-sprint-3 fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3af69146
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3af69146
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3af69146
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 3af69146f37bf6938b408da3584d722088d2dc4a
Parents: 09a3a82
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 14:59:02 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 14:59:02 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridCacheNearReadersSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3af69146/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index 59378bb..74c38db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -479,7 +479,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
assertNull(dhtPeek(1, key2));
assertNull(dhtPeek(2, key2));
- assertNull(near(0).peekEx(key2));
+ assertTrue(near(0).peekEx(key2) == null || near(0).peekEx(key2).deleted());
assertNull(near(1).peekEx(key2));
assertNull(near(2).peekEx(key2));
[48/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-sprint-3' into ignite-437-sqltests-p2
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' into ignite-437-sqltests-p2
Conflicts:
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc7a9f8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc7a9f8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc7a9f8d
Branch: refs/heads/ignite-437-sqltests-p2
Commit: bc7a9f8d23915370873a4d0772837fd51f8a4299
Parents: c6816a3 60aaaaa
Author: Artem Shutak <as...@gridgain.com>
Authored: Mon Apr 6 15:56:15 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Mon Apr 6 15:56:15 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
DEVNOTES.txt | 43 +-
LICENSE.txt | 55 +-
NOTICE.txt | 17 +-
RELEASE_NOTES.txt | 20 +-
assembly/dependencies-fabric.xml | 4 +-
assembly/dependencies-hadoop.xml | 6 +-
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 | 8 +-
bin/ignite-schema-import.bat | 59 +-
bin/ignite-schema-import.sh | 33 +-
bin/ignitevisorcmd.sh | 2 +-
config/fabric/default-config.xml | 50 +-
examples/README.txt | 25 +
examples/config/example-cache.xml | 125 +-
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 | 3 +-
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 -
examples/memcached/memcached-example.php | 93 +
examples/pom-standalone.xml | 37 +-
examples/pom.xml | 180 +-
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 | 27 +
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 | 90 +
.../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 | 63 +-
.../computegrid/ComputeAsyncExample.java | 74 +
.../computegrid/ComputeBroadcastExample.java | 8 +-
.../computegrid/ComputeCallableExample.java | 8 +-
.../computegrid/ComputeClosureExample.java | 8 +-
.../ComputeClusterGroupsExample.java | 93 -
.../ComputeContinuousMapperExample.java | 8 +-
.../ComputeExecutorServiceExample.java | 71 -
.../ComputeFibonacciContinuationExample.java | 8 +-
.../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 +
.../failover/ComputeFailoverExample.java | 1 -
.../computegrid/failover/package-info.java | 2 +-
.../montecarlo/CreditRiskExample.java | 8 +-
.../computegrid/montecarlo/package-info.java | 2 +-
.../examples/computegrid/package-info.java | 2 +-
.../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 | 264 +-
.../datagrid/CacheTransactionExample.java | 65 +-
.../hibernate/HibernateL2CacheExample.java | 135 +-
.../HibernateL2CacheExampleNodeStartup.java | 97 -
.../datagrid/hibernate/package-info.java | 2 +-
.../ignite/examples/datagrid/package-info.java | 2 +-
.../starschema/CacheStarSchemaExample.java | 86 +-
.../datagrid/starschema/DimProduct.java | 1 -
.../examples/datagrid/starschema/DimStore.java | 1 -
.../datagrid/starschema/FactPurchase.java | 2 -
.../datagrid/starschema/package-info.java | 2 +-
.../store/CacheNodeWithStoreStartup.java | 145 -
.../datagrid/store/CacheStoreExample.java | 107 -
.../store/CacheStoreLoadDataExample.java | 67 -
.../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 | 12 +-
.../store/dummy/CacheDummyStoreExample.java | 127 +
.../datagrid/store/dummy/package-info.java | 2 +-
.../hibernate/CacheHibernatePersonStore.java | 42 +-
.../hibernate/CacheHibernateStoreExample.java | 130 +
.../datagrid/store/hibernate/Person.hbm.xml | 2 +-
.../datagrid/store/hibernate/package-info.java | 2 +-
.../store/jdbc/CacheJdbcPersonStore.java | 2 +-
.../store/jdbc/CacheJdbcPojoPersonStore.java | 85 -
.../store/jdbc/CacheJdbcStoreExample.java | 130 +
.../datagrid/store/jdbc/package-info.java | 2 +-
.../examples/datagrid/store/model/Person.java | 155 -
.../examples/datagrid/store/package-info.java | 2 +-
.../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 | 2 +-
.../ignite/examples/events/EventsExample.java | 10 +-
.../ignite/examples/events/package-info.java | 2 +-
.../ignite/examples/igfs/package-info.java | 2 +-
.../examples/messaging/MessagingExample.java | 8 +-
.../messaging/MessagingPingPongExample.java | 56 +-
.../MessagingPingPongListenActorExample.java | 8 +-
.../ignite/examples/messaging/package-info.java | 2 +-
.../client/memcache/MemcacheRestExample.java | 2 +-
.../misc/client/memcache/package-info.java | 2 +-
.../examples/misc/client/package-info.java | 2 +-
.../misc/deployment/DeploymentExample.java | 8 +-
.../examples/misc/deployment/package-info.java | 2 +-
.../examples/misc/lifecycle/package-info.java | 2 +-
.../ignite/examples/misc/package-info.java | 2 +-
.../misc/schedule/ComputeScheduleExample.java | 81 +
.../examples/misc/schedule/package-info.java | 22 +
.../misc/springbean/SpringBeanExample.java | 6 +-
.../examples/misc/springbean/package-info.java | 2 +-
.../apache/ignite/examples/package-info.java | 2 +-
.../examples/servicegrid/ServicesExample.java | 21 +-
.../servicegrid/SimpleMapServiceImpl.java | 32 +-
.../examples/servicegrid/package-info.java | 22 +
.../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 +
.../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/pom.xml | 25 +-
modules/aop/readme.txt | 33 -
modules/aws/README.txt | 32 +
modules/aws/pom.xml | 43 +-
modules/aws/readme.txt | 32 -
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-
modules/clients/pom.xml | 43 +-
modules/clients/readme.md | 2 -
.../ClientAbstractMultiThreadedSelfTest.java | 194 +-
.../client/ClientDefaultCacheSelfTest.java | 48 -
.../client/ClientTopologyCacheSelfTest.java | 288 --
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../ClientAbstractMultiNodeSelfTest.java | 284 +-
.../integration/ClientAbstractSelfTest.java | 835 +---
.../client/suite/IgniteClientTestSuite.java | 2 -
.../rest/AbstractRestProcessorSelfTest.java | 13 +-
.../JettyRestProcessorAbstractSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 74 +-
.../rest/RestMemcacheProtocolSelfTest.java | 80 +-
.../processors/rest/RestProcessorTest.java | 3 +-
.../rest/TaskCommandHandlerSelfTest.java | 4 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 17 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 4 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 15 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 2 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 2 +-
.../loadtests/client/ClientTcpSslLoadTest.java | 4 +-
.../clients/src/test/resources/spring-cache.xml | 4 +-
.../src/test/resources/spring-server-node.xml | 6 +-
.../test/resources/spring-server-ssl-node.xml | 6 +-
modules/codegen/pom.xml | 15 +-
.../ignite/codegen/MessageCodeGenerator.java | 3 +
.../core/licenses/pcollections-mit-license.txt | 19 -
modules/core/pom.xml | 89 +-
.../src/main/java/org/apache/ignite/Ignite.java | 158 +-
.../java/org/apache/ignite/IgniteCache.java | 101 +-
.../java/org/apache/ignite/IgniteCluster.java | 8 +-
.../java/org/apache/ignite/IgniteCompute.java | 161 +-
.../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/IgniteServices.java | 40 +-
.../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/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 | 10 +-
.../apache/ignite/cache/CachingProvider.java | 155 +-
.../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 | 110 -
.../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 ++++
.../CacheRendezvousAffinityFunction.java | 501 ---
.../rendezvous/RendezvousAffinityFunction.java | 500 +++
.../cache/eviction/CacheEvictionFilter.java | 40 -
.../cache/eviction/CacheEvictionPolicy.java | 50 -
.../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 +
.../eviction/igfs/CacheIgfsEvictionFilter.java | 35 -
.../CacheIgfsPerBlockLruEvictionPolicy.java | 358 --
...acheIgfsPerBlockLruEvictionPolicyMXBean.java | 93 -
.../cache/eviction/igfs/IgfsEvictionFilter.java | 38 +
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 376 ++
.../IgfsPerBlockLruEvictionPolicyMXBean.java | 93 +
.../eviction/lru/CacheLruEvictionPolicy.java | 185 -
.../lru/CacheLruEvictionPolicyMBean.java | 50 -
.../cache/eviction/lru/LruEvictionPolicy.java | 198 +
.../eviction/lru/LruEvictionPolicyMBean.java | 50 +
.../random/CacheRandomEvictionPolicy.java | 101 -
.../random/CacheRandomEvictionPolicyMBean.java | 42 -
.../eviction/random/RandomEvictionPolicy.java | 114 +
.../random/RandomEvictionPolicyMBean.java | 42 +
.../ignite/cache/query/ContinuousQuery.java | 104 +-
.../org/apache/ignite/cache/query/Query.java | 41 +-
.../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 | 21 +-
.../apache/ignite/cache/query/TextQuery.java | 21 +-
.../cache/query/annotations/package-info.java | 22 +
.../store/jdbc/CacheAbstractJdbcStore.java | 87 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 15 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 4 +-
.../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 +-
.../org/apache/ignite/cluster/ClusterGroup.java | 206 +-
.../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 +-
.../configuration/CacheConfiguration.java | 259 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../configuration/IgniteConfiguration.java | 178 +-
.../configuration/IgniteReflectionFactory.java | 216 +
.../configuration/NearCacheConfiguration.java | 95 +
.../ignite/configuration/package-info.java | 22 +
.../org/apache/ignite/events/CacheEvent.java | 25 +-
.../ignite/events/CacheQueryExecutedEvent.java | 19 +-
.../ignite/events/CacheQueryReadEvent.java | 19 +-
.../ignite/events/CacheRebalancingEvent.java | 26 +-
.../org/apache/ignite/events/EventType.java | 156 +-
.../ignite/internal/GridCachePluginContext.java | 78 +
.../apache/ignite/internal/GridComponent.java | 11 +-
.../internal/GridEventConsumeHandler.java | 18 +-
.../ignite/internal/GridKernalContextImpl.java | 32 +-
.../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 | 6 +-
.../ignite/internal/IgniteComponentType.java | 11 +-
.../org/apache/ignite/internal/IgniteEx.java | 11 +-
.../apache/ignite/internal/IgniteKernal.java | 220 +-
.../ignite/internal/IgniteNodeAttributes.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 276 +-
.../internal/MarshallerContextAdapter.java | 13 +-
.../ignite/internal/MarshallerContextImpl.java | 144 +-
.../internal/client/GridClientCacheFlag.java | 13 -
.../client/GridClientPartitionAffinity.java | 8 +-
.../impl/connection/GridClientConnection.java | 9 -
.../router/impl/GridRouterClientImpl.java | 2 +-
.../impl/GridRouterCommandLineStartup.java | 4 +-
.../internal/cluster/ClusterGroupAdapter.java | 97 +-
.../ignite/internal/cluster/ClusterGroupEx.java | 6 +-
.../cluster/ClusterNodeLocalMapImpl.java | 2 +-
.../ClusterTopologyServerNotFoundException.java | 40 +
.../cluster/IgniteClusterAsyncImpl.java | 10 +
.../internal/cluster/IgniteClusterImpl.java | 4 +-
.../internal/events/DiscoveryCustomEvent.java | 18 +
.../ignite/internal/igfs/common/IgfsLogger.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 12 +-
.../checkpoint/GridCheckpointManager.java | 4 +-
.../managers/communication/GridIoManager.java | 11 +-
.../communication/GridIoMessageFactory.java | 8 +-
.../managers/deployment/GridDeployment.java | 2 +-
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../deployment/GridDeploymentLocalStore.java | 2 +-
.../GridDeploymentPerVersionStore.java | 2 +-
.../discovery/GridDiscoveryManager.java | 556 ++-
.../eventstorage/GridEventStorageManager.java | 5 +-
.../swapspace/GridSwapSpaceManager.java | 6 +-
.../processors/GridProcessorAdapter.java | 4 +-
.../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 -
.../cache/CacheConflictResolutionManager.java | 30 +
.../cache/CacheEntryPredicateAdapter.java | 20 +-
.../cache/CacheEntryPredicateContainsValue.java | 6 +
.../cache/CacheEvictableEntryImpl.java | 202 +
.../internal/processors/cache/CacheFlag.java | 108 -
.../processors/cache/CacheFlagException.java | 67 -
.../processors/cache/CacheMetricsImpl.java | 1 +
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../processors/cache/CacheObjectContext.java | 20 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../cache/CacheOsConflictResolutionManager.java | 58 +
.../processors/cache/CacheProjection.java | 281 +-
.../cache/CacheStoreBalancingWrapper.java | 2 +-
.../cache/CacheStorePartialUpdateException.java | 2 +-
.../internal/processors/cache/CacheType.java | 77 +
.../cache/CacheWeakQueryIteratorsHolder.java | 2 +-
.../cache/DynamicCacheChangeBatch.java | 75 +
.../cache/DynamicCacheChangeRequest.java | 210 +
.../cache/DynamicCacheDescriptor.java | 184 +
.../processors/cache/EvictableEntryImpl.java | 197 -
.../internal/processors/cache/GridCache.java | 17 +-
.../processors/cache/GridCacheAdapter.java | 677 +---
.../cache/GridCacheAffinityManager.java | 72 +-
.../processors/cache/GridCacheAtomicFuture.java | 4 +-
.../cache/GridCacheAtomicVersionComparator.java | 21 +-
.../processors/cache/GridCacheAttributes.java | 364 +-
.../cache/GridCacheClearAllRunnable.java | 6 +-
.../cache/GridCacheConcurrentMap.java | 101 +-
.../processors/cache/GridCacheContext.java | 402 +-
.../GridCacheDefaultAffinityKeyMapper.java | 16 +-
.../cache/GridCacheDeploymentManager.java | 28 +-
.../processors/cache/GridCacheEntryEx.java | 70 +-
.../GridCacheEntryInfoCollectSwapListener.java | 2 +-
.../processors/cache/GridCacheEntrySet.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 30 +-
.../cache/GridCacheEvictionManager.java | 55 +-
.../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 | 6 +-
.../GridCacheLoaderWriterStoreFactory.java | 59 +
.../processors/cache/GridCacheMapEntry.java | 403 +-
.../cache/GridCacheMapEntryFactory.java | 5 +-
.../processors/cache/GridCacheMessage.java | 5 +-
.../cache/GridCacheMvccCandidate.java | 7 +-
.../processors/cache/GridCacheMvccManager.java | 59 +-
.../GridCachePartitionExchangeManager.java | 276 +-
.../processors/cache/GridCachePeekMode.java | 81 -
.../processors/cache/GridCachePreloader.java | 3 +-
.../cache/GridCachePreloaderAdapter.java | 5 +-
.../processors/cache/GridCacheProcessor.java | 2322 +++++++----
.../processors/cache/GridCacheProjectionEx.java | 29 -
.../cache/GridCacheProjectionImpl.java | 370 +-
.../processors/cache/GridCacheProxyImpl.java | 87 +-
.../cache/GridCacheSharedContext.java | 64 +-
.../processors/cache/GridCacheStoreManager.java | 1191 ------
.../processors/cache/GridCacheSwapManager.java | 15 +-
.../cache/GridCacheTryPutFailedException.java | 28 +
.../processors/cache/GridCacheTtlManager.java | 12 +-
.../processors/cache/GridCacheUtils.java | 224 +-
.../cache/GridCacheValueCollection.java | 2 +-
.../cache/GridCacheWriteBehindStore.java | 1014 -----
.../processors/cache/IgniteCacheProxy.java | 314 +-
.../cache/affinity/GridCacheAffinityImpl.java | 13 +-
.../cache/affinity/GridCacheAffinityProxy.java | 6 +-
.../CacheDataStructuresManager.java | 25 +-
.../distributed/GridCacheTtlUpdateRequest.java | 12 +-
.../distributed/GridCacheTxFinishSync.java | 2 +-
.../GridDistributedCacheAdapter.java | 41 +-
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../GridDistributedTxRemoteAdapter.java | 21 +-
.../GridFutureRemapTimeoutObject.java | 73 +
.../dht/GridClientPartitionTopology.java | 109 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 12 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 13 +-
.../dht/GridDhtAssignmentFetchFuture.java | 19 +-
.../distributed/dht/GridDhtCacheAdapter.java | 115 +-
.../distributed/dht/GridDhtCacheEntry.java | 25 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 7 +-
.../distributed/dht/GridDhtLocalPartition.java | 114 +-
.../distributed/dht/GridDhtLockFuture.java | 71 +-
.../distributed/dht/GridDhtLockRequest.java | 11 +-
.../dht/GridDhtPartitionTopology.java | 31 +-
.../dht/GridDhtPartitionTopologyImpl.java | 117 +-
.../distributed/dht/GridDhtTopologyFuture.java | 10 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 24 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 11 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 5 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 15 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 16 +-
.../dht/GridDhtTxPrepareRequest.java | 11 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 9 +-
.../distributed/dht/GridNoStorageCacheMap.java | 15 +-
.../dht/GridPartitionedGetFuture.java | 72 +-
.../dht/atomic/GridDhtAtomicCache.java | 184 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 7 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 11 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 11 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 90 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 87 +-
.../dht/colocated/GridDhtColocatedCache.java | 73 +-
.../colocated/GridDhtColocatedCacheEntry.java | 11 +-
.../colocated/GridDhtColocatedLockFuture.java | 107 +-
.../colocated/GridDhtDetachedCacheEntry.java | 7 +-
.../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 +-
.../GridDhtPartitionsExchangeFuture.java | 235 +-
.../preloader/GridDhtPartitionsFullMessage.java | 18 +-
.../dht/preloader/GridDhtPreloader.java | 19 +-
.../preloader/GridDhtPreloaderAssignments.java | 9 +-
.../distributed/near/GridNearAtomicCache.java | 14 +-
.../distributed/near/GridNearCacheAdapter.java | 157 +-
.../distributed/near/GridNearCacheEntry.java | 108 +-
.../distributed/near/GridNearGetFuture.java | 125 +-
.../distributed/near/GridNearGetRequest.java | 12 +-
.../distributed/near/GridNearGetResponse.java | 12 +-
.../distributed/near/GridNearLockFuture.java | 95 +-
.../distributed/near/GridNearLockRequest.java | 53 +-
.../near/GridNearTransactionalCache.java | 17 +-
.../near/GridNearTxFinishFuture.java | 3 +-
.../near/GridNearTxFinishRequest.java | 11 +-
.../cache/distributed/near/GridNearTxLocal.java | 44 +-
.../near/GridNearTxPrepareFuture.java | 56 +-
.../near/GridNearTxPrepareRequest.java | 11 +-
.../distributed/near/GridNearTxRemote.java | 14 +-
.../processors/cache/dr/GridCacheDrManager.java | 8 +-
.../cache/dr/GridOsCacheDrManager.java | 106 +
.../cache/dr/os/GridOsCacheDrManager.java | 110 -
.../processors/cache/local/GridLocalCache.java | 21 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 98 +-
.../processors/cache/query/CacheQuery.java | 3 +-
.../query/GridCacheDistributedQueryManager.java | 28 +-
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../cache/query/GridCacheQueryAdapter.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 77 +-
.../CacheContinuousQueryFilterEx.java | 4 +-
.../continuous/CacheContinuousQueryHandler.java | 51 +-
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 91 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 11 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 16 +-
.../jdbc/GridCacheQueryJdbcValidationTask.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 | 43 +-
.../transactions/IgniteTxLocalAdapter.java | 77 +-
.../cache/transactions/IgniteTxManager.java | 26 +-
.../version/CacheVersionConflictResolver.java | 40 +
.../version/GridCacheRawVersionedEntry.java | 7 +-
.../cache/version/GridCacheVersion.java | 19 +-
...ridCacheVersionAbstractConflictResolver.java | 56 -
.../GridCacheVersionConflictResolver.java | 59 -
.../cache/version/GridCacheVersionManager.java | 22 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 18 +-
.../IgniteCacheObjectProcessorImpl.java | 196 +-
.../processors/clock/GridClockDeltaVersion.java | 10 +-
.../continuous/GridContinuousHandler.java | 15 +-
.../continuous/GridContinuousProcessor.java | 81 +-
.../datastreamer/DataStreamProcessor.java | 3 +-
.../datastreamer/DataStreamerCacheUpdaters.java | 25 +-
.../datastreamer/DataStreamerImpl.java | 148 +-
.../datastreamer/DataStreamerRequest.java | 2 +-
.../datastreamer/DataStreamerUpdateJob.java | 18 +-
.../datastructures/DataStructuresProcessor.java | 17 +-
.../datastructures/GridCacheAtomicLongImpl.java | 14 +-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 2 +-
.../GridCacheInternalKeyImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../datastructures/GridCacheSetImpl.java | 5 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java | 14 +-
.../processors/igfs/IgfsClientSession.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 80 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 3 +
.../processors/igfs/IgfsFileAffinityRange.java | 23 +-
.../processors/igfs/IgfsFileWorker.java | 2 -
.../processors/igfs/IgfsHelperImpl.java | 17 +-
.../internal/processors/igfs/IgfsImpl.java | 10 +-
.../processors/igfs/IgfsLocalMetrics.java | 30 +-
.../processors/igfs/IgfsMetaManager.java | 46 +-
.../internal/processors/igfs/IgfsProcessor.java | 52 +-
.../internal/processors/igfs/IgfsServer.java | 2 +-
.../processors/job/GridJobProcessor.java | 14 +-
.../jobmetrics/GridJobMetricsProcessor.java | 2 +-
.../DiscoveryNodeValidationProcessor.java | 27 +
.../OsDiscoveryNodeValidationProcessor.java | 72 +
.../offheap/GridOffHeapProcessor.java | 2 +-
.../processors/plugin/CachePluginManager.java | 142 +
.../plugin/IgnitePluginProcessor.java | 2 +-
.../processors/query/GridQueryIndexing.java | 12 +-
.../processors/query/GridQueryProcessor.java | 241 +-
.../messages/GridQueryNextPageResponse.java | 34 +-
.../processors/resource/GridResourceIoc.java | 2 +-
.../processors/rest/GridRestProcessor.java | 4 +-
.../handlers/cache/GridCacheCommandHandler.java | 70 +-
.../cache/GridCacheQueryCommandHandler.java | 6 +-
.../handlers/task/GridTaskCommandHandler.java | 2 +-
.../service/GridServiceProcessor.java | 40 +-
.../processors/service/GridServiceProxy.java | 2 +-
.../session/GridTaskSessionProcessor.java | 2 +-
.../spring/IgniteSpringProcessor.java | 73 -
.../processors/task/GridTaskProcessor.java | 42 +-
.../processors/task/GridTaskWorker.java | 2 +-
.../internal/util/GridAnnotationsCache.java | 2 +-
.../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 +-
.../ignite/internal/util/IgniteUtils.java | 204 +-
.../util/future/GridCompoundFuture.java | 2 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 90 +-
.../ignite/internal/util/lang/GridFunc.java | 18 +-
.../ignite/internal/util/nio/GridNioServer.java | 122 +-
.../util/nio/GridSelectorNioSessionImpl.java | 2 +-
.../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 +-
.../util/spring/IgniteSpringHelper.java | 95 +
.../ignite/internal/util/worker/GridWorker.java | 12 -
.../ignite/internal/visor/cache/VisorCache.java | 17 +-
.../cache/VisorCacheAffinityConfiguration.java | 6 +-
.../visor/cache/VisorCacheClearTask.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 98 +-
.../cache/VisorCacheDefaultConfiguration.java | 21 -
.../cache/VisorCacheEvictionConfiguration.java | 13 +-
.../visor/cache/VisorCacheLoadTask.java | 2 +-
.../cache/VisorCacheNearConfiguration.java | 11 +-
.../cache/VisorCachePreloadConfiguration.java | 114 -
.../visor/cache/VisorCachePreloadTask.java | 82 -
.../cache/VisorCacheRebalanceConfiguration.java | 114 +
.../visor/cache/VisorCacheRebalanceTask.java | 82 +
.../cache/VisorCacheStoreConfiguration.java | 18 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 2 +-
.../visor/event/VisorGridEventsLost.java | 7 +-
.../event/VisorGridSecuritySessionEvent.java | 91 -
.../visor/node/VisorGridConfiguration.java | 28 +-
.../visor/node/VisorIgfsConfiguration.java | 11 +
.../visor/node/VisorNodeDataCollectorJob.java | 11 +-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../internal/visor/util/VisorTaskUtils.java | 32 +-
.../org/apache/ignite/lang/IgnitePredicate.java | 3 +-
.../ignite/lang/IgniteProductVersion.java | 30 +-
.../java/org/apache/ignite/lang/IgniteUuid.java | 7 +-
.../apache/ignite/lifecycle/package-info.java | 22 +
.../ignite/marshaller/MarshallerContext.java | 8 +-
.../jdk/JdkMarshallerObjectInputStream.java | 4 +-
.../optimized/OptimizedMarshaller.java | 2 +-
.../optimized/OptimizedMarshallerUtils.java | 13 +-
.../ignite/plugin/CachePluginConfiguration.java | 36 +
.../ignite/plugin/CachePluginContext.java | 65 +
.../ignite/plugin/CachePluginProvider.java | 84 +
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/plugin/package-info.java | 22 +
.../ignite/spi/IgniteNodeValidationResult.java | 66 +
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 25 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 7 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 -
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../communication/tcp/TcpCommunicationSpi.java | 23 +-
.../deployment/local/LocalDeploymentSpi.java | 2 +-
.../spi/discovery/DiscoverySpiDataExchange.java | 8 +-
.../spi/discovery/DiscoverySpiListener.java | 3 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 21 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 240 +-
.../tcp/internal/TcpDiscoveryNode.java | 10 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 2 +-
.../TcpDiscoveryCustomEventMessage.java | 1 +
.../messages/TcpDiscoveryNodeAddedMessage.java | 26 +-
.../memory/MemoryEventStorageSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 2 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../spi/swapspace/SwapSpaceSpiListener.java | 3 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../ignite/startup/BasicWarmupClosure.java | 13 +-
.../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 +
.../apache/ignite/transactions/Transaction.java | 9 +-
.../ignite/transactions/package-info.java | 22 +
.../org/jdk8/backport/ConcurrentHashMap8.java | 3793 -----------------
.../jdk8/backport/ConcurrentLinkedDeque8.java | 1953 ---------
.../jdk8/backport/ConcurrentLinkedHashMap.java | 2140 ----------
.../main/java/org/jdk8/backport/LongAdder.java | 205 -
.../main/java/org/jdk8/backport/Striped64.java | 345 --
.../org/jdk8/backport/ThreadLocalRandom8.java | 201 -
.../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 +
.../resources/META-INF/classnames.properties | 163 +-
.../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 +-
.../spring-cache-client-benchmark-1.xml | 4 +-
.../spring-cache-client-benchmark-2.xml | 4 +-
.../spring-cache-client-benchmark-3.xml | 4 +-
.../core/src/test/config/discovery-stress.xml | 3 +-
modules/core/src/test/config/example-cache.xml | 6 +-
.../core/src/test/config/examples.properties | 14 +-
modules/core/src/test/config/igfs-loopback.xml | 1 -
modules/core/src/test/config/igfs-shmem.xml | 1 -
.../src/test/config/load/cache-benchmark.xml | 2 -
.../test/config/load/cache-client-benchmark.xml | 13 -
.../config/load/dsi-49-server-production.xml | 6 +-
.../src/test/config/load/dsi-load-server.xml | 7 +-
.../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 | 268 --
.../config/store/jdbc/ignite-type-metadata.xml | 268 ++
.../test/config/websession/example-cache.xml | 8 +-
.../test/config/websession/spring-cache-1.xml | 4 -
.../test/config/websession/spring-cache-2.xml | 4 -
.../test/config/websession/spring-cache-3.xml | 4 -
.../GridCacheAffinityBackupsSelfTest.java | 8 +-
.../apache/ignite/GridTestStoreNodeStartup.java | 2 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 73 +-
...CachePartitionFairAffinityNodesSelfTest.java | 242 --
.../GridCachePartitionFairAffinitySelfTest.java | 261 --
.../GridFairAffinityFunctionNodesSelfTest.java | 242 ++
.../fair/GridFairAffinityFunctionSelfTest.java | 264 ++
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 2 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 6 +-
.../store/jdbc/CacheJdbcPojoStoreTest.java | 2 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 31 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 75 +-
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 3 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +-
.../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 | 77 +-
.../ignite/internal/GridProjectionSelfTest.java | 36 +-
.../ignite/internal/GridStartStopSelfTest.java | 4 +-
.../internal/GridUpdateNotifierSelfTest.java | 2 +
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 4 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
.../GridDeploymentMessageCountSelfTest.java | 8 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 12 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 124 +-
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 152 +
.../GridAffinityProcessorAbstractSelfTest.java | 18 +-
...GridAffinityProcessorRendezvousSelfTest.java | 4 +-
...cheNearUpdateTopologyChangeAbstractTest.java | 140 +
.../GridCacheAbstractFailoverSelfTest.java | 138 +-
.../GridCacheAbstractFailoverTxSelfTest.java | 110 +
.../cache/GridCacheAbstractFlagsTest.java | 100 -
...cheAbstractFullApiMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 338 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 21 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 84 +-
.../GridCacheAbstractRemoveFailureTest.java | 15 +-
.../cache/GridCacheAbstractSelfTest.java | 141 +-
...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 | 377 ++
.../cache/GridCacheClearLocalySelfTest.java | 335 --
...dCacheColocatedTxStoreExceptionSelfTest.java | 6 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 10 +-
.../cache/GridCacheConcurrentMapTest.java | 6 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 62 +-
...idCacheConfigurationConsistencySelfTest.java | 273 +-
...ridCacheConfigurationValidationSelfTest.java | 39 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 7 +-
.../GridCacheDeploymentOffHeapSelfTest.java | 3 +-
.../cache/GridCacheDeploymentSelfTest.java | 21 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 7 +-
.../cache/GridCacheEntryVersionSelfTest.java | 8 +-
.../GridCacheEvictionEventAbstractTest.java | 10 +-
.../GridCacheExAbstractFullApiSelfTest.java | 16 +-
.../GridCacheFinishPartitionsSelfTest.java | 30 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 4 +-
...idCacheGetAndTransformStoreAbstractTest.java | 11 +-
.../cache/GridCacheIncrementTransformTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 357 +-
...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 | 13 +-
.../processors/cache/GridCacheLeakTest.java | 7 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 43 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 21 +-
.../GridCacheMarshallerTxAbstractTest.java | 10 +-
.../GridCacheMarshallingNodeJoinSelfTest.java | 170 +
.../cache/GridCacheMemoryModeSelfTest.java | 45 +-
...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 | 663 ---
.../processors/cache/GridCacheOffHeapTest.java | 9 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 49 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 17 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 10 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 42 +-
.../GridCacheOrderedPreloadingSelfTest.java | 2 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 9 +-
.../GridCachePartitionedAffinitySpreadTest.java | 4 +-
.../cache/GridCachePartitionedGetSelfTest.java | 12 +-
.../GridCachePartitionedLocalStoreSelfTest.java | 6 +-
...chePartitionedOffHeapLocalStoreSelfTest.java | 6 +-
...hePartitionedProjectionAffinitySelfTest.java | 2 -
.../cache/GridCachePartitionedWritesTest.java | 9 +-
.../GridCachePreloadingEvictionsSelfTest.java | 17 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 31 +-
.../processors/cache/GridCachePutAllTask.java | 2 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 19 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../GridCacheReferenceCleanupSelfTest.java | 13 +-
.../cache/GridCacheReloadSelfTest.java | 10 +-
.../GridCacheReplicatedLocalStoreSelfTest.java | 6 +-
...ridCacheReplicatedSynchronousCommitTest.java | 8 +-
...CacheReplicatedTxStoreExceptionSelfTest.java | 6 +-
...heReplicatedUsersAffinityMapperSelfTest.java | 5 +-
.../GridCacheReturnValueTransferSelfTest.java | 49 +-
.../cache/GridCacheSlowTxWarnTest.java | 2 +-
.../processors/cache/GridCacheStopSelfTest.java | 2 +-
.../cache/GridCacheStorePutxSelfTest.java | 2 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 3 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 37 +-
.../cache/GridCacheSwapReloadSelfTest.java | 2 +-
.../processors/cache/GridCacheTestEntryEx.java | 70 +-
...cheTransactionalAbstractMetricsSelfTest.java | 8 +-
.../cache/GridCacheTtlManagerLoadTest.java | 2 +-
.../cache/GridCacheTtlManagerSelfTest.java | 6 +-
...ridCacheTxPartitionedLocalStoreSelfTest.java | 6 +-
.../GridCacheTxUsersAffinityMapperSelfTest.java | 5 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 13 +-
...idCacheValueConsistencyAbstractSelfTest.java | 142 +-
...istencyTransactionalNearEnabledSelfTest.java | 6 +-
...heValueConsistencyTransactionalSelfTest.java | 2 +-
.../GridCacheVariableTopologySelfTest.java | 2 +-
.../cache/GridCacheVersionMultinodeTest.java | 13 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 189 -
.../GridCacheWriteBehindStoreAbstractTest.java | 351 --
.../GridCacheWriteBehindStoreLocalTest.java | 30 -
...heWriteBehindStoreMultithreadedSelfTest.java | 163 -
...BehindStorePartitionedMultiNodeSelfTest.java | 217 -
...ridCacheWriteBehindStorePartitionedTest.java | 30 -
...GridCacheWriteBehindStoreReplicatedTest.java | 30 -
.../GridCacheWriteBehindStoreSelfTest.java | 267 --
.../IgniteCacheAbstractStopBusySelfTest.java | 13 +-
.../cache/IgniteCacheAbstractTest.java | 28 +-
.../cache/IgniteCacheAtomicInvokeTest.java | 6 +-
.../cache/IgniteCacheAtomicLocalInvokeTest.java | 6 +-
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 +
...niteCacheAtomicLocalWithStoreInvokeTest.java | 6 +-
.../IgniteCacheAtomicNearEnabledInvokeTest.java | 8 +-
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 +
.../IgniteCacheAtomicNearPeekModesTest.java | 28 +
...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 6 +-
...maryWriteOrderNearEnabledStoreValueTest.java | 31 +
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 +
...micPrimaryWriteOrderWithStoreInvokeTest.java | 6 +-
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 +
.../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +-
...niteCacheCopyOnReadDisabledAbstractTest.java | 2 +-
.../cache/IgniteCacheDynamicStopSelfTest.java | 133 +
.../IgniteCacheEntryListenerAbstractTest.java | 204 +-
...IgniteCacheEntryListenerAtomicLocalTest.java | 6 +-
.../IgniteCacheEntryListenerAtomicTest.java | 6 +-
.../IgniteCacheEntryListenerTxLocalTest.java | 6 +-
.../cache/IgniteCacheEntryListenerTxTest.java | 6 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
.../cache/IgniteCacheInvokeReadThroughTest.java | 11 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 42 +-
.../cache/IgniteCacheStartStopLoadTest.java | 135 +
.../IgniteCacheStoreValueAbstractTest.java | 311 ++
.../cache/IgniteCacheTxInvokeTest.java | 6 +-
.../cache/IgniteCacheTxLocalInvokeTest.java | 6 +-
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +
.../IgniteCacheTxNearEnabledInvokeTest.java | 8 +-
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 +
.../cache/IgniteCacheTxNearPeekModesTest.java | 28 +
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 8 +-
.../cache/IgniteCacheTxStoreValueTest.java | 49 +
.../cache/IgniteCachingProviderSelfTest.java | 4 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 108 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 1000 +++++
.../cache/IgniteInternalCacheTypesTest.java | 159 +
.../cache/IgnitePutAllLargeBatchSelfTest.java | 21 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 9 +-
.../cache/IgniteStaticCacheStartSelfTest.java | 98 +
.../processors/cache/IgniteTxAbstractTest.java | 4 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 32 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 72 +-
.../IgniteTxMultiThreadedAbstractTest.java | 2 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 7 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 50 +-
...IgniteCacheAbstractExecutionContextTest.java | 14 +-
.../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 | 23 -
...titionedAtomicSequenceMultiThreadedTest.java | 48 +-
...GridCachePartitionedNodeRestartSelfTest.java | 2 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 26 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 8 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 9 +-
...CacheAtomicNearUpdateTopologyChangeTest.java | 39 +
.../CacheTxNearUpdateTopologyChangeTest.java | 33 +
...tractDistributedByteArrayValuesSelfTest.java | 6 +-
.../GridCacheAbstractJobExecutionTest.java | 38 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 10 +-
...tractPartitionedByteArrayValuesSelfTest.java | 9 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 7 +-
.../GridCacheAtomicTimeoutSelfTest.java | 17 +-
.../GridCacheBasicOpAbstractTest.java | 26 +-
.../GridCacheClientModesAbstractSelfTest.java | 38 +-
.../GridCacheEntrySetAbstractSelfTest.java | 2 +-
...acheEntrySetIterationPreloadingSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 287 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +-
...GridCacheLoadingConcurrentGridStartTest.java | 6 +-
.../distributed/GridCacheLockAbstractTest.java | 6 +-
.../distributed/GridCacheMixedModeSelfTest.java | 8 +-
.../GridCacheModuloAffinityFunction.java | 4 +-
.../GridCacheMultiNodeAbstractTest.java | 10 +-
.../GridCacheMultiNodeLockAbstractTest.java | 14 +-
...dCacheMultithreadedFailoverAbstractTest.java | 25 +-
.../GridCacheNodeFailureAbstractTest.java | 12 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 148 +
...dCachePartitionedAffinityFilterSelfTest.java | 10 +-
...chePartitionedReloadAllAbstractSelfTest.java | 17 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 7 +-
...GridCachePreloadRestartAbstractSelfTest.java | 19 +-
.../GridCacheTransformEventSelfTest.java | 7 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 39 +-
.../IgniteCrossCacheTxStoreSelfTest.java | 93 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 8 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 12 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 20 +-
.../IgniteTxTimeoutAbstractTest.java | 10 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 12 +-
...heAbstractTransformWriteThroughSelfTest.java | 10 +-
...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 | 8 +-
...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 | 36 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 47 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 19 +-
...idCacheDhtExpiredEntriesPreloadSelfTest.java | 6 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 36 +-
.../dht/GridCacheDhtMappingSelfTest.java | 6 +-
.../dht/GridCacheDhtMultiBackupTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 26 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 15 +-
.../GridCacheDhtPreloadMessageCountTest.java | 8 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 34 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 26 +-
.../dht/GridCacheDhtRemoveFailureTest.java | 3 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 22 +-
.../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 | 22 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 10 +-
...IgniteCacheContainsKeyColocatedSelfTest.java | 5 +-
...teTxConsistencyColocatedRestartSelfTest.java | 5 +-
.../dht/IgniteTxReentryColocatedSelfTest.java | 2 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +
...eAtomicInvalidPartitionHandlingSelfTest.java | 65 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 9 +-
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +
...tomicPrimaryWriteOrderRemoveFailureTest.java | 56 +
.../GridCacheAtomicRemoveFailureTest.java | 56 +
...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +
...lueConsistencyAtomicNearEnabledSelfTest.java | 14 +-
...micPrimaryWriteOrderNearEnabledSelfTest.java | 6 +-
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 +
...GridCacheValueConsistencyAtomicSelfTest.java | 103 +-
...CacheContainsKeyColocatedAtomicSelfTest.java | 5 +-
...tNearPartitionedByteArrayValuesSelfTest.java | 8 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 6 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 19 +-
...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 | 15 +-
...dCacheNearExpiredEntriesPreloadSelfTest.java | 6 -
.../near/GridCacheNearJobExecutionSelfTest.java | 3 +-
.../near/GridCacheNearMetricsSelfTest.java | 32 +-
.../near/GridCacheNearMultiGetSelfTest.java | 8 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 132 +-
.../near/GridCacheNearOneNodeSelfTest.java | 39 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 74 +-
.../near/GridCacheNearOnlySelfTest.java | 7 -
.../near/GridCacheNearOnlyTopologySelfTest.java | 40 +-
.../GridCacheNearPartitionedClearSelfTest.java | 9 +-
.../near/GridCacheNearPrimarySyncSelfTest.java | 8 +-
.../GridCacheNearReaderPreloadSelfTest.java | 11 +-
.../near/GridCacheNearReadersSelfTest.java | 188 +-
.../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 | 12 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 15 +-
.../near/GridCachePartitionedEventSelfTest.java | 3 +-
.../GridCachePartitionedEvictionSelfTest.java | 8 +-
...titionedExplicitLockNodeFailureSelfTest.java | 3 +-
.../GridCachePartitionedFailoverSelfTest.java | 2 +-
...GridCachePartitionedFilteredPutSelfTest.java | 8 +-
.../near/GridCachePartitionedFlagsTest.java | 41 -
.../GridCachePartitionedFullApiSelfTest.java | 3 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 12 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 7 +-
...achePartitionedMultiNodeCounterSelfTest.java | 31 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 110 +-
...idCachePartitionedMultiNodeLockSelfTest.java | 3 +-
.../GridCachePartitionedMultiNodeSelfTest.java | 2 -
...ePartitionedMultiThreadedPutGetSelfTest.java | 19 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
...itionedNearOnlyNoPrimaryFullApiSelfTest.java | 6 +-
...GridCachePartitionedNodeFailureSelfTest.java | 2 -
.../GridCachePartitionedNodeRestartTest.java | 5 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
...achePartitionedPreloadLifecycleSelfTest.java | 14 +-
.../GridCachePartitionedStorePutSelfTest.java | 9 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 5 +-
...achePartitionedTxSingleThreadedSelfTest.java | 1 -
.../near/GridCachePutArrayValueSelfTest.java | 2 +-
...idCacheRendezvousAffinityClientSelfTest.java | 10 +-
...ffinityFunctionExcludeNeighborsSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 7 +-
.../near/IgniteCacheNearReadCommittedTest.java | 9 +-
.../near/IgniteTxReentryNearSelfTest.java | 2 +-
...stractReplicatedByteArrayValuesSelfTest.java | 1 -
.../GridCacheReplicatedEvictionSelfTest.java | 13 +-
.../GridCacheReplicatedFailoverSelfTest.java | 2 +-
.../GridCacheReplicatedFlagsTest.java | 28 -
.../GridCacheReplicatedFullApiSelfTest.java | 5 +-
.../GridCacheReplicatedInvalidateSelfTest.java | 13 +-
...dezvousAffinityMultiNodeFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedTxExceptionSelfTest.java | 6 +-
...ssimisticOriginatingNodeFailureSelfTest.java | 7 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 4 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 7 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 15 +-
.../GridCacheReplicatedPreloadSelfTest.java | 49 +-
...GridCacheReplicatedPreloadUndeploysTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 11 +-
...heConcurrentEvictionConsistencySelfTest.java | 29 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 18 +-
.../GridCacheDistributedEvictionsSelfTest.java | 48 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 17 +-
.../eviction/GridCacheEvictionAbstractTest.java | 36 +-
.../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 | 9 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 13 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 28 +-
.../IgniteCacheAtomicExpiryPolicyTest.java | 6 +-
.../IgniteCacheAtomicLocalExpiryPolicyTest.java | 6 +-
...maryWriteOrderWithStoreExpiryPolicyTest.java | 6 +-
...iteCacheAtomicWithStoreExpiryPolicyTest.java | 6 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 36 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 54 +-
.../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 +-
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +
.../IgniteCacheLoadAllAbstractTest.java | 111 +-
.../IgniteCacheLoaderWriterAbstractTest.java | 14 +-
...iteCacheNoLoadPreviousValueAbstractTest.java | 5 +-
.../IgniteCacheNoReadThroughAbstractTest.java | 63 +-
.../IgniteCacheNoWriteThroughAbstractTest.java | 8 +-
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 +
.../IgniteCacheStoreSessionAbstractTest.java | 15 +-
...acheStoreSessionWriteBehindAbstractTest.java | 14 +-
.../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 | 12 +-
...dCacheAtomicLocalMetricsNoStoreSelfTest.java | 13 +-
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 8 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 5 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 5 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 6 +-
.../GridCacheLocalMultithreadedSelfTest.java | 2 +-
.../local/GridCacheLocalTxTimeoutSelfTest.java | 2 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 127 +-
...ontinuousQueryAtomicNearEnabledSelfTest.java | 8 +-
.../GridCacheContinuousQueryAtomicSelfTest.java | 6 +-
...eContinuousQueryPartitionedOnlySelfTest.java | 6 +-
...dCacheContinuousQueryReplicatedSelfTest.java | 8 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 191 +
.../GridCacheWriteBehindStoreAbstractTest.java | 350 ++
.../GridCacheWriteBehindStoreLocalTest.java | 30 +
...heWriteBehindStoreMultithreadedSelfTest.java | 163 +
...BehindStorePartitionedMultiNodeSelfTest.java | 216 +
...ridCacheWriteBehindStorePartitionedTest.java | 30 +
...GridCacheWriteBehindStoreReplicatedTest.java | 30 +
.../GridCacheWriteBehindStoreSelfTest.java | 268 ++
.../DataStreamProcessorSelfTest.java | 57 +-
.../datastreamer/DataStreamerImplSelfTest.java | 2 +-
.../IgniteDataStreamerPerformanceTest.java | 9 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 4 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 12 +-
.../processors/igfs/IgfsCacheSelfTest.java | 23 +-
.../igfs/IgfsDataManagerSelfTest.java | 8 +-
.../igfs/IgfsDualAbstractSelfTest.java | 2 +-
.../igfs/IgfsMetaManagerSelfTest.java | 3 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 8 +-
.../processors/igfs/IgfsModesSelfTest.java | 4 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 13 +-
.../processors/igfs/IgfsSizeSelfTest.java | 62 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 +
.../processors/igfs/IgfsStreamsSelfTest.java | 9 +-
.../processors/igfs/IgfsTaskSelfTest.java | 4 +-
.../IgfsAbstractRecordResolverSelfTest.java | 3 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../processors/service/DummyService.java | 2 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
.../GridServiceProcessorMultiNodeSelfTest.java | 2 +-
.../GridServiceReassignmentSelfTest.java | 5 +-
.../internal/util/GridTestClockTimer.java | 11 +
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../util/future/GridCompoundFutureSelfTest.java | 3 +-
.../future/GridFutureListenPerformanceTest.java | 4 +-
.../util/future/GridFutureQueueTest.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 24 +-
.../ipc/shmem/IpcSharedMemoryNodeStartup.java | 3 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +-
.../offheap/GridOffHeapMapAbstractSelfTest.java | 3 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
.../unsafe/GridUnsafeMemorySelfTest.java | 10 +-
...GridUnsafePartitionedMapPerformanceTest.java | 2 +-
.../ignite/jvmtest/BlockingQueueTest.java | 4 +-
.../ignite/jvmtest/ConcurrentMapTest.java | 2 +-
.../ignite/lang/GridBasicPerformanceTest.java | 2 +-
.../lang/GridFutureListenPerformanceTest.java | 4 +-
.../lang/GridMetadataAwareAdapterSelfTest.java | 14 +-
.../GridCircularBufferPerformanceTest.java | 10 +-
.../lang/utils/GridCircularBufferSelfTest.java | 2 +-
.../utils/GridConcurrentHashMapSelfTest.java | 4 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 19 +-
...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 | 4 +-
.../communication/GridIoManagerBenchmark.java | 4 +-
.../communication/GridIoManagerBenchmark0.java | 8 +-
.../GridTcpCommunicationBenchmark.java | 6 +-
.../GridContinuousOperationsLoadTest.java | 9 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 7 +-
.../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 +-
...dBoundedConcurrentLinkedHashSetLoadTest.java | 8 +-
.../loadtests/hashmap/GridCacheTestContext.java | 18 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../job/GridJobExecutionLoadTestClient.java | 4 +-
...GridJobExecutionLoadTestClientSemaphore.java | 4 +-
...JobExecutionSingleNodeSemaphoreLoadTest.java | 6 +-
.../GridConcurrentLinkedHashMapBenchmark.java | 6 +-
.../mapper/GridContinuousMapperTask1.java | 2 +-
.../mapper/GridContinuousMapperTask2.java | 2 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 2 +-
.../swap/GridSwapEvictAllBenchmark.java | 6 +-
.../marshaller/GridMarshallerAbstractTest.java | 6 +-
.../marshaller/MarshallerContextTestImpl.java | 2 +-
.../OptimizedMarshallerNodeFailoverTest.java | 77 +-
.../OptimizedObjectStreamSelfTest.java | 20 +-
.../ignite/messaging/GridMessagingSelfTest.java | 63 +-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 2 +-
.../discovery/AbstractDiscoverySelfTest.java | 2 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 9 +-
.../file/GridFileSwapSpaceSpiSelfTest.java | 3 +-
.../inmemory/GridTestSwapSpaceSpi.java | 4 +-
.../GridCacheStoreValueBytesNode.java | 132 -
.../GridCacheStoreValueBytesTest.java | 343 --
.../testframework/GridSpiTestContext.java | 20 +-
.../ignite/testframework/GridTestUtils.java | 43 +-
.../testframework/junits/GridAbstractTest.java | 174 +-
.../junits/GridTestKernalContext.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 40 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/common/GridAbstractExamplesTest.java | 2 +-
.../GridAbstractLifecycleAwareSelfTest.java | 7 +
.../junits/common/GridCommonAbstractTest.java | 212 +-
.../junits/spi/GridSpiAbstractTest.java | 18 +-
.../IgniteCacheFailoverTestSuite.java | 25 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 34 +-
.../IgniteCacheWriteBehindTestSuite.java | 3 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
...dConcurrentLinkedDequeMultiThreadedTest.java | 6 +-
.../util/GridConcurrentLinkedDequeSelfTest.java | 6 +-
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../webapp/META-INF/ignite-webapp-config.xml | 7 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 4 +-
modules/extdata/p2p/pom.xml | 23 +-
.../tests/p2p/CacheDeploymentTestTask1.java | 2 +-
.../tests/p2p/CacheDeploymentTestTask3.java | 2 +-
.../tests/p2p/GridExternalAffinityFunction.java | 6 +-
.../p2p/GridExternalAffinityKeyMapper.java | 2 +-
.../p2p/GridP2PContinuousDeploymentTask1.java | 2 +-
modules/extdata/uri/pom.xml | 25 +-
modules/geospatial/README.txt | 48 +
modules/geospatial/pom.xml | 43 +-
modules/geospatial/readme.txt | 33 -
.../query/h2/GridH2IndexingGeoSelfTest.java | 14 +-
modules/hadoop/README.txt | 33 +
modules/hadoop/pom.xml | 38 +-
modules/hadoop/readme.txt | 33 -
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 29 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 4 +-
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 4 +-
.../processors/hadoop/HadoopClassLoader.java | 23 +-
.../processors/hadoop/HadoopContext.java | 4 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 2 +-
.../internal/processors/hadoop/HadoopSetup.java | 8 +-
.../hadoop/SecondaryFileSystemProvider.java | 31 +-
.../hadoop/counter/HadoopCountersImpl.java | 2 +-
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +-
.../hadoop/igfs/HadoopIgfsOutProc.java | 2 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 13 +-
.../taskexecutor/HadoopExecutorService.java | 2 +-
.../external/HadoopExternalTaskExecutor.java | 2 +-
.../HadoopExternalCommunication.java | 2 +-
.../hadoop/v1/HadoopV1ReduceTask.java | 5 +-
.../processors/hadoop/v2/HadoopDaemon.java | 125 +
.../processors/hadoop/v2/HadoopV2Job.java | 60 +-
.../hadoop/v2/HadoopV2ReduceTask.java | 5 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 8 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 5 +-
...oopSecondaryFileSystemConfigurationTest.java | 8 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 19 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 6 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 3 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 3 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 +-
...niteHadoopFileSystemLoggerStateSelfTest.java | 2 +-
...teHadoopFileSystemSecondaryModeSelfTest.java | 4 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../hadoop/HadoopCommandLineTest.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 8 +-
.../processors/hadoop/HadoopMapReduceTest.java | 24 +-
.../processors/hadoop/HadoopSharedMap.java | 2 +-
.../taskexecutor/HadoopExecutorServiceTest.java | 6 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +-
modules/hibernate/README.txt | 48 +
modules/hibernate/pom.xml | 32 +-
modules/hibernate/readme.txt | 33 -
.../HibernateAccessStrategyAdapter.java | 2 +-
.../cache/hibernate/HibernateRegionFactory.java | 21 +-
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../HibernateL2CacheConfigurationSelfTest.java | 14 +-
.../hibernate/HibernateL2CacheSelfTest.java | 10 +-
.../HibernateL2CacheTransactionalSelfTest.java | 3 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +
.../testsuites/IgniteHibernateTestSuite.java | 2 +
modules/indexing/README.txt | 33 +
modules/indexing/pom.xml | 43 +-
modules/indexing/readme.txt | 33 -
.../processors/query/h2/IgniteH2Indexing.java | 86 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 95 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 64 +-
.../query/h2/opt/GridH2RowDescriptor.java | 2 +-
.../processors/query/h2/opt/GridH2Table.java | 33 +-
.../query/h2/opt/GridH2TreeIndex.java | 4 +-
.../query/h2/opt/GridLuceneIndex.java | 7 +-
.../query/h2/sql/GridSqlQueryParser.java | 5 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 90 +-
.../query/h2/twostep/GridMergeIndex.java | 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 15 +-
.../query/h2/twostep/GridResultPage.java | 9 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 100 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 69 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 199 +-
.../cache/GridCacheOffHeapSelfTest.java | 624 +++
.../GridCacheQueryIndexDisabledSelfTest.java | 16 +-
.../cache/GridCacheQueryMetricsSelfTest.java | 6 +-
.../cache/GridCacheQuerySimpleBenchmark.java | 10 +-
...idCacheReduceQueryMultithreadedSelfTest.java | 5 +-
.../processors/cache/GridCacheSwapSelfTest.java | 139 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 11 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 92 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 208 +-
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 2 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 319 ++
...hePartitionedQueryMultiThreadedSelfTest.java | 8 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 4 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 42 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 102 +-
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 11 +-
...GridCachePartitionedFieldsQuerySelfTest.java | 20 +-
.../IgniteCacheAtomicFieldsQuerySelfTest.java | 8 +-
...cheAtomicNearEnabledFieldsQuerySelfTest.java | 8 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 6 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 6 +-
...niteCachePartitionedFieldsQuerySelfTest.java | 7 +-
.../IgniteCachePartitionedQuerySelfTest.java | 12 +-
.../IgniteCacheQueryNodeRestartSelfTest.java | 6 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +-
...gniteCacheReplicatedFieldsQuerySelfTest.java | 4 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 28 +-
.../local/IgniteCacheLocalQuerySelfTest.java | 9 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 43 +-
...ridCacheReduceFieldsQueryAtomicSelfTest.java | 6 +-
...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +-
.../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 | 75 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 8 +-
.../query/h2/sql/GridQueryParsingTest.java | 3 +-
.../IgniteCacheQuerySelfTestSuite.java | 2 +-
.../IgniteCacheWithIndexingTestSuite.java | 51 +
.../IgniteH2IndexingSpiTestSuite.java | 7 -
modules/jcl/README.txt | 33 +
modules/jcl/pom.xml | 16 +-
modules/jcl/readme.txt | 33 -
modules/jta/README.txt | 32 +
modules/jta/pom.xml | 30 +-
modules/jta/readme.txt | 32 -
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../processors/cache/GridCacheJtaSelfTest.java | 2 +-
.../GridTmLookupLifecycleAwareSelfTest.java | 12 +-
modules/log4j/README.txt | 32 +
modules/log4j/pom.xml | 16 +-
modules/log4j/readme.txt | 32 -
modules/rest-http/README.txt | 33 +
modules/rest-http/pom.xml | 14 +-
modules/rest-http/readme.txt | 33 -
.../http/jetty/GridJettyRestHandler.java | 11 +-
modules/scalar/README.txt | 32 +
modules/scalar/pom.xml | 51 +-
modules/scalar/readme.txt | 32 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 40 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 25 +-
.../scalar/src/test/resources/spring-cache.xml | 6 +-
.../test/resources/spring-ping-pong-partner.xml | 2 +-
modules/schedule/README.txt | 47 +
modules/schedule/pom.xml | 16 +-
modules/schedule/readme.txt | 32 -
modules/schema-import/README.txt | 214 +
modules/schema-import/pom.xml | 23 +-
modules/schema-import/readme.txt | 214 -
.../ignite/schema/generator/CodeGenerator.java | 659 +++
.../ignite/schema/generator/PojoGenerator.java | 414 --
.../schema/generator/SnippetGenerator.java | 144 -
.../ignite/schema/generator/XmlGenerator.java | 26 +-
.../apache/ignite/schema/model/IndexItem.java | 16 +-
.../ignite/schema/model/PojoDescriptor.java | 16 +-
.../ignite/schema/ui/ConfirmCallable.java | 2 +-
.../org/apache/ignite/schema/ui/MessageBox.java | 23 +-
.../ignite/schema/ui/SchemaImportApp.java | 230 +-
.../schema/test/AbstractSchemaImportTest.java | 19 +-
.../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/pom.xml | 14 +-
modules/slf4j/readme.txt | 32 -
modules/spring/README.txt | 33 +
modules/spring/pom.xml | 20 +-
modules/spring/readme.txt | 33 -
.../org/apache/ignite/IgniteSpringBean.java | 56 +-
.../apache/ignite/cache/spring/SpringCache.java | 142 +-
.../ignite/cache/spring/SpringCacheManager.java | 105 +-
.../cache/spring/SpringDynamicCacheManager.java | 339 --
.../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 +
.../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/pom.xml | 20 +-
modules/ssh/readme.txt | 32 -
.../util/nodestart/IgniteSshHelperImpl.java | 28 +
.../util/nodestart/IgniteSshProcessorImpl.java | 28 -
modules/tools/pom.xml | 11 +-
.../ant/beautifier/GridJavadocAntTask.java | 10 +-
modules/urideploy/README.txt | 33 +
modules/urideploy/pom.xml | 52 +-
modules/urideploy/readme.txt | 33 -
.../GridUriDeploymentFileResourceLoader.java | 2 +-
.../licenses/jcraft-revised-bsd.txt | 4 +-
modules/visor-console/pom.xml | 24 +-
.../ignite/visor/commands/VisorConsole.scala | 10 +-
.../commands/cache/VisorCacheCommand.scala | 21 +-
.../commands/deploy/VisorDeployCommand.scala | 106 +-
.../commands/disco/VisorDiscoveryCommand.scala | 8 +-
.../commands/events/VisorEventsCommand.scala | 24 +-
.../visor/commands/logo_ignite_128x128.png | Bin 18667 -> 0 bytes
.../ignite/visor/commands/logo_ignite_48x48.png | Bin 16572 -> 0 bytes
.../commands/start/VisorStartCommand.scala | 17 +-
.../commands/tasks/VisorTasksCommand.scala | 14 +-
.../scala/org/apache/ignite/visor/visor.scala | 8 +-
.../cache/VisorCacheClearCommandSpec.scala | 8 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 4 +-
modules/visor-plugins/pom.xml | 14 +-
modules/web/README.txt | 34 +
modules/web/pom.xml | 26 +-
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 +
.../IgniteServletContextListenerStartup.java | 181 -
.../startup/servlet/IgniteServletStartup.java | 187 -
.../servlet/ServletContextListenerStartup.java | 181 +
.../ignite/startup/servlet/ServletStartup.java | 187 +
.../internal/websession/WebSessionSelfTest.java | 2 +-
modules/yardstick/README.md | 3 +-
modules/yardstick/config/ignite-base-config.xml | 2 +
modules/yardstick/pom.xml | 22 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 21 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 15 +-
.../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 +-
parent/pom.xml | 708 ++++
pom.xml | 1284 ++----
scripts/git-apply-patch.sh | 94 +
scripts/git-format-patch.sh | 87 +
scripts/git-patch-functions.sh | 171 +
scripts/git-patch-prop.sh | 24 +
1667 files changed, 55386 insertions(+), 45684 deletions(-)
----------------------------------------------------------------------
[02/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-668
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-668
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9af2d56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9af2d56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9af2d56
Branch: refs/heads/ignite-437-sqltests-p2
Commit: f9af2d5685c8e49621836071e3f366a3d9158ef5
Parents: 66260cb 09a3a82
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 14:47:39 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 14:47:39 2015 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[31/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-675' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-675' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd944bf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd944bf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd944bf8
Branch: refs/heads/ignite-437-sqltests-p2
Commit: dd944bf83bc4c5cc9967a194aab3ff9a8c9ed56c
Parents: cad2ab3 dac23c4
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 09:13:59 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 09:13:59 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../processors/task/GridTaskProcessor.java | 24 ++++++++++++++++++--
2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[25/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-668
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-668
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/223a9cd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/223a9cd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/223a9cd1
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 223a9cd172a2e4d0bc1349b2d06955b614b9ccf0
Parents: 093489e 580f051
Author: sboikov <se...@inria.fr>
Authored: Sun Apr 5 19:30:09 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sun Apr 5 19:30:09 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 62 ++++---
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../processors/plugin/CachePluginManager.java | 51 ++++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 ++++++++++
scripts/git-format-patch.sh | 87 ++++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
27 files changed, 547 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/223a9cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 0455ff0,f21eabc..482d816
--- 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
@@@ -670,7 -682,11 +691,11 @@@ public class GridCacheProcessor extend
if (filter.apply(locNode)) {
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg);
- GridCacheContext ctx = createCache(ccfg, desc.cacheType(), cacheObjCtx);
+ CachePluginManager pluginMgr = cache2PluginMgr.get(ccfg.getName());
+
+ assert pluginMgr != null : " Map=" + cache2PluginMgr;
+
- GridCacheContext ctx = createCache(ccfg, pluginMgr, cacheObjCtx);
++ GridCacheContext ctx = createCache(ccfg, pluginMgr, desc.cacheType(), cacheObjCtx);
ctx.dynamicDeploymentId(desc.deploymentId());
@@@ -984,22 -1000,24 +1009,29 @@@
/**
* @param cfg Cache configuration to use to create cache.
+ * @param pluginMgr Cache plugin manager.
+ * @param cacheType Cache type.
+ * @param cacheObjCtx Cache object context.
* @return Cache context.
* @throws IgniteCheckedException If failed to create cache.
*/
- @SuppressWarnings({"unchecked"})
- private GridCacheContext createCache(CacheConfiguration<?, ?> cfg, @Nullable CachePluginManager pluginMgr,
- CacheObjectContext cacheObjCtx) throws IgniteCheckedException {
+ private GridCacheContext createCache(CacheConfiguration<?, ?> cfg,
++ @Nullable CachePluginManager pluginMgr,
+ CacheType cacheType,
+ CacheObjectContext cacheObjCtx)
+ throws IgniteCheckedException
+ {
assert cfg != null;
CacheStore cfgStore = cfg.getCacheStoreFactory() != null ? cfg.getCacheStoreFactory().create() : null;
- validate(ctx.config(), cfg, cfgStore);
+ validate(ctx.config(), cfg, cacheType, cfgStore);
+ if (pluginMgr == null)
+ pluginMgr = new CachePluginManager(ctx, cfg);
+
+ pluginMgr.validate();
+
CacheJtaManagerAdapter jta = JTA.create(cfg.getTransactionManagerLookupClassName() == null);
jta.createTmLookup(cfg);
@@@ -1382,7 -1384,7 +1408,7 @@@
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg);
- GridCacheContext cacheCtx = createCache(ccfg, cacheType, cacheObjCtx);
- GridCacheContext cacheCtx = createCache(ccfg, null, cacheObjCtx);
++ GridCacheContext cacheCtx = createCache(ccfg, null, cacheType, cacheObjCtx);
cacheCtx.startTopologyVersion(topVer);
[32/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3a03442
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3a03442
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3a03442
Branch: refs/heads/ignite-437-sqltests-p2
Commit: c3a03442f4b0fa81076a452671284d36181f9213
Parents: 4c99d6c dd944bf
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 10:34:52 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 10:34:52 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 189 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
56 files changed, 1214 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[33/50] [abbrv] incubator-ignite git commit: # ignite-gg-9966 minor
Posted by sb...@apache.org.
# ignite-gg-9966 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/2f1ecc52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f1ecc52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f1ecc52
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 2f1ecc52872586771f2b43c9f779632d46d650e7
Parents: c3a0344
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 10:37:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 10:37:27 2015 +0300
----------------------------------------------------------------------
.../nodevalidation/DiscoveryNodeValidationProcessor.java | 2 +-
.../nodevalidation/OsDiscoveryNodeValidationProcessor.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1ecc52/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
index d0f4624..00669e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.nodevalidation;
import org.apache.ignite.internal.processors.*;
/**
- * Node Version Validation.
+ * Node validation.
*/
public interface DiscoveryNodeValidationProcessor extends GridProcessor {
//No-op.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1ecc52/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
index 628d7c9..7f4458f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.nodevalidation;
-import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
@@ -27,7 +26,6 @@ import org.apache.ignite.spi.*;
import org.jetbrains.annotations.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
/**
* Node validation.
[42/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-571' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-571' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e9a5c97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e9a5c97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e9a5c97
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 9e9a5c972bf78bccc8f486a3a9709bf8bd605621
Parents: e061985 6924f0f
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 6 14:39:11 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 6 14:39:11 2015 +0300
----------------------------------------------------------------------
modules/clients/readme.md | 2 -
.../processors/cache/CacheDistributionMode.java | 67 --------------------
.../IgniteCollectionAbstractTest.java | 23 -------
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +--
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +++++--
.../org/apache/ignite/yardstick/IgniteNode.java | 11 ++--
14 files changed, 44 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
[07/50] [abbrv] incubator-ignite git commit: # ignite-sprint-3 moved
'isNodeStopping' to SpiAdapter
Posted by sb...@apache.org.
# ignite-sprint-3 moved 'isNodeStopping' to SpiAdapter
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d2d6def5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d2d6def5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d2d6def5
Branch: refs/heads/ignite-437-sqltests-p2
Commit: d2d6def52dd469869592ee2fd7b9df2a83ba4812
Parents: 3af6914
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 16:14:24 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 16:14:24 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +++++++
.../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 6 +++---
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 -------
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2d6def5/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index bb66872..2bd262c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -357,6 +357,13 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
}
/**
+ * @return {@code True} if node is stopping.
+ */
+ protected final boolean isNodeStopping() {
+ return spiCtx.isStopping();
+ }
+
+ /**
* @return {@code true} if this check is optional.
*/
private boolean checkOptional() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2d6def5/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 0ab0cf2..613ff64 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -257,7 +257,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
clients.remove(id, rmv)) {
rmv.forceClose();
- if (!getSpiContext().isStopping()) {
+ if (!isNodeStopping()) {
GridNioRecoveryDescriptor recoveryData = ses.recoveryDescriptor();
if (recoveryData != null) {
@@ -1460,7 +1460,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public void spiStop() throws IgniteSpiException {
- assert getSpiContext().isStopping();
+ assert isNodeStopping();
unregisterMBean();
@@ -1619,7 +1619,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
GridCommunicationClient client = clients.get(nodeId);
if (client == null) {
- if (getSpiContext().isStopping())
+ if (isNodeStopping())
throw new IgniteSpiException("Node is stopping.");
// Do not allow concurrent connects.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2d6def5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d5c05f7..cd18370 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1060,13 +1060,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
/**
- * @return {@code True} if node is stopping.
- */
- private boolean isNodeStopping() {
- return super.getSpiContext().isStopping();
- }
-
- /**
* @throws IgniteSpiException If any error occurs.
* @return {@code true} if IP finder contains local address.
*/