incubator-ignite git commit: # Minor: rename "Schema Load" to "Schema Import".
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 f54fc36cc -> 435543f8d
# Minor: rename "Schema Load" to "Schema Import".
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/435543f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/435543f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/435543f8
Branch: refs/heads/sprint-2
Commit: 435543f8dcf761bf043598e28b296d747ff6e749
Parents: f54fc36
Author: AKuznetsov
Authored: Sun Mar 15 19:22:47 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 15 19:22:47 2015 +0700
--
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 4 ++--
.../org/apache/ignite/examples/datagrid/store/model/Person.java | 2 +-
.../apache/ignite/examples/datagrid/store/model/PersonKey.java | 2 +-
modules/core/src/test/config/store/jdbc/Ignite.xml | 2 +-
.../org/apache/ignite/cache/store/jdbc/model/Organization.java | 2 +-
.../apache/ignite/cache/store/jdbc/model/OrganizationKey.java| 2 +-
.../java/org/apache/ignite/cache/store/jdbc/model/Person.java| 2 +-
.../apache/ignite/cache/store/jdbc/model/PersonComplexKey.java | 2 +-
.../java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/bin/ignite-schema-import.bat
--
diff --git a/bin/ignite-schema-import.bat b/bin/ignite-schema-import.bat
index 7cac917..fc01306 100644
--- a/bin/ignite-schema-import.bat
+++ b/bin/ignite-schema-import.bat
@@ -16,7 +16,7 @@
::
::
-:: Ignite Schema Load Utility.
+:: Ignite Schema Import Utility.
::
@echo off
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/bin/ignite-schema-import.sh
--
diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh
index f145f02..2ef887c 100644
--- a/bin/ignite-schema-import.sh
+++ b/bin/ignite-schema-import.sh
@@ -17,7 +17,7 @@
#
#
-# Ignite Schema Load Utility.
+# Ignite Schema Import Utility.
#
#
@@ -56,7 +56,7 @@
CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import
osname=`uname`
if [ "${DOCK_OPTS}" == "" ]; then
-DOCK_OPTS="-Xdock:name=Ignite Schema Load Utility"
+DOCK_OPTS="-Xdock:name=Ignite Schema Import Utility"
fi
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
index 417abf2..fad7816 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* Person definition.
*
- * Code generated by Apache Ignite Schema Load utility: 02/24/2015.
+ * Code generated by Apache Ignite Schema Import utility: 02/24/2015.
*/
public class Person implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
index 4850b0f..74da78b 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* PersonKey definition.
*
- * Code generated by Apache Ignite Schema Load utility: 02/24/2015.
+ * Code generated by Apache Ignite Schema Import utility: 02/24/2015.
*/
public class PersonKey implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/modules/core/src/test/config/store/jdbc/Ignite.xml
--
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml
b/modules/core/src/test/config/store/jdbc/Ignite.xml
index d56b4e6..9eb598d 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/conf
incubator-ignite git commit: # IGNITE-330 Store demo.
Repository: incubator-ignite Updated Branches: refs/heads/sprint-2 435543f8d -> 52ee23539 # IGNITE-330 Store demo. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52ee2353 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52ee2353 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52ee2353 Branch: refs/heads/sprint-2 Commit: 52ee2353941d6559e73c93d272e6a1172aa36f5b Parents: 435543f Author: AKuznetsov Authored: Sun Mar 15 21:25:55 2015 +0700 Committer: AKuznetsov Committed: Sun Mar 15 21:25:55 2015 +0700 -- examples/config/store/example-database.script | 22 +-- .../config/store/example-jdbc-pojo-store.xml| 142 --- .../store/CacheNodeWithStoreStartup.java| 45 -- .../datagrid/store/CacheStoreExample.java | 19 +++ .../store/jdbc/CacheJdbcPojoPersonStore.java| 11 -- .../datagrid/store/model/PersonKey.java | 97 - 6 files changed, 66 insertions(+), 270 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-database.script -- diff --git a/examples/config/store/example-database.script b/examples/config/store/example-database.script index 1397f28..80e418b 100644 --- a/examples/config/store/example-database.script +++ b/examples/config/store/example-database.script @@ -13,15 +13,15 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -create table PERSONS(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); +create table PERSON(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); -insert into PERSONS(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); -insert into PERSONS(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); -insert into PERSONS(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); -insert into PERSONS(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); -insert into PERSONS(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); -insert into PERSONS(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); -insert into PERSONS(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); -insert into PERSONS(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); -insert into PERSONS(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); -insert into PERSONS(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); +insert into PERSON(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); +insert into PERSON(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); +insert into PERSON(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); +insert into PERSON(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); +insert into PERSON(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); +insert into PERSON(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); +insert into PERSON(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); +insert into PERSON(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); +insert into PERSON(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); +insert into PERSON(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-jdbc-pojo-store.xml -- diff --git a/examples/config/store/example-jdbc-pojo-store.xml b/examples/config/store/example-jdbc-pojo-store.xml deleted file mode 100644 index 4fc089f..000 --- a/examples/config/store/example-jdbc-pojo-store.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - -http://www.springframework.org/schema/beans"; - xmlns:util="http://www.springframework.org/schema/util"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" -http://www.springframework.org/schema/beans -http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/util -http://www.springframework.org/schema/util/spring-util.xsd";> - - - - - - - - - - - - - - - - - - - - -
[1/6] incubator-ignite git commit: # Minor: rename "Schema Load" to "Schema Import".
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sql-tests 4bf6436cd -> 0e8a44232
# Minor: rename "Schema Load" to "Schema Import".
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/435543f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/435543f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/435543f8
Branch: refs/heads/ignite-sql-tests
Commit: 435543f8dcf761bf043598e28b296d747ff6e749
Parents: f54fc36
Author: AKuznetsov
Authored: Sun Mar 15 19:22:47 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 15 19:22:47 2015 +0700
--
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 4 ++--
.../org/apache/ignite/examples/datagrid/store/model/Person.java | 2 +-
.../apache/ignite/examples/datagrid/store/model/PersonKey.java | 2 +-
modules/core/src/test/config/store/jdbc/Ignite.xml | 2 +-
.../org/apache/ignite/cache/store/jdbc/model/Organization.java | 2 +-
.../apache/ignite/cache/store/jdbc/model/OrganizationKey.java| 2 +-
.../java/org/apache/ignite/cache/store/jdbc/model/Person.java| 2 +-
.../apache/ignite/cache/store/jdbc/model/PersonComplexKey.java | 2 +-
.../java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/bin/ignite-schema-import.bat
--
diff --git a/bin/ignite-schema-import.bat b/bin/ignite-schema-import.bat
index 7cac917..fc01306 100644
--- a/bin/ignite-schema-import.bat
+++ b/bin/ignite-schema-import.bat
@@ -16,7 +16,7 @@
::
::
-:: Ignite Schema Load Utility.
+:: Ignite Schema Import Utility.
::
@echo off
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/bin/ignite-schema-import.sh
--
diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh
index f145f02..2ef887c 100644
--- a/bin/ignite-schema-import.sh
+++ b/bin/ignite-schema-import.sh
@@ -17,7 +17,7 @@
#
#
-# Ignite Schema Load Utility.
+# Ignite Schema Import Utility.
#
#
@@ -56,7 +56,7 @@
CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import
osname=`uname`
if [ "${DOCK_OPTS}" == "" ]; then
-DOCK_OPTS="-Xdock:name=Ignite Schema Load Utility"
+DOCK_OPTS="-Xdock:name=Ignite Schema Import Utility"
fi
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
index 417abf2..fad7816 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* Person definition.
*
- * Code generated by Apache Ignite Schema Load utility: 02/24/2015.
+ * Code generated by Apache Ignite Schema Import utility: 02/24/2015.
*/
public class Person implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
index 4850b0f..74da78b 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* PersonKey definition.
*
- * Code generated by Apache Ignite Schema Load utility: 02/24/2015.
+ * Code generated by Apache Ignite Schema Import utility: 02/24/2015.
*/
public class PersonKey implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/modules/core/src/test/config/store/jdbc/Ignite.xml
--
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml
b/modules/core/src/test/config/store/jdbc/Ignite.xml
index d56b4e6..9eb598d 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/co
[6/6] incubator-ignite git commit: ignite-sql-tests - web session test
ignite-sql-tests - web session 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/0e8a4423
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e8a4423
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e8a4423
Branch: refs/heads/ignite-sql-tests
Commit: 0e8a44232379f950dc12b2121b77b8572382445c
Parents: 39ae21b
Author: S.Vladykin
Authored: Sun Mar 15 21:14:54 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 21:14:54 2015 +0300
--
.../test/config/websession/example-cache.xml| 164 +++
.../internal/websession/WebSessionSelfTest.java | 2 +-
2 files changed, 165 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e8a4423/modules/core/src/test/config/websession/example-cache.xml
--
diff --git a/modules/core/src/test/config/websession/example-cache.xml
b/modules/core/src/test/config/websession/example-cache.xml
new file mode 100644
index 000..314f1a8
--- /dev/null
+++ b/modules/core/src/test/config/websession/example-cache.xml
@@ -0,0 +1,164 @@
+
+
+
+
+
+http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:util="http://www.springframework.org/schema/util";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/util
+http://www.springframework.org/schema/util/spring-util.xsd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+java.lang.Integer
+java.lang.Long
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+java.lang.Integer
+java.lang.Integer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+127.0.0.1:47500..47509
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e8a4423/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
--
diff --git
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index b0948d1..198bfca 100644
---
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -57,7 +57,7 @@ public class WebSessionSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testSingleRequest() throws Exception {
-testSingleRequest("/examples/config/example-cache.xml");
+
testSingleRequest("/modules/core/src/test/config/websession/example-cache.xml");
}
/**
[4/6] incubator-ignite git commit: ignite-sql-tests - query timeout warning
ignite-sql-tests - query timeout warning
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43f13f95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43f13f95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43f13f95
Branch: refs/heads/ignite-sql-tests
Commit: 43f13f957357a243d1a90c300edee38cdf02ab31
Parents: 6b0503a
Author: S.Vladykin
Authored: Sun Mar 15 20:24:12 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 20:24:12 2015 +0300
--
.../processors/cache/GridCacheConfigurationConsistencySelfTest.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43f13f95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index d412e77..c24518e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -638,7 +638,6 @@ public class GridCacheConfigurationConsistencySelfTest
extends GridCommonAbstrac
String log = strLog.toString();
assertTrue(log.contains("Default lock timeout"));
-assertTrue(log.contains("Default query timeout"));
assertTrue(log.contains("Default time to live"));
}
[3/6] incubator-ignite git commit: ignite-sql-tests - offheap validation
ignite-sql-tests - offheap 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/6b0503a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b0503a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b0503a1 Branch: refs/heads/ignite-sql-tests Commit: 6b0503a148a6ac19761bc8615edbb8ddfb117cc0 Parents: 4bf6436 Author: S.Vladykin Authored: Sun Mar 15 20:20:23 2015 +0300 Committer: S.Vladykin Committed: Sun Mar 15 20:20:23 2015 +0300 -- .../cache/GridCacheConfigurationValidationSelfTest.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b0503a1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java index dea5baf..69f77b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java @@ -84,6 +84,9 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract dfltCacheCfg.setRebalanceMode(ASYNC); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); dfltCacheCfg.setAffinity(new CacheRendezvousAffinityFunction()); +dfltCacheCfg.setIndexedTypes( +Integer.class, String.class +); // Non-default cache configuration. CacheConfiguration namedCacheCfg = defaultCacheConfiguration();
[2/6] incubator-ignite git commit: # IGNITE-330 Store demo.
# IGNITE-330 Store demo. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52ee2353 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52ee2353 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52ee2353 Branch: refs/heads/ignite-sql-tests Commit: 52ee2353941d6559e73c93d272e6a1172aa36f5b Parents: 435543f Author: AKuznetsov Authored: Sun Mar 15 21:25:55 2015 +0700 Committer: AKuznetsov Committed: Sun Mar 15 21:25:55 2015 +0700 -- examples/config/store/example-database.script | 22 +-- .../config/store/example-jdbc-pojo-store.xml| 142 --- .../store/CacheNodeWithStoreStartup.java| 45 -- .../datagrid/store/CacheStoreExample.java | 19 +++ .../store/jdbc/CacheJdbcPojoPersonStore.java| 11 -- .../datagrid/store/model/PersonKey.java | 97 - 6 files changed, 66 insertions(+), 270 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-database.script -- diff --git a/examples/config/store/example-database.script b/examples/config/store/example-database.script index 1397f28..80e418b 100644 --- a/examples/config/store/example-database.script +++ b/examples/config/store/example-database.script @@ -13,15 +13,15 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -create table PERSONS(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); +create table PERSON(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); -insert into PERSONS(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); -insert into PERSONS(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); -insert into PERSONS(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); -insert into PERSONS(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); -insert into PERSONS(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); -insert into PERSONS(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); -insert into PERSONS(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); -insert into PERSONS(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); -insert into PERSONS(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); -insert into PERSONS(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); +insert into PERSON(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); +insert into PERSON(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); +insert into PERSON(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); +insert into PERSON(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); +insert into PERSON(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); +insert into PERSON(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); +insert into PERSON(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); +insert into PERSON(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); +insert into PERSON(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); +insert into PERSON(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-jdbc-pojo-store.xml -- diff --git a/examples/config/store/example-jdbc-pojo-store.xml b/examples/config/store/example-jdbc-pojo-store.xml deleted file mode 100644 index 4fc089f..000 --- a/examples/config/store/example-jdbc-pojo-store.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - -http://www.springframework.org/schema/beans"; - xmlns:util="http://www.springframework.org/schema/util"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" -http://www.springframework.org/schema/beans -http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/util -http://www.springframework.org/schema/util/spring-util.xsd";> - - - - - - - - - - - - - - - - - - - - - - - - -
[5/6] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Merge branch 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39ae21b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39ae21b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39ae21b3
Branch: refs/heads/ignite-sql-tests
Commit: 39ae21b30eee7bc78ec6d92ce6cb0b3ed98a43f2
Parents: 43f13f9 52ee235
Author: S.Vladykin
Authored: Sun Mar 15 20:33:10 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 20:33:10 2015 +0300
--
bin/ignite-schema-import.bat| 2 +-
bin/ignite-schema-import.sh | 4 +-
examples/config/store/example-database.script | 22 +--
.../config/store/example-jdbc-pojo-store.xml| 142 ---
.../store/CacheNodeWithStoreStartup.java| 45 --
.../datagrid/store/CacheStoreExample.java | 19 +++
.../store/jdbc/CacheJdbcPojoPersonStore.java| 11 --
.../examples/datagrid/store/model/Person.java | 2 +-
.../datagrid/store/model/PersonKey.java | 97 -
.../core/src/test/config/store/jdbc/Ignite.xml | 2 +-
.../cache/store/jdbc/model/Organization.java| 2 +-
.../cache/store/jdbc/model/OrganizationKey.java | 2 +-
.../ignite/cache/store/jdbc/model/Person.java | 2 +-
.../store/jdbc/model/PersonComplexKey.java | 2 +-
.../cache/store/jdbc/model/PersonKey.java | 2 +-
15 files changed, 76 insertions(+), 280 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ae21b3/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
--
diff --cc
examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
index 3f780a4,6304193..a35fa41
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
@@@ -73,16 -90,29 +90,26 @@@ public class CacheNodeWithStoreStartup
// Set atomicity as transaction, since we are showing transactions in
example.
cacheCfg.setAtomicityMode(TRANSACTIONAL);
-// Set query indexing enabled for use query in example.
-cacheCfg.setQueryIndexEnabled(true);
-
CacheStore store;
- // Uncomment other cache stores to try them.
- store = new CacheDummyPersonStore();
- // store = new CacheJdbcPersonStore();
- // store = new CacheHibernatePersonStore();
+ switch (STORE) {
+ case DUMMY:
+ store = new CacheDummyPersonStore();
+ break;
+
+ case SIMPLE_JDBC:
+ store = new CacheJdbcPersonStore();
+ break;
+
+ case HIBERNATE:
+ store = new CacheHibernatePersonStore();
+ break;
- // Uncomment two lines for try CacheJdbcPojoStore.
- // store = new CacheJdbcPojoPersonStore();
- // cacheCfg.setTypeMetadata(typeMetadata());
+ default:
+ store = new CacheJdbcPojoPersonStore();
+ cacheCfg.setTypeMetadata(typeMetadata());
+ break;
+ }
cacheCfg.setCacheStoreFactory(new
FactoryBuilder.SingletonFactory<>(store));
cacheCfg.setReadThrough(true);
incubator-ignite git commit: ignite-sql-tests - handle unknown sql type
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sql-tests 0e8a44232 -> 4644fa676
ignite-sql-tests - handle unknown sql type
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4644fa67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4644fa67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4644fa67
Branch: refs/heads/ignite-sql-tests
Commit: 4644fa676d9a2d644f08e4996f855fe5ea1f1f04
Parents: 0e8a442
Author: S.Vladykin
Authored: Sun Mar 15 22:12:40 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 22:12:40 2015 +0300
--
.../processors/query/h2/sql/GridSqlElement.java | 4 ++--
.../processors/query/h2/sql/GridSqlQueryParser.java | 15 +--
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +++-
3 files changed, 14 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4644fa67/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
index e36d6ff..77e6cf0 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
@@ -30,14 +30,14 @@ public abstract class GridSqlElement implements Cloneable,
Iterablehttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4644fa67/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index acb72ac..a8c83d6 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -24,6 +24,7 @@ import org.h2.expression.*;
import org.h2.jdbc.*;
import org.h2.result.*;
import org.h2.table.*;
+import org.h2.value.*;
import org.jetbrains.annotations.*;
import java.lang.reflect.*;
@@ -307,11 +308,13 @@ public class GridSqlQueryParser {
if (res == null) {
res = parseExpression0(expression);
-Column c = new Column(null, expression.getType(),
expression.getPrecision(), expression.getScale(),
-expression.getDisplaySize());
+if (expression.getType() != Value.UNKNOWN) {
+Column c = new Column(null, expression.getType(),
expression.getPrecision(), expression.getScale(),
+expression.getDisplaySize());
-res.expressionResultType(new GridSqlType(c.getType(),
c.getScale(), c.getPrecision(), c.getDisplaySize(),
-c.getCreateSQL()));
+res.expressionResultType(new GridSqlType(c.getType(),
c.getScale(), c.getPrecision(), c.getDisplaySize(),
+c.getCreateSQL()));
+}
h2ObjToGridObj.put(expression, res);
}
@@ -389,13 +392,13 @@ public class GridSqlQueryParser {
assert0(qry instanceof Select, expression);
-return new GridSqlSubquery(parse((Select) qry));
+return new GridSqlSubquery(parse((Select)qry));
}
if (expression instanceof ConditionIn) {
GridSqlOperation res = new GridSqlOperation(IN);
-res.addChild(parseExpression(LEFT_CI.get((ConditionIn)
expression)));
+
res.addChild(parseExpression(LEFT_CI.get((ConditionIn)expression)));
List vals = VALUE_LIST_CI.get((ConditionIn)expression);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4644fa67/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index ea146ca..af9ffaf 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++
b/modules/in
[2/3] incubator-ignite git commit: ignite-sql-tests - remarks
ignite-sql-tests - remarks
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b12f928
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b12f928
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b12f928
Branch: refs/heads/ignite-sql-tests
Commit: 0b12f928fc221d0e2216876a69ca48d830748f0d
Parents: a43be64
Author: S.Vladykin
Authored: Sun Mar 15 23:20:42 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 23:20:42 2015 +0300
--
.../internal/processors/query/h2/sql/GridSqlQuerySplitter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b12f928/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index af9ffaf..019ed59 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -314,10 +314,10 @@ public class GridSqlQuerySplitter {
GridSqlType type = el.expressionResultType();
-if (type != null && type.type() == Value.UUID)
+if (type != null && type.type() == Value.UUID) // There is no
JDBC type UUID, so conversion to bytes occurs.
rdcEl = function(CAST).setCastType("UUID").addChild(rdcEl);
-if (colNames.add(rdcColAlias))
+if (colNames.add(rdcColAlias)) // To handle column name
duplication (usually wildcard for few tables).
rdcEl = alias(rdcColAlias, rdcEl);
rdcSelect[idx] = rdcEl;
[1/3] incubator-ignite git commit: ignite-sql-tests - no ordered messages in sql
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sql-tests 4644fa676 -> 794e715de
ignite-sql-tests - no ordered messages in sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a43be64f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a43be64f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a43be64f
Branch: refs/heads/ignite-sql-tests
Commit: a43be64fbc50e31b0ad96c92247d99507cf6e1b6
Parents: 4644fa6
Author: S.Vladykin
Authored: Sun Mar 15 23:18:02 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 23:18:02 2015 +0300
--
.../tcp/GridOrderedMessageCancelSelfTest.java | 10 --
1 file changed, 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a43be64f/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index da4577e..97b2092 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -94,16 +94,6 @@ public class GridOrderedMessageCancelSelfTest extends
GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
-public void testQuery() throws Exception {
-CacheQueryFuture> fut =
-
((IgniteKernal)grid(0)).cache(null).queries().createSqlQuery(String.class,
"_key is not null").execute();
-
-testMessageSet(fut);
-}
-
-/**
- * @throws Exception If failed.
- */
public void testTask() throws Exception {
ComputeTaskFuture fut =
executeAsync(compute(grid(0).cluster().forRemotes()), Task.class, null);
[3/3] incubator-ignite git commit: ignite-sql-tests - events tests
ignite-sql-tests - events tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/794e715d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/794e715d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/794e715d
Branch: refs/heads/ignite-sql-tests
Commit: 794e715deff423f96f46fea2b44dae69ea56817a
Parents: 0b12f92
Author: S.Vladykin
Authored: Mon Mar 16 00:08:23 2015 +0300
Committer: S.Vladykin
Committed: Mon Mar 16 00:08:23 2015 +0300
--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 32 +---
1 file changed, 14 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/794e715d/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 b19e8f0..d770d54 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
@@ -1066,7 +1066,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
* @throws Exception If failed.
*/
private void testTextQueryEvents(final boolean customSubjId) throws
Exception {
-final Map map = new ConcurrentHashMap8<>();
+final Map map = new ConcurrentHashMap8<>();
final CountDownLatch latch = new CountDownLatch(2);
final CountDownLatch execLatch = new CountDownLatch(cacheMode() ==
REPLICATED ? 1 : gridCount());
@@ -1075,7 +1075,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryReadEvent;
-CacheQueryReadEvent qe =
(CacheQueryReadEvent)evt;
+CacheQueryReadEvent qe =
(CacheQueryReadEvent)evt;
assertEquals(FULL_TEXT, qe.queryType());
assertNull(qe.cacheName());
@@ -1116,14 +1116,17 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
}, EVT_CACHE_QUERY_EXECUTED);
}
-IgniteCache cache = ignite.jcache(null);
+IgniteCache cache = ignite.jcache(null);
-cache.put(1, new Person("Bob White", 1000));
-cache.put(2, new Person("Tom White", 1000));
-cache.put(3, new Person("Mike Green", 1000));
+UUID k1 = UUID.randomUUID();
+UUID k2 = UUID.randomUUID();
+UUID k3 = UUID.randomUUID();
+cache.put(k1, new Person("Bob White", 1000));
+cache.put(k2, new Person("Tom White", 1000));
+cache.put(k3, new Person("Mike Green", 1000));
-QueryCursor> q = cache.query(new
TextQuery(Person.class, "White"));
+QueryCursor> q = cache.query(new
TextQuery(Person.class, "White"));
q.getAll();
@@ -1132,21 +1135,14 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
assertEquals(2, map.size());
-assertEquals("Bob White", map.get(1).name());
-assertEquals("Tom White", map.get(2).name());
+assertEquals("Bob White", map.get(k1).name());
+assertEquals("Tom White", map.get(k2).name());
}
/**
* @throws Exception If failed.
*/
public void testFieldsQueryEvents() throws Exception {
-checkFieldsQueryEvents();
-}
-
-/**
- * @throws Exception If failed.
- */
-private void checkFieldsQueryEvents() throws Exception {
final CountDownLatch execLatch = new CountDownLatch(cacheMode() ==
REPLICATED ? 1 : gridCount());
for (int i = 0; i < gridCount(); i++) {
@@ -1169,10 +1165,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
}, EVT_CACHE_QUERY_EXECUTED);
}
-IgniteCache cache = ignite.jcache(null);
+IgniteCache cache = ignite.jcache(null);
for (int i = 1; i <= 20; i++)
-cache.put(i, new Person("Person " + i, i));
+cache.put(UUID.randomUUID(), new Person("Person " + i, i));
QueryCursor> q = cache
.queryFields(new SqlFieldsQuery("select _key, name from Person
where salary > ?").setArgs(10));
[2/2] incubator-ignite git commit: ignite-sql-tests - replicated client only cache -> run on random node
ignite-sql-tests - replicated client only cache -> run on random node
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59528bd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59528bd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59528bd9
Branch: refs/heads/ignite-sql-tests
Commit: 59528bd9fcea9f8dca9bfd11e533272af06c8ecf
Parents: 95666e9
Author: S.Vladykin
Authored: Mon Mar 16 01:52:23 2015 +0300
Committer: S.Vladykin
Committed: Mon Mar 16 01:52:23 2015 +0300
--
.../internal/processors/cache/IgniteCacheProxy.java | 16 ++--
.../query/h2/twostep/GridReduceQueryExecutor.java | 10 +-
2 files changed, 23 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59528bd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index baea0d6..4138d11 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -413,7 +413,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter> queryFields(SqlFieldsQuery qry) {
A.notNull(qry, "qry");
@@ -441,7 +453,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59528bd9/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 365fb43..f3d6bfc 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
@@ -240,7 +240,15 @@ public class GridReduceQueryExecutor implements
GridMessageListener {
r.conn = h2.connectionForSpace(space);
// TODO Add topology version.
-final Collection nodes =
ctx.grid().cluster().forCacheNodes(space).nodes();
+ClusterGroup dataNodes = ctx.grid().cluster().forDataNodes(space);
+
+if (ctx.cache().internalCache(space).context().isReplicated()) {
+assert dataNodes.node(ctx.localNodeId()) == null : "We must be on
a client node.";
+
+dataNodes = dataNodes.forRandom(); // Select random data node to
run query on a replicated data.
+}
+
+final Collection nodes = dataNodes.nodes();
for (GridCacheSqlQuery mapQry : qry.mapQueries()) {
GridMergeTable tbl;
[1/2] incubator-ignite git commit: ignite-sql-tests - disabled test for node restarts, issue IGNITE-484 created
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sql-tests 794e715de -> 59528bd9f
ignite-sql-tests - disabled test for node restarts, issue IGNITE-484 created
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/95666e99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/95666e99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/95666e99
Branch: refs/heads/ignite-sql-tests
Commit: 95666e99b00687e2bcf18d2a373acae9cd3ad6da
Parents: 794e715
Author: S.Vladykin
Authored: Mon Mar 16 00:20:14 2015 +0300
Committer: S.Vladykin
Committed: Mon Mar 16 00:20:14 2015 +0300
--
.../distributed/near/IgniteCacheQueryNodeRestartSelfTest.java | 5 -
.../apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/95666e99/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
index a804d39..8dd53aa 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
@@ -73,13 +73,16 @@ public class IgniteCacheQueryNodeRestartSelfTest extends
GridCacheAbstractSelfTe
c.setDiscoverySpi(disco);
-CacheConfiguration cc = defaultCacheConfiguration();
+CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setBackups(1);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setAtomicityMode(TRANSACTIONAL);
cc.setDistributionMode(NEAR_PARTITIONED);
+cc.setIndexedTypes(
+Integer.class, Integer.class
+);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/95666e99/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index dcf4914..e29af9f 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -61,7 +61,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class);
-suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class);
+//suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); TODO
IGNITE-484
suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
incubator-ignite git commit: # IGNITE-480 Rework scala examples to dynamic caches.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 89ab9a0a7 -> c7137c3cb
# IGNITE-480 Rework scala examples to dynamic caches.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7137c3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7137c3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7137c3c
Branch: refs/heads/ignite-45
Commit: c7137c3cb3f492486cc7ce20a294a6686379d94e
Parents: 89ab9a0
Author: AKuznetsov
Authored: Mon Mar 16 09:57:32 2015 +0700
Committer: AKuznetsov
Committed: Mon Mar 16 09:57:32 2015 +0700
--
.../examples/ScalarCacheAffinityExample1.scala | 70 +
.../examples/ScalarCacheAffinityExample2.scala | 82 ++--
.../ScalarCacheAffinitySimpleExample.scala | 25 +++---
.../scalar/examples/ScalarCacheExample.scala| 19 +++--
.../ScalarCachePopularNumbersExample.scala | 70 +
.../examples/ScalarCacheQueryExample.scala | 21 +++--
.../examples/ScalarSnowflakeSchemaExample.scala | 70 ++---
.../scala/org/apache/ignite/scalar/scalar.scala | 24 --
8 files changed, 221 insertions(+), 160 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7137c3c/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
index 7f6e3ee..c99a284 100644
---
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
@@ -37,10 +37,10 @@ import org.jetbrains.annotations.Nullable
*/
object ScalarCacheAffinityExample1 {
/** Configuration file name. */
-private val CONFIG = "examples/config/example-cache.xml" // Cache.
+private val CONFIG = "examples/config/example-compute.xml"
-/** Name of cache specified in spring configuration. */
-private val NAME = "partitioned"
+/** Name of cache. */
+private val NAME = ScalarCacheAffinityExample1.getClass.getSimpleName
/**
* Example entry point. No arguments required.
@@ -50,47 +50,49 @@ object ScalarCacheAffinityExample1 {
*/
def main(args: Array[String]) {
scalar(CONFIG) {
-// Clean up caches on all nodes before run.
-cache$(NAME).get.clear()
+val cache = createCache$[String, String](NAME)
-var keys = Seq.empty[String]
+try {
+val keys = ('A' to 'Z').map(_.toString).toSeq
-('A' to 'Z').foreach(keys :+= _.toString)
+populateCache(ignite$, keys)
-populateCache(ignite$, keys)
+var results = Map.empty[String, String]
-var results = Map.empty[String, String]
+keys.foreach(key => {
+val res = ignite$.call$(
+new IgniteCallable[String] {
+@CacheAffinityKeyMapped
+def affinityKey(): String = key
-keys.foreach(key => {
-val res = ignite$.call$(
-new IgniteCallable[String] {
-@CacheAffinityKeyMapped
-def affinityKey(): String = key
+def cacheName(): String = NAME
-def cacheName(): String = NAME
+@Nullable def call: String = {
+println(">>> Executing affinity job for key: "
+ key)
-@Nullable def call: String = {
-println(">>> Executing affinity job for key: " +
key)
+val cache = cache$[String, String](NAME)
-val cache = cache$[String, String](NAME)
+if (!cache.isDefined) {
+println(">>> Cache not found [nodeId=" +
ignite$.cluster().localNode.id +
+", cacheName=" + NAME + ']')
-if (!cache.isDefined) {
-println(">>> Cache not found [nodeId=" +
ignite$.cluster().localNode.id +
-", cacheName=" + NAME + ']')
-
-"Error"
+"Error"
+}
+else
+cache.ge
incubator-ignite git commit: # Minor: Fixed combo-box drop-down list font size in Ignite schema import app.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 52ee23539 -> a530f1d2f
# Minor: Fixed combo-box drop-down list font size in Ignite schema import app.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a530f1d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a530f1d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a530f1d2
Branch: refs/heads/sprint-2
Commit: a530f1d2f32eb8acc7a2717746e48c7402e92341
Parents: 52ee235
Author: AKuznetsov
Authored: Mon Mar 16 10:27:31 2015 +0700
Committer: AKuznetsov
Committed: Mon Mar 16 10:27:31 2015 +0700
--
modules/schema-import/src/main/java/media/style.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a530f1d2/modules/schema-import/src/main/java/media/style.css
--
diff --git a/modules/schema-import/src/main/java/media/style.css
b/modules/schema-import/src/main/java/media/style.css
index e4ccb08..6eee5f9 100644
--- a/modules/schema-import/src/main/java/media/style.css
+++ b/modules/schema-import/src/main/java/media/style.css
@@ -39,7 +39,7 @@
}
.combo-box-popup .list-view {
--fx-font-size : 14pt;
+-fx-font-size : 14;
}
.text-area {
incubator-ignite git commit: # Minor: Fixed typo in cache command description.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 a530f1d2f -> 42ee9aeb9
# Minor: Fixed typo in cache command description.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/42ee9aeb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42ee9aeb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42ee9aeb
Branch: refs/heads/sprint-2
Commit: 42ee9aeb9e0896f8f80fca5758e3e91ad211d13d
Parents: a530f1d
Author: AKuznetsov
Authored: Mon Mar 16 10:30:31 2015 +0700
Committer: AKuznetsov
Committed: Mon Mar 16 10:30:31 2015 +0700
--
.../ignite/visor/commands/cache/VisorCacheCommand.scala | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42ee9aeb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 1023708..afbbce2 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -65,7 +65,7 @@ import scala.util.control.Breaks._
* {{{
* cache
* cache -i
- * cache {-c=} {-id=|id8=}
{-s=hi|mi|re|wr|cn} {-a} {-r}
+ * cache {-c=} {-id=|id8=}
{-s=hi|mi|rd|wr|cn} {-a} {-r}
* cache -clear {-c=}
* cache -scan -c= {-id=|id8=} {-p=}
* cache -swap {-c=} {-id=|id8=}
@@ -83,7 +83,7 @@ import scala.util.control.Breaks._
* If neither is specified statistics will be gathered from all nodes.
* -c=
* Name of the cache.
- * -s=hi|mi|re|wr|cn
+ * -s=hi|mi|rd|wr|cn
* Defines sorting type. Sorted by:
*hi Hits.
*mi Misses.
@@ -630,7 +630,7 @@ object VisorCacheCommand {
spec = Seq(
"cache",
"cache -i",
-"cache {-c=} {-id=|id8=}
{-s=hi|mi|re|wr} {-a} {-r}",
+"cache {-c=} {-id=|id8=}
{-s=hi|mi|rd|wr} {-a} {-r}",
"cache -clear {-c=} {-id=|id8=}",
"cache -scan -c= {-id=|id8=}
{-p=}",
"cache -swap {-c=} {-id=|id8=}"
@@ -660,7 +660,7 @@ object VisorCacheCommand {
"-swap" -> Seq(
"Swaps backup entries in cache."
),
-"-s=hi|mi|re|wr|cn" -> Seq(
+"-s=hi|mi|rd|wr|cn" -> Seq(
"Defines sorting type. Sorted by:",
" hi Hits.",
" mi Misses.",
[20/50] [abbrv] incubator-ignite git commit: Bug fix: tests does not run in IDEA.
Bug fix: tests does not run in IDEA.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0448526c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0448526c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0448526c
Branch: refs/heads/ignite-368
Commit: 0448526c272d80bd5f4c94c4bed02dde58fde1cc
Parents: b2f1e43
Author: sevdokimov
Authored: Fri Mar 13 13:46:35 2015 +0300
Committer: sevdokimov
Committed: Fri Mar 13 13:46:35 2015 +0300
--
.../src/main/java/org/apache/ignite/internal/util/IgniteUtils.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0448526c/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 05d1a21..0719964 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3053,7 +3053,6 @@ public abstract class IgniteUtils {
for (File cur = startDir.getAbsoluteFile(); cur != null; cur =
cur.getParentFile()) {
// Check 'cur' is project home directory.
if (!new File(cur, "bin").isDirectory() ||
-!new File(cur, "docs").isDirectory() ||
!new File(cur, "config").isDirectory())
continue;
[01/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333
Repository: incubator-ignite Updated Branches: refs/heads/ignite-368 ab6119ec6 -> b330068fe Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18d48c1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18d48c1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18d48c1e Branch: refs/heads/ignite-368 Commit: 18d48c1e32aef3826d95699e7c36749b16a7479c Parents: a094c88 6abda67 Author: ivasilinets Authored: Thu Mar 12 15:30:29 2015 +0300 Committer: ivasilinets Committed: Thu Mar 12 15:30:29 2015 +0300 -- assembly/release-hadoop.xml | 16 +-- docs/core-site.ignite.xml | 90 - docs/hadoop_readme.md | 134 -- docs/hadoop_readme.pdf | Bin 82297 -> 0 bytes docs/hive-site.ignite.xml | 37 - docs/mapred-site.ignite.xml | 66 - modules/hadoop/config/core-site.ignite.xml | 90 + modules/hadoop/config/hive-site.ignite.xml | 37 + modules/hadoop/config/mapred-site.ignite.xml| 66 + modules/hadoop/docs/hadoop_readme.md| 135 +++ modules/hadoop/docs/hadoop_readme.pdf | Bin 0 -> 82297 bytes .../internal/processors/hadoop/HadoopSetup.java | 33 - .../hadoop/HadoopCommandLineTest.java | 16 ++- 13 files changed, 377 insertions(+), 343 deletions(-) --
[26/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62be9d1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62be9d1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62be9d1e Branch: refs/heads/ignite-368 Commit: 62be9d1eb3259b7b2931e5603a31ddedd3581cfc Parents: 42b3294 ea6c9a4 Author: ivasilinets Authored: Fri Mar 13 15:41:27 2015 +0300 Committer: ivasilinets Committed: Fri Mar 13 15:41:27 2015 +0300 -- bin/ignite-schema-import.bat| 25 +--- bin/ignite-schema-import.sh | 4 +- .../store/CacheStoreLoadDataExample.java| 18 ++ .../ignite/internal/util/IgniteUtils.java | 1 - modules/schema-import/pom.xml | 6 -- .../schema-import/src/main/java/media/style.css | 17 ++ .../ignite/schema/generator/XmlGenerator.java | 28 + .../apache/ignite/schema/model/IndexItem.java | 54 + .../ignite/schema/model/PojoDescriptor.java | 9 ++- .../org/apache/ignite/schema/ui/MessageBox.java | 16 - .../ignite/schema/ui/SchemaImportApp.java | 61 .../schema/test/AbstractSchemaImportTest.java | 19 +- 12 files changed, 166 insertions(+), 92 deletions(-) --
[11/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b2cd978 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b2cd978 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b2cd978 Branch: refs/heads/ignite-368 Commit: 0b2cd978fc9edebd36cf701746ce556bb5baee4a Parents: fcdc4ce d775504 Author: ivasilinets Authored: Fri Mar 13 11:59:27 2015 +0300 Committer: ivasilinets Committed: Fri Mar 13 11:59:27 2015 +0300 -- DEVNOTES.txt| 11 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 3 +- .../processors/igfs/IgfsAbstractSelfTest.java | 229 --- .../igfs/IgfsDualAbstractSelfTest.java | 71 +++--- .../igfs/IgfsExUniversalFileSystemAdapter.java | 87 +++ .../igfs/UniversalFileSystemAdapter.java| 79 +++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 8 + .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 9 +- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 14 +- .../processors/hadoop/igfs/HadoopIgfsUtils.java | 7 +- .../ignite/igfs/Hadoop1DualAbstractTest.java| 105 + .../igfs/Hadoop1OverIgfsDualAsyncTest.java | 30 +++ .../igfs/Hadoop1OverIgfsDualSyncTest.java | 30 +++ ...oopFileSystemUniversalFileSystemAdapter.java | 113 + ...oopSecondaryFileSystemConfigurationTest.java | 12 +- .../testsuites/IgniteHadoopTestSuite.java | 4 +- 16 files changed, 725 insertions(+), 87 deletions(-) --
[12/50] [abbrv] incubator-ignite git commit: #ignite-333: IgniteCache.localClear(K key) return void.
#ignite-333: IgniteCache.localClear(K key) return void.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f26c2ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f26c2ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f26c2ca
Branch: refs/heads/ignite-368
Commit: 4f26c2ca886d088bf0b51a52e37422856bbf69f7
Parents: 0b2cd97
Author: ivasilinets
Authored: Fri Mar 13 12:04:34 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 12:04:34 2015 +0300
--
modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 5 +
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 ++
2 files changed, 3 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f26c2ca/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 0c680fe..0944893 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -416,11 +416,8 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
* Transactional semantics must be guaranteed outside of Ignite.
*
* @param key Key to clear.
- * @return {@code True} if entry was successfully cleared from cache,
{@code false}
- * if entry was in use at the time of this method invocation and could not
be
- * cleared.
*/
-public boolean localClear(K key);
+public void localClear(K key);
/**
* Clears entries from this cache and swap storage only if the entry
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f26c2ca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 14481cb..f936ced 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -1097,16 +1097,14 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.clearLocally(key);
+delegate.clearLocally(key);
}
finally {
gate.leave(prev);
-
-return false;
}
}
[22/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea6c9a4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea6c9a4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea6c9a4f Branch: refs/heads/ignite-368 Commit: ea6c9a4f4ab16223dc33ddaf669afef264a6a139 Parents: 2a9ce52 0448526 Author: AKuznetsov Authored: Fri Mar 13 17:53:11 2015 +0700 Committer: AKuznetsov Committed: Fri Mar 13 17:53:11 2015 +0700 -- .../src/main/java/org/apache/ignite/internal/util/IgniteUtils.java | 1 - 1 file changed, 1 deletion(-) --
[25/50] [abbrv] incubator-ignite git commit: #ignite-333: Remove from swap on clearLocally.
#ignite-333: Remove from swap on clearLocally.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/42b32947
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42b32947
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42b32947
Branch: refs/heads/ignite-368
Commit: 42b32947cf0b7b859d16c5a0eabb4c7315780e3a
Parents: b12945a
Author: ivasilinets
Authored: Fri Mar 13 15:26:12 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 15:26:12 2015 +0300
--
.../internal/processors/cache/GridCacheAdapter.java| 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42b32947/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index a998c2c..2f68e58 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1398,9 +1398,6 @@ public abstract class GridCacheAdapter implements
GridCache,
try {
if (e != null)
e.clear(obsoleteVer, readers, null);
-
-if (ctx.isSwapOrOffheapEnabled())
-
entryEx(ctx.toCacheKeyObject(key)).clear(ctx.versions().next(), false,
CU.empty0());
}
catch (IgniteCheckedException ex) {
U.error(log, "Failed to clearLocally entry (will continue to
clearLocally other entries): " + e,
@@ -1424,10 +1421,14 @@ public abstract class GridCacheAdapter implements
GridCache,
GridCacheEntryEx e = peekEx(cacheKey);
-if (ctx.isSwapOrOffheapEnabled())
-
entryEx(ctx.toCacheKeyObject(key)).clear(ctx.versions().next(), false,
CU.empty0());
+boolean removed = true;
+
+if (!ctx.isNear() && ctx.isSwapOrOffheapEnabled() &&
ctx.swap().containsKey(ctx.toCacheKeyObject(key)))
+removed =
entryEx(ctx.toCacheKeyObject(key)).clear(obsoleteVer, false, CU.empty0());
+
+removed &= e != null && e.clear(obsoleteVer, false, filter);
-return e != null && e.clear(obsoleteVer, false, filter);
+return removed;
}
catch (IgniteCheckedException ex) {
U.error(log, "Failed to clearLocally entry for key: " + key, ex);
[37/50] [abbrv] incubator-ignite git commit: # Removed shmem from communication
# Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dca3ca7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dca3ca7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dca3ca7d
Branch: refs/heads/ignite-368
Commit: dca3ca7dedb73f18c2e107d27358cece1d2092de
Parents: d0ac78f
Author: Valentin Kulichenko
Authored: Fri Mar 13 17:46:44 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 17:46:44 2015 -0700
--
examples/pom.xml | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dca3ca7d/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 717a7c7..8fea360 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -32,6 +32,13 @@
ignite-examples
+
+
+Maven Central Staging
+
https://oss.sonatype.org/content/repositories/orggridgain-1246
+
+
+
javax.cache
@@ -167,6 +174,13 @@
${ignite.version}
test
+
+
+org.gridgain
+ignite-shmem
+RELEASE
+test
+
[06/50] [abbrv] incubator-ignite git commit: #ignite-333: Fix tests.
#ignite-333: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e13d9d5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e13d9d5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e13d9d5e
Branch: refs/heads/ignite-368
Commit: e13d9d5e89fbed7a8b2c6ed787f1c066943e9b39
Parents: bdf7634
Author: ivasilinets
Authored: Thu Mar 12 20:18:03 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 12 20:18:03 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e13d9d5e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b15d7ae..7f3e223 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4250,8 +4250,13 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
protected void testGlobalClearKey(boolean async, Collection
keysToRemove) throws Exception {
// Save entries only on their primary nodes. If we didn't do so,
clearLocally() will not remove all entries
// because some of them were blocked due to having readers.
-for (int i = 0; i < 500; ++i)
-grid(0).jcache(null).put("key" + i, "value" + i);
+for (int i = 0; i < 500; ++i) {
+String key = "key" + i;
+
+Ignite g = primaryIgnite(key);
+
+g.jcache(null).put(key, "value" + i);
+}
if (async) {
IgniteCache asyncCache = jcache().withAsync();
@@ -4276,12 +4281,9 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
boolean found = false;
for (int j = 0; j < gridCount(); j++)
-if (jcache(j).localPeek(key) != null) {
+if (jcache(j).localPeek(key) != null)
found = true;
-info("Found key " + key + " on node " + j);
-}
-
if (!keysToRemove.contains(key))
assertTrue("Not found key " + key, found);
else
[36/50] [abbrv] incubator-ignite git commit: # Removed shmem from communication
# Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0ac78f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0ac78f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0ac78f3
Branch: refs/heads/ignite-368
Commit: d0ac78f3ed00ed367166fb254928e2cbbecd413f
Parents: c014b00
Author: Valentin Kulichenko
Authored: Fri Mar 13 17:39:17 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 17:39:17 2015 -0700
--
.../igfs/IgfsIpcEndpointConfiguration.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 26
2 files changed, 27 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0ac78f3/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
index 0b0e9cc..7315007 100644
---
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
@@ -27,7 +27,7 @@ import static org.apache.ignite.igfs.IgfsIpcEndpointType.*;
*/
public class IgfsIpcEndpointConfiguration {
/** Default endpoint type is TCP. */
-public static IgfsIpcEndpointType DFLT_TYPE = TCP;
+public static IgfsIpcEndpointType DFLT_TYPE = U.hasSharedMemory() ? SHMEM
: TCP;
/** Default host. */
public static String DFLT_HOST = "127.0.0.1";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0ac78f3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 0719964..7804c9d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.processors.streamer.*;
import org.apache.ignite.internal.transactions.*;
import org.apache.ignite.internal.util.io.*;
+import org.apache.ignite.internal.util.ipc.shmem.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -305,6 +306,9 @@ public abstract class IgniteUtils {
private static final ConcurrentMap> classCache =
new ConcurrentHashMap8<>();
+/** */
+private static volatile Boolean hasShmem;
+
/**
* Initializes enterprise check.
*/
@@ -9036,4 +9040,26 @@ public abstract class IgniteUtils {
if (!cond)
throw new IgniteException("Parameter failed condition check: " +
condDesc);
}
+
+/**
+ * @return Whether shared memory libraries exist.
+ */
+public static boolean hasSharedMemory() {
+if (hasShmem == null) {
+if (isWindows())
+hasShmem = false;
+else {
+try {
+IpcSharedMemoryNativeLoader.load();
+
+hasShmem = true;
+}
+catch (IgniteCheckedException e) {
+hasShmem = false;
+}
+}
+}
+
+return hasShmem;
+}
}
[03/50] [abbrv] incubator-ignite git commit: #ignite-333: Add methods to cache proxy
#ignite-333: Add methods to cache proxy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13f15f6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13f15f6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13f15f6d
Branch: refs/heads/ignite-368
Commit: 13f15f6dc33499c1fc9619fd952bc396073f2282
Parents: 92b2327
Author: ivasilinets
Authored: Thu Mar 12 16:06:22 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 12 16:06:22 2015 +0300
--
.../processors/cache/GridCacheProxyImpl.java| 60
1 file changed, 60 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13f15f6d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 4a1f83c..6d1b58d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -1264,6 +1264,30 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
}
/** {@inheritDoc} */
+@Override public IgniteInternalFuture clearAsync(K key) {
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+return delegate.clearAsync(key);
+}
+finally {
+gate.leave(prev);
+}
+}
+
+/** {@inheritDoc} */
+@Override public IgniteInternalFuture clearAsync(Set keys) {
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+return delegate.clearAsync(keys);
+}
+finally {
+gate.leave(prev);
+}
+}
+
+/** {@inheritDoc} */
@Override public void clear(long timeout) throws IgniteCheckedException {
GridCacheProjectionImpl prev = gate.enter(prj);
@@ -1288,6 +1312,42 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
}
/** {@inheritDoc} */
+@Override public void clearLocally(Set keys) {
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+delegate.clearLocally(keys);
+}
+finally {
+gate.leave(prev);
+}
+}
+
+/** {@inheritDoc} */
+@Override public void clear(K key) throws IgniteCheckedException {
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+delegate.clear(key);
+}
+finally {
+gate.leave(prev);
+}
+}
+
+/** {@inheritDoc} */
+@Override public void clear(Set keys) throws IgniteCheckedException {
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+delegate.clear(keys);
+}
+finally {
+gate.leave(prev);
+}
+}
+
+/** {@inheritDoc} */
@Nullable @Override public V remove(K key, @Nullable CacheEntryPredicate[]
filter)
throws IgniteCheckedException {
GridCacheProjectionImpl prev = gate.enter(prj);
[43/50] [abbrv] incubator-ignite git commit: # sprint-2 - fixed devnotes file.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f54fc36c/wiki/documentation/data-grid/cache-modes.md
--
diff --git a/wiki/documentation/data-grid/cache-modes.md
b/wiki/documentation/data-grid/cache-modes.md
deleted file mode 100644
index 4bcb3c8..000
--- a/wiki/documentation/data-grid/cache-modes.md
+++ /dev/null
@@ -1,254 +0,0 @@
-
-
-Ignite provides three different modes of cache operation: `LOCAL`,
`REPLICATED`, and `PARTITIONED`. A cache mode is configured for each cache.
Cache modes are defined in `CacheMode` enumeration.
-[block:api-header]
-{
- "type": "basic",
- "title": "Local Mode"
-}
-[/block]
-`LOCAL` mode is the most light weight mode of cache operation, as no data is
distributed to other cache nodes. It is ideal for scenarios where data is
either read-only, or can be periodically refreshed at some expiration
frequency. It also works very well with read-through behavior where data is
loaded from persistent storage on misses. Other than distribution, local caches
still have all the features of a distributed cache, such as automatic data
eviction, expiration, disk swapping, data querying, and transactions.
-[block:api-header]
-{
- "type": "basic",
- "title": "Replicated Mode"
-}
-[/block]
-In `REPLICATED` mode all data is replicated to every node in the cluster. This
cache mode provides the utmost availability of data as it is available on every
node. However, in this mode every data update must be propagated to all other
nodes which can have an impact on performance and scalability.
-
-As the same data is stored on all cluster nodes, the size of a replicated
cache is limited by the amount of memory available on the node with the
smallest amount of RAM. This mode is ideal for scenarios where cache reads are
a lot more frequent than cache writes, and data sets are small. If your system
does cache lookups over 80% of the time, then you should consider using
`REPLICATED` cache mode.
-[block:callout]
-{
- "type": "success",
- "body": "Replicated caches should be used when data sets are small and
updates are infrequent."
-}
-[/block]
-
-[block:api-header]
-{
- "type": "basic",
- "title": "Partitioned Mode"
-}
-[/block]
-`PARTITIONED` mode is the most scalable distributed cache mode. In this mode
the overall data set is divided equally into partitions and all partitions are
split equally between participating nodes, essentially creating one huge
distributed in-memory store for caching data. This approach allows you to store
as much data as can be fit in the total memory available across all nodes,
hence allowing for multi-terabytes of data in cache memory across all cluster
nodes. Essentially, the more nodes you have, the more data you can cache.
-
-Unlike `REPLICATED` mode, where updates are expensive because every node in
the cluster needs to be updated, with `PARTITIONED` mode, updates become cheap
because only one primary node (and optionally 1 or more backup nodes) need to
be updated for every key. However, reads become somewhat more expensive because
only certain nodes have the data cached.
-
-In order to avoid extra data movement, it is important to always access the
data exactly on the node that has that data cached. This approach is called
*affinity colocation* and is strongly recommended when working with partitioned
caches.
-[block:callout]
-{
- "type": "success",
- "body": "Partitioned caches are idea when working with large data sets and
updates are frequent.",
- "title": ""
-}
-[/block]
-The picture below illustrates a simple view of a partitioned cache.
Essentially we have key K1 assigned to Node1, K2 assigned to Node2, and K3
assigned to Node3.
-[block:image]
-{
- "images": [
-{
- "image": [
-"https://www.filepicker.io/api/file/7pGSgxCVR3OZSHqYLdJv";,
-"in_memory_data_grid.png",
-"500",
-"338",
-"#d64304",
-""
- ]
-}
- ]
-}
-[/block]
-See [configuration](#configuration) section below for an example on how to
configure cache mode.
-[block:api-header]
-{
- "type": "basic",
- "title": "Cache Distribution Mode"
-}
-[/block]
-Node can operate in four different cache distribution modes when `PARTITIONED`
mode is used. Cache distribution mode is defined by `CacheDistributionMode`
enumeration and can be configured via `distributionMode` property of
`CacheConfiguration`.
-[block:parameters]
-{
- "data": {
-"h-0": "Distribution Mode",
-"h-1": "Description",
-"0-0": "`PARTITIONED_ONLY`",
-"0-1": "Local node may store primary and/or backup keys, but does not
cache recently accessed keys, which are neither primaries or backups, in near
cache.",
-"1-0": "`CLIENT_ONLY`",
-"1-1": "Local node does not cache any data and communicates with other
cache nodes via remote calls.",
-"2-0": "`NEAR_ONLY`",
-"2-1": "Local node will not be primary or backup node for any key
[02/50] [abbrv] incubator-ignite git commit: #ignite-333: Remove flags from Javadocs.
#ignite-333: Remove flags from Javadocs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92b23275
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92b23275
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92b23275
Branch: refs/heads/ignite-368
Commit: 92b23275d9026afc5a4300b433bedfc04f6d3bfa
Parents: 18d48c1
Author: ivasilinets
Authored: Thu Mar 12 15:40:00 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 12 15:40:00 2015 +0300
--
modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92b23275/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 4476670..0c680fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -414,8 +414,6 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
* remote caches or from underlying persistent storage.
* This method is not transactionally consistent.
* Transactional semantics must be guaranteed outside of Ignite.
- * Cache Flags
- * This method is not available if flag {@link CacheFlag#READ} are set on
projection.
*
* @param key Key to clear.
* @return {@code True} if entry was successfully cleared from cache,
{@code false}
@@ -437,8 +435,6 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
* remote caches or from underlying persistent storage.
* This method is not transactionally consistent.
* Transactional semantics must be guaranteed outside of Ignite.
- * Cache Flags
- * This method is not available if flag {@link CacheFlag#READ} are set on
projection.
*
* @param keys Set of keys to clear.
*/
@@ -457,8 +453,6 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
* remote caches or from underlying persistent storage.
* This method is not transactionally consistent.
* Transactional semantics must be guaranteed outside of Ignite.
- * Cache Flags
- * This method is not available if flag {@link CacheFlag#READ} are set on
projection.
*/
public void localClear();
[17/50] [abbrv] incubator-ignite git commit: #ignite-333: Add check for that localClear does not clear remote nodes.
#ignite-333: Add check for that localClear does not clear remote nodes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2442881a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2442881a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2442881a
Branch: refs/heads/ignite-368
Commit: 2442881a2d540f476261b1d3869cbaed7c534508
Parents: ada5881
Author: ivasilinets
Authored: Fri Mar 13 13:00:00 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 13:00:00 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2442881a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index d411fab..ece20a5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4111,8 +4111,16 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
boolean found = primaryIgnite(key).jcache(null).localPeek(key) !=
null;
-if (keyToRemove.equals(key))
+if (keyToRemove.equals(key)) {
+Collection nodes
=grid(0).affinity(null).mapKeyToPrimaryAndBackups(key);
+
+for (int j = 0; j < gridCount(); ++j) {
+if (nodes.contains(grid(j).localNode()) && grid(j) !=
primaryIgnite(key))
+assertTrue("Not found on backup removed key ",
grid(j).jcache(null).localPeek(key) != null);
+}
+
assertFalse("Found removed key " + key, found);
+}
else
assertTrue("Not found key " + key, found);
}
[14/50] [abbrv] incubator-ignite git commit: #ignite-333: Remove class GlobalClearKeyCallable.
#ignite-333: Remove class GlobalClearKeyCallable.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b39bfbe2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b39bfbe2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b39bfbe2
Branch: refs/heads/ignite-368
Commit: b39bfbe2cdd0df156b05b0d05b58748c342a9f13
Parents: 7e3ad24
Author: ivasilinets
Authored: Fri Mar 13 12:12:25 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 12:12:25 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 66
1 file changed, 12 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b39bfbe2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index fc00f6a..58645c3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1440,7 +1440,11 @@ public abstract class GridCacheAdapter implements
GridCache,
// Clear local cache synchronously.
clearLocally(key);
-clearRemotes(0, new GlobalClearKeyCallable(name(), key));
+Set keys = U.newHashSet(1);
+
+keys.add(key);
+
+clearRemotes(0, new GlobalClearKeySetCallable(name(), new
HashSet(keys)));
}
/** {@inheritDoc} */
@@ -1448,17 +1452,21 @@ public abstract class GridCacheAdapter implements
GridCache,
// Clear local cache synchronously.
clearLocallyAll(keys);
-clearRemotes(0, new GlobalClearKeySetCallable(name(), keys));
+clearRemotes(0, new GlobalClearKeySetCallable(name(), keys));
}
/** {@inheritDoc} */
@Override public IgniteInternalFuture clearAsync(K key) {
-return clearAsync(new GlobalClearKeyCallable(name(), key));
+Set keys = U.newHashSet(1);
+
+keys.add(key);
+
+return clearAsync(new GlobalClearKeySetCallable(name(), keys));
}
/** {@inheritDoc} */
@Override public IgniteInternalFuture clearAsync(Set keys) {
-return clearAsync(new GlobalClearKeySetCallable(name(), keys));
+return clearAsync(new GlobalClearKeySetCallable(name(), keys));
}
/** {@inheritDoc} */
@@ -5571,56 +5579,6 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/**
- * Global clear key.
- */
-@GridInternal
-private static class GlobalClearKeyCallable extends GlobalClearCallable
{
-/** */
-private static final long serialVersionUID = 0L;
-
-/** Key to remove. */
-private K key;
-
-/**
- * Empty constructor for serialization.
- */
-public GlobalClearKeyCallable() {
-// No-op.
-}
-
-/**
- * @param cacheName Cache name.
- * @param key Key to clear.
- */
-private GlobalClearKeyCallable(String cacheName, K key) {
-super(cacheName);
-
-this.key = key;
-}
-
-/** {@inheritDoc} */
-@Override public Object call() throws Exception {
-((IgniteEx)ignite).cachex(cacheName).clearLocally(key);
-
-return null;
-}
-
-/** {@inheritDoc} */
-@Override public void writeExternal(ObjectOutput out) throws
IOException {
-super.writeExternal(out);
-
-out.writeObject(key);
-}
-
-/** {@inheritDoc} */
-@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
-super.readExternal(in);
-
-key = (K)in.readObject();
-}
-}
-
-/**
* Global clear keys.
*/
@GridInternal
[30/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-cleanup-bin
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-cleanup-bin Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e4afa035 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4afa035 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4afa035 Branch: refs/heads/ignite-368 Commit: e4afa03514d6328af9eaf15da65b449fea967e08 Parents: 7e80610 cf6677b Author: AKuznetsov Authored: Fri Mar 13 22:50:51 2015 +0700 Committer: AKuznetsov Committed: Fri Mar 13 22:50:51 2015 +0700 -- .../java/org/apache/ignite/IgniteCache.java | 55 +- .../processors/cache/CacheProjection.java | 60 ++ .../processors/cache/GridCacheAdapter.java | 173 +--- .../cache/GridCacheProjectionImpl.java | 25 +++ .../processors/cache/GridCacheProxyImpl.java| 60 ++ .../processors/cache/IgniteCacheProxy.java | 61 ++ .../cache/GridCacheAbstractFullApiSelfTest.java | 195 +++ 7 files changed, 602 insertions(+), 27 deletions(-) --
[33/50] [abbrv] incubator-ignite git commit: # Licenses
# Licenses Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fba31554 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fba31554 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fba31554 Branch: refs/heads/ignite-368 Commit: fba31554d823b4f5195c9da31e320ea9d80da299 Parents: 96742b5 Author: Valentin Kulichenko Authored: Fri Mar 13 16:13:50 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 13 16:13:50 2015 -0700 -- .../igfs/IgfsExUniversalFileSystemAdapter.java | 17 + .../igfs/UniversalFileSystemAdapter.java | 17 + 2 files changed, 34 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fba31554/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsExUniversalFileSystemAdapter.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsExUniversalFileSystemAdapter.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsExUniversalFileSystemAdapter.java index 8b40b0b..b6d8f94 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsExUniversalFileSystemAdapter.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsExUniversalFileSystemAdapter.java @@ -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. + */ + package org.apache.ignite.internal.processors.igfs; import org.apache.ignite.igfs.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fba31554/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/UniversalFileSystemAdapter.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/UniversalFileSystemAdapter.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/UniversalFileSystemAdapter.java index 17a4ea9..59d76dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/UniversalFileSystemAdapter.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/UniversalFileSystemAdapter.java @@ -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. + */ + package org.apache.ignite.internal.processors.igfs; import java.io.*;
[04/50] [abbrv] incubator-ignite git commit: #ignite-333: add tests.
#ignite-333: add tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6da0acf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6da0acf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6da0acf0
Branch: refs/heads/ignite-368
Commit: 6da0acf010234660a9ab16896548688cd2566fbf
Parents: 13f15f6
Author: ivasilinets
Authored: Thu Mar 12 17:18:44 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 12 17:18:44 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 163 +++
1 file changed, 163 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6da0acf0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index f25229d..0479d9b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4093,4 +4093,167 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
ccfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK)
U.sleep(100);
}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLocalClearKey() throws Exception {
+testLocalClearKey(false, Arrays.asList("key25"));
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLocalClearKeyAsync() throws Exception {
+testLocalClearKey(true, Arrays.asList("key25"));
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLocalClearKeys() throws Exception {
+testLocalClearKey(false, Arrays.asList("key25", "key100", "key150"));
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLocalClearKeysAsync() throws Exception {
+testLocalClearKey(true, Arrays.asList("key25", "key100", "key150"));
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLocalClear() throws Exception {
+testLocalClearKey(false, null);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLocalClearAsync() throws Exception {
+testLocalClearKey(true, null);
+}
+
+/**
+ * @param async If {@code true} uses async method.
+ * @throws Exception If failed.
+ */
+protected void testLocalClearKey(boolean async, Collection
keysToRemove) throws Exception {
+// Save entries only on their primary nodes. If we didn't do so,
clearLocally() will not remove all entries
+// because some of them were blocked due to having readers.
+for (int i = 0; i < 500; ++i) {
+Ignite g = primaryIgnite("key" + i);
+
+g.jcache(null).put("key" + i, "value" + i);
+}
+
+if (async) {
+IgniteCache asyncCache = jcache().withAsync();
+
+if (keysToRemove == null)
+asyncCache.localClear();
+else if (keysToRemove.size() == 1)
+asyncCache.localClear(F.first(keysToRemove));
+else
+asyncCache.localClearAll(new HashSet(keysToRemove));
+
+asyncCache.future().get();
+}
+else {
+if (keysToRemove == null)
+jcache().localClear();
+else if (keysToRemove.size() == 1)
+jcache().localClear(F.first(keysToRemove));
+else
+jcache().localClearAll(new HashSet(keysToRemove));
+}
+
+for (int i = 0; i < 500; ++i) {
+String key = "key" + i;
+
+boolean found = false;
+
+for (int j = 0; j < gridCount(); j++)
+if (jcache(j).localPeek(key) != null)
+found = true;
+
+if (keysToRemove == null || keysToRemove.contains(key))
+assertFalse("Found removed key " + key, found);
+else
+assertTrue("Not found key " + key, found);
+}
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testGlobalClearKey() throws Exception {
+testGlobalClearKey(false, Arrays.asList("key25"));
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testGlobalClearKeyAsync() throws Exception {
+testGlobalClearKey(true, Arrays.asList("key25"));
+}
[05/50] [abbrv] incubator-ignite git commit: #ignite-333: Fix tests.
#ignite-333: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bdf76343
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdf76343
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdf76343
Branch: refs/heads/ignite-368
Commit: bdf76343b85518ee58650edfbedd356ae09a057d
Parents: 6da0acf
Author: ivasilinets
Authored: Thu Mar 12 18:23:44 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 12 18:23:44 2015 +0300
--
.../processors/cache/CacheProjection.java | 4 +-
.../processors/cache/GridCacheAdapter.java | 14 +-
.../cache/GridCacheProjectionImpl.java | 8 +-
.../processors/cache/GridCacheProxyImpl.java| 8 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 146 +++
6 files changed, 107 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdf76343/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index d027aec..5ca17a0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -1274,7 +1274,7 @@ public interface CacheProjection extends
Iterable> {
* if entry was in use at the time of this method invocation and
could not be
* cleared.
*/
-public void clearLocally(Set keys);
+public void clearLocallyAll(Set keys);
/**
* Clears key on all nodes that store it's data. That is, caches are
cleared on remote
@@ -1304,7 +1304,7 @@ public interface CacheProjection extends
Iterable> {
* @param keys Keys to clear.
* @throws IgniteCheckedException In case of cache could not be cleared on
any of the nodes.
*/
-public void clear(Set keys) throws IgniteCheckedException;
+public void clearAll(Set keys) throws IgniteCheckedException;
/**
* Clears cache on all nodes that store it's data. That is, caches are
cleared on remote
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdf76343/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c6732ae..a0111ac 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1339,7 +1339,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void clearLocally(Set keys) {
+@Override public void clearLocallyAll(Set keys) {
clearLocally0(keys);
}
@@ -1444,11 +1444,11 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void clear(Set keys) throws IgniteCheckedException {
+@Override public void clearAll(Set keys) throws IgniteCheckedException {
// Clear local cache synchronously.
-clearLocally(keys);
+clearLocallyAll(keys);
-clearRemotes(0, new GlobalClearKeySetCallable(name(), keys));
+clearRemotes(0, new GlobalClearKeySetCallable(name(), keys));
}
/** {@inheritDoc} */
@@ -1458,7 +1458,7 @@ public abstract class GridCacheAdapter implements
GridCache,
/** {@inheritDoc} */
@Override public IgniteInternalFuture clearAsync(Set keys) {
-return clearAsync(new GlobalClearKeySetCallable(name(), keys));
+return clearAsync(new GlobalClearKeySetCallable(name(), keys));
}
/** {@inheritDoc} */
@@ -5624,7 +5624,7 @@ public abstract class GridCacheAdapter implements
GridCache,
* Global clear keys.
*/
@GridInternal
-private static class GlobalClearKeySetCallable extends
GlobalClearCallable {
+private static class GlobalClearKeySetCallable extends
GlobalClearCallable {
/** */
private static final long serialVersionUID = 0L;
@@ -5650,7 +5650,7 @@ public abstract class GridCacheAdapter implements
GridCache,
/** {@inheritDoc} */
@Override public Obje
[46/50] [abbrv] incubator-ignite git commit: # Minor: rename "Schema Load" to "Schema Import".
# Minor: rename "Schema Load" to "Schema Import".
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/435543f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/435543f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/435543f8
Branch: refs/heads/ignite-368
Commit: 435543f8dcf761bf043598e28b296d747ff6e749
Parents: f54fc36
Author: AKuznetsov
Authored: Sun Mar 15 19:22:47 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 15 19:22:47 2015 +0700
--
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 4 ++--
.../org/apache/ignite/examples/datagrid/store/model/Person.java | 2 +-
.../apache/ignite/examples/datagrid/store/model/PersonKey.java | 2 +-
modules/core/src/test/config/store/jdbc/Ignite.xml | 2 +-
.../org/apache/ignite/cache/store/jdbc/model/Organization.java | 2 +-
.../apache/ignite/cache/store/jdbc/model/OrganizationKey.java| 2 +-
.../java/org/apache/ignite/cache/store/jdbc/model/Person.java| 2 +-
.../apache/ignite/cache/store/jdbc/model/PersonComplexKey.java | 2 +-
.../java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/bin/ignite-schema-import.bat
--
diff --git a/bin/ignite-schema-import.bat b/bin/ignite-schema-import.bat
index 7cac917..fc01306 100644
--- a/bin/ignite-schema-import.bat
+++ b/bin/ignite-schema-import.bat
@@ -16,7 +16,7 @@
::
::
-:: Ignite Schema Load Utility.
+:: Ignite Schema Import Utility.
::
@echo off
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/bin/ignite-schema-import.sh
--
diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh
index f145f02..2ef887c 100644
--- a/bin/ignite-schema-import.sh
+++ b/bin/ignite-schema-import.sh
@@ -17,7 +17,7 @@
#
#
-# Ignite Schema Load Utility.
+# Ignite Schema Import Utility.
#
#
@@ -56,7 +56,7 @@
CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import
osname=`uname`
if [ "${DOCK_OPTS}" == "" ]; then
-DOCK_OPTS="-Xdock:name=Ignite Schema Load Utility"
+DOCK_OPTS="-Xdock:name=Ignite Schema Import Utility"
fi
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
index 417abf2..fad7816 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/Person.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* Person definition.
*
- * Code generated by Apache Ignite Schema Load utility: 02/24/2015.
+ * Code generated by Apache Ignite Schema Import utility: 02/24/2015.
*/
public class Person implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
index 4850b0f..74da78b 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/model/PersonKey.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* PersonKey definition.
*
- * Code generated by Apache Ignite Schema Load utility: 02/24/2015.
+ * Code generated by Apache Ignite Schema Import utility: 02/24/2015.
*/
public class PersonKey implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/435543f8/modules/core/src/test/config/store/jdbc/Ignite.xml
--
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml
b/modules/core/src/test/config/store/jdbc/Ignite.xml
index d56b4e6..9eb598d 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -18,7 +18,7 @@
-->
http://www.springframework.org/schema/b
[21/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-411-2' into sprint-2
Merge branch 'ignite-411-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a9ce52a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a9ce52a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a9ce52a Branch: refs/heads/ignite-368 Commit: 2a9ce52aad8a2af7e1a41171f63417df18599c7d Parents: b2f1e43 3ccf656 Author: AKuznetsov Authored: Fri Mar 13 17:51:13 2015 +0700 Committer: AKuznetsov Committed: Fri Mar 13 17:51:13 2015 +0700 -- bin/ignite-schema-import.bat| 25 +--- bin/ignite-schema-import.sh | 4 +- modules/schema-import/pom.xml | 6 -- .../schema-import/src/main/java/media/style.css | 17 ++ .../ignite/schema/generator/XmlGenerator.java | 28 + .../apache/ignite/schema/model/IndexItem.java | 54 + .../ignite/schema/model/PojoDescriptor.java | 9 ++- .../org/apache/ignite/schema/ui/MessageBox.java | 16 - .../ignite/schema/ui/SchemaImportApp.java | 61 .../schema/test/AbstractSchemaImportTest.java | 19 +- 10 files changed, 160 insertions(+), 79 deletions(-) --
[44/50] [abbrv] incubator-ignite git commit: # sprint-2 - fixed devnotes file.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f54fc36c/wiki/documentation/compute-grid/checkpointing.md
--
diff --git a/wiki/documentation/compute-grid/checkpointing.md
b/wiki/documentation/compute-grid/checkpointing.md
deleted file mode 100644
index b7ca7ac..000
--- a/wiki/documentation/compute-grid/checkpointing.md
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
-Checkpointing provides an ability to save an intermediate job state. It can be
useful when long running jobs need to store some intermediate state to protect
from node failures. Then on restart of a failed node, a job would load the
saved checkpoint and continue from where it left off. The only requirement for
job checkpoint state is to implement `java.io.Serializable` interface.
-
-Checkpoints are available through the following methods on `GridTaskSession`
interface:
-* `ComputeTaskSession.loadCheckpoint(String)`
-* `ComputeTaskSession.removeCheckpoint(String)`
-* `ComputeTaskSession.saveCheckpoint(String, Object)`
-[block:api-header]
-{
- "type": "basic",
- "title": "Master Node Failure Protection"
-}
-[/block]
-One important use case for checkpoint that is not readily apparent is to guard
against failure of the "master" node - the node that started the original
execution. When master node fails, Ignite doesn’t anywhere to send the
results of job execution to, and thus the result will be discarded.
-
-To failover this scenario one can store the final result of the job execution
as a checkpoint and have the logic re-run the entire task in case of a "master"
node failure. In such case the task re-run will be much faster since all the
jobs' can start from the saved checkpoints.
-[block:api-header]
-{
- "type": "basic",
- "title": "Setting Checkpoints"
-}
-[/block]
-Every compute job can periodically *checkpoint* itself by calling
`ComputeTaskSession.saveCheckpoint(...)` method.
-
-If job did save a checkpoint, then upon beginning of its execution, it should
check if the checkpoint is available and start executing from the last saved
checkpoint.
-[block:code]
-{
- "codes": [
-{
- "code": "IgniteCompute compute = ignite.compute();\n\ncompute.run(new
IgniteRunnable() {\n // Task session (injected on closure instantiation).\n
@TaskSessionResource\n private ComputeTaskSession ses;\n\n @Override \n
public Object applyx(Object arg) throws GridException {\n// Try to retrieve
step1 result.\nObject res1 = ses.loadCheckpoint(\"STEP1\");\n\nif (res1
== null) {\n res1 = computeStep1(arg); // Do some computation.\n\n //
Save step1 result.\n ses.saveCheckpoint(\"STEP1\", res1);\n}\n\n//
Try to retrieve step2 result.\nObject res2 =
ses.loadCheckpoint(\"STEP2\");\n\nif (res2 == null) {\n res2 =
computeStep2(res1); // Do some computation.\n\n // Save step2 result.\n
ses.saveCheckpoint(\"STEP2\", res2);\n}\n\n...\n }\n}",
- "language": "java"
-}
- ]
-}
-[/block]
-
-[block:api-header]
-{
- "type": "basic",
- "title": "CheckpointSpi"
-}
-[/block]
-In Ignite, checkpointing functionality is provided by `CheckpointSpi` which
has the following out-of-the-box implementations:
-[block:parameters]
-{
- "data": {
-"h-0": "Class",
-"h-1": "Description",
-"h-2": "Default",
-"0-0":
"[SharedFsCheckpointSpi](#file-system-checkpoint-configuration)\n(default)",
-"0-1": "This implementation uses a shared file system to store
checkpoints.",
-"0-2": "Yes",
-"1-0": "[CacheCheckpointSpi](#cache-checkpoint-configuration)",
-"1-1": "This implementation uses a cache to store checkpoints.",
-"2-0": "[JdbcCheckpointSpi](#database-checkpoint-configuration)",
-"2-1": "This implementation uses a database to store checkpoints.",
-"3-1": "This implementation uses Amazon S3 to store checkpoints.",
-"3-0": "[S3CheckpointSpi](#amazon-s3-checkpoint-configuration)"
- },
- "cols": 2,
- "rows": 4
-}
-[/block]
-`CheckpointSpi` is provided in `IgniteConfiguration` and passed into Ignition
class at startup.
-[block:api-header]
-{
- "type": "basic",
- "title": "File System Checkpoint Configuration"
-}
-[/block]
-The following configuration parameters can be used to configure
`SharedFsCheckpointSpi`:
-[block:parameters]
-{
- "data": {
-"h-0": "Setter Method",
-"h-1": "Description",
-"h-2": "Default",
-"0-0": "`setDirectoryPaths(Collection)`",
-"0-1": "Sets directory paths to the shared folders where checkpoints are
stored. The path can either be absolute or relative to the path specified in
`IGNITE_HOME` environment or system varialble.",
-"0-2": "`IGNITE_HOME/work/cp/sharedfs`"
- },
- "cols": 3,
- "rows": 1
-}
-[/block]
-
-[block:code]
-{
- "codes": [
-{
- "code": "\n ...\n \n\n
\n \n\n
/my/directory/path\n
/other/directory/path\n\n \n
\n \n ...\n",
-
[10/50] [abbrv] incubator-ignite git commit: # IGNITE-411 Fixed compatibility with java 8. Removed dependency from ignite-core.
# IGNITE-411 Fixed compatibility with java 8. Removed dependency from
ignite-core.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8749696c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8749696c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8749696c
Branch: refs/heads/ignite-368
Commit: 8749696c12202d4d0dd403266bddf478e3bf07c6
Parents: 6f5944c
Author: AKuznetsov
Authored: Fri Mar 13 14:33:00 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 13 14:33:00 2015 +0700
--
bin/ignite-schema-import.bat| 25 ++---
bin/ignite-schema-import.sh | 13 +
modules/schema-import/pom.xml | 6 ---
.../schema-import/src/main/java/media/style.css | 1 +
.../ignite/schema/generator/XmlGenerator.java | 28 +-
.../apache/ignite/schema/model/IndexItem.java | 54
.../ignite/schema/model/PojoDescriptor.java | 9 ++--
.../ignite/schema/ui/SchemaImportApp.java | 52 +--
.../schema/test/AbstractSchemaImportTest.java | 19 +--
9 files changed, 130 insertions(+), 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8749696c/bin/ignite-schema-import.bat
--
diff --git a/bin/ignite-schema-import.bat b/bin/ignite-schema-import.bat
index d5fa644..7cac917 100644
--- a/bin/ignite-schema-import.bat
+++ b/bin/ignite-schema-import.bat
@@ -70,37 +70,18 @@ set IGNITE_HOME=%IGNITE_HOME:~0,-1%
goto checkIgniteHome2
:checkIgniteHome3
-if exist "%IGNITE_HOME%\config" goto checkIgniteHome4
+if exist "%IGNITE_HOME%\config" goto run
echo %0, ERROR: Ignite installation folder is not found or IGNITE_HOME
environment variable is not valid.
echo Please create IGNITE_HOME environment variable pointing to location of
echo Ignite installation folder.
goto error_finish
-:checkIgniteHome4
-
-::
-:: Set SCRIPTS_HOME - base path to scripts.
-::
-set SCRIPTS_HOME=%IGNITE_HOME%\bin
-
-:: Remove trailing spaces
-for /l %%a in (1,1,31) do if /i "%SCRIPTS_HOME:~-1%" == " " set
SCRIPTS_HOME=%SCRIPTS_HOME:~0,-1%
-
-if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run
-echo %0, WARN: IGNITE_HOME environment variable may be pointing to wrong
folder: %IGNITE_HOME%
-
:run
::
-:: Set IGNITE_LIBS
-::
-call "%SCRIPTS_HOME%\include\setenv.bat"
-call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in
release.
-
-::
-:: Set CLASS PATH
+:: Set CLASS PATH.
::
-set
CP=%JAVA_HOME%\jre\lib\jfxrt.jar;%IGNITE_LIBS%;%IGNITE_HOME%\bin\include\schema-import\*
+set CP=%JAVA_HOME%\jre\lib\jfxrt.jar;%IGNITE_HOME%\bin\include\schema-import\*
::
:: JVM options. See
http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8749696c/bin/ignite-schema-import.sh
--
diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh
index cac38c4..b4a062c 100644
--- a/bin/ignite-schema-import.sh
+++ b/bin/ignite-schema-import.sh
@@ -29,13 +29,6 @@ if [ "${IGNITE_HOME}" = "" ];
fi
#
-# Set SCRIPTS_HOME - base path to scripts.
-#
-SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
-
-source "${SCRIPTS_HOME}"/include/functions.sh
-
-#
# Discover path to Java executable and check it's version.
#
checkJava
@@ -46,11 +39,9 @@ checkJava
setIgniteHome
#
-# Set IGNITE_LIBS.
+# Set CLASS PATH.
#
-. "${SCRIPTS_HOME}"/include/setenv.sh
-. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.
-CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_LIBS}${SEP}${IGNITE_HOME}/bin/include/schema-import/*"
+CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import/*"
# Mac OS specific support to display correct name in the dock.
osname=`uname`
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8749696c/modules/schema-import/pom.xml
--
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 8186fd3..3e8d32c 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -37,12 +37,6 @@
-org.apache.ignite
-ignite-core
-${ignite.version}
-
-
-
com.h2database
h2
1.3.175
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8749696c/modules/schema-import/src/main/java/media/style.css
--
diff --git a/modules/schema-import/src/main/java/media/style.css
b/modules/schema-import/s
[49/50] [abbrv] incubator-ignite git commit: # Minor: Fixed typo in cache command description.
# Minor: Fixed typo in cache command description.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/42ee9aeb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42ee9aeb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42ee9aeb
Branch: refs/heads/ignite-368
Commit: 42ee9aeb9e0896f8f80fca5758e3e91ad211d13d
Parents: a530f1d
Author: AKuznetsov
Authored: Mon Mar 16 10:30:31 2015 +0700
Committer: AKuznetsov
Committed: Mon Mar 16 10:30:31 2015 +0700
--
.../ignite/visor/commands/cache/VisorCacheCommand.scala | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42ee9aeb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 1023708..afbbce2 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -65,7 +65,7 @@ import scala.util.control.Breaks._
* {{{
* cache
* cache -i
- * cache {-c=} {-id=|id8=}
{-s=hi|mi|re|wr|cn} {-a} {-r}
+ * cache {-c=} {-id=|id8=}
{-s=hi|mi|rd|wr|cn} {-a} {-r}
* cache -clear {-c=}
* cache -scan -c= {-id=|id8=} {-p=}
* cache -swap {-c=} {-id=|id8=}
@@ -83,7 +83,7 @@ import scala.util.control.Breaks._
* If neither is specified statistics will be gathered from all nodes.
* -c=
* Name of the cache.
- * -s=hi|mi|re|wr|cn
+ * -s=hi|mi|rd|wr|cn
* Defines sorting type. Sorted by:
*hi Hits.
*mi Misses.
@@ -630,7 +630,7 @@ object VisorCacheCommand {
spec = Seq(
"cache",
"cache -i",
-"cache {-c=} {-id=|id8=}
{-s=hi|mi|re|wr} {-a} {-r}",
+"cache {-c=} {-id=|id8=}
{-s=hi|mi|rd|wr} {-a} {-r}",
"cache -clear {-c=} {-id=|id8=}",
"cache -scan -c= {-id=|id8=}
{-p=}",
"cache -swap {-c=} {-id=|id8=}"
@@ -660,7 +660,7 @@ object VisorCacheCommand {
"-swap" -> Seq(
"Swaps backup entries in cache."
),
-"-s=hi|mi|re|wr|cn" -> Seq(
+"-s=hi|mi|rd|wr|cn" -> Seq(
"Defines sorting type. Sorted by:",
" hi Hits.",
" mi Misses.",
[42/50] [abbrv] incubator-ignite git commit: # sprint-2 - fixed devnotes file.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f54fc36c/wiki/documentation/data-grid/persistent-store.md
--
diff --git a/wiki/documentation/data-grid/persistent-store.md
b/wiki/documentation/data-grid/persistent-store.md
deleted file mode 100644
index ce913a4..000
--- a/wiki/documentation/data-grid/persistent-store.md
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-JCache specification comes with APIs for
[javax.cache.inegration.CacheLoader](https://ignite.incubator.apache.org/jcache/1.0.0/javadoc/javax/cache/integration/CacheLoader.html)
and
[javax.cache.inegration.CacheWriter](https://ignite.incubator.apache.org/jcache/1.0.0/javadoc/javax/cache/integration/CacheWriter.html)
which are used for **write-through** and **read-through** to and from an
underlying persistent storage respectively (e.g. an RDBMS database like Oracle
or MySQL, or NoSQL database like MongoDB or Couchbase).
-
-While Ignite allows you to configure the `CacheLoader` and `CacheWriter`
separately, it is very awkward to implement a transactional store within 2
separate classes, as multiple `load` and `put` operations have to share the
same connection within the same transaction. To mitigate that, Ignite provides
`org.apache.ignite.cache.store.CacheStore` interface which extends both,
`CacheLoader` and `CacheWriter`.
-[block:callout]
-{
- "type": "info",
- "title": "Transactions",
- "body": "`CacheStore` is fully transactional and automatically merges into
the ongoing cache transaction."
-}
-[/block]
-
-[block:api-header]
-{
- "type": "basic",
- "title": "CacheStore"
-}
-[/block]
-`CacheStore` interface in Ignite is used to write and load data to and from
the underlying data store. In addition to standard JCache loading and storing
methods, it also introduces end-of-transaction demarcation and ability to bulk
load a cache from the underlying data store.
-
-## loadCache()
-`CacheStore.loadCache()` method allows for cache loading even without passing
all the keys that need to be loaded. It is generally used for hot-loading the
cache on startup, but can be also called at any point after the cache has been
started.
-
-`IgniteCache.loadCache()` method will delegate to `CacheStore.loadCache()`
method on every cluster member that is running the cache. To invoke loading
only on the local cluster node, use `IgniteCache.localLoadCache()` method.
-[block:callout]
-{
- "type": "info",
- "body": "In case of partitioned caches, keys that are not mapped to this
node, either as primary or backups, will be automatically discarded by the
cache."
-}
-[/block]
-## load(), write(), delete()
-Methods `load()`, `write()`, and `delete()` on the `CacheStore` are called
whenever methods `get()`, `put()`, and `remove()` are called correspondingly on
the `IgniteCache` interface. These methods are used to enable **read-through**
and **write-through** behavior when working with individual cache entries.
-
-## loadAll(), writeAll(), deleteAll()
-Methods `loadAll()`, `writeAll()`, and `deleteAll()` on the `CacheStore` are
called whenever methods `getAll()`, `putAll()`, and `removeAll()` are called
correspondingly on the `IgniteCache` interface. These methods are used to
enable **read-through** and **write-through** behavior when working with
multiple cache entries and should generally be implemented using batch
operations to provide better performance.
-[block:callout]
-{
- "type": "info",
- "title": "",
- "body": "`CacheStoreAdapter` provides default implementation for
`loadAll()`, `writeAll()`, and `deleteAll()` methods which simply iterates
through all keys one by one."
-}
-[/block]
-## sessionEnd()
-Ignite has a concept of store session which may span more than one cache store
operation. Sessions are especially useful when working with transactions.
-
-In case of `ATOMIC` caches, method `sessionEnd()` is called after completion
of each `CacheStore` method. In case of `TRANSACTIONAL` caches, `sessionEnd()`
is called at the end of each transaction, which allows to either commit or
rollback multiple operations on the underlying persistent store.
-[block:callout]
-{
- "type": "info",
- "body": "`CacheStoreAdapater` provides default empty implementation of
`sessionEnd()` method."
-}
-[/block]
-
-[block:api-header]
-{
- "type": "basic",
- "title": "CacheStoreSession"
-}
-[/block]
-The main purpose of cache store session is to hold the context between
multiple store invocations whenever `CacheStore` is used in a cache
transaction. For example, if using JDBC, you can store the ongoing database
connection via `CacheStoreSession.attach()` method. You can then commit this
connection in the `CacheStore#sessionEnd(boolean)` method.
-
-`CacheStoreSession` can be injected into your cache store implementation via
`@GridCacheStoreSessionResource` annotation.
-[block:api-header]
-{
- "type": "basic",
- "title": "CacheStore Example"
-}
-[/block]
-Below
[40/50] [abbrv] incubator-ignite git commit: Shmem version
Shmem version Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f732f57c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f732f57c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f732f57c Branch: refs/heads/ignite-368 Commit: f732f57cb319f5af1add6106d67eff338c59aedd Parents: 5d3f2ab Author: Valentin Kulichenko Authored: Fri Mar 13 21:36:42 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 13 21:36:42 2015 -0700 -- examples/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f732f57c/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 337f0aa..99ec04f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -171,7 +171,7 @@ org.gridgain ignite-shmem -RELEASE +1.0.0 test http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f732f57c/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index af72397..6d6440d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -130,7 +130,7 @@ org.gridgain ignite-shmem -RELEASE +1.0.0 test http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f732f57c/modules/hadoop/pom.xml -- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index ec65f0f..859d8db 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -98,7 +98,7 @@ org.gridgain ignite-shmem -RELEASE +1.0.0
[13/50] [abbrv] incubator-ignite git commit: #ignite-333: Remove method IgniteCache.localClear().
#ignite-333: Remove method IgniteCache.localClear().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e3ad244
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e3ad244
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e3ad244
Branch: refs/heads/ignite-368
Commit: 7e3ad2442abd2d27b173f4a0eee0afc0d8b369b8
Parents: 4f26c2c
Author: ivasilinets
Authored: Fri Mar 13 12:07:09 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 12:07:09 2015 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 16 -
.../processors/cache/IgniteCacheProxy.java | 12 ---
.../cache/GridCacheAbstractFullApiSelfTest.java | 38
3 files changed, 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e3ad244/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 0944893..5a7c934 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -437,22 +437,6 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
*/
public void localClearAll(Set keys);
-/**
- * Clears all entries from this cache and swap storage only if the entry
- * is not currently locked, and is not participating in a transaction.
- *
- * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and
- * {@link CacheFlag#SKIP_SWAP} is not enabled, the evicted entries will
- * also be cleared from swap.
- *
- * Note that this operation is local as it merely clears
- * an entry from local cache. It does not remove entries from
- * remote caches or from underlying persistent storage.
- * This method is not transactionally consistent.
- * Transactional semantics must be guaranteed outside of Ignite.
- */
-public void localClear();
-
/** {@inheritDoc} */
@IgniteAsyncSupported
@Override public T invoke(K key, EntryProcessor
entryProcessor, Object... arguments);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e3ad244/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index f936ced..d966ae1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -1122,18 +1122,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
-
-try {
-delegate.clearLocally();
-}
-finally {
-gate.leave(prev);
-}
-}
-
-/** {@inheritDoc} */
@Override public T invoke(K key, EntryProcessor
entryProcessor, Object... args)
throws EntryProcessorException {
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e3ad244/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 9f7b3dd..d411fab 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4157,44 +4157,6 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
}
/**
- * @throws Exception If failed.
- */
-public void testLocalClear() throws Exception {
-Map> keys = addKeys();
-
-Set keysToRemove = new HashSet<>();
-
-Ignite g = grid(0);
-
-for (int i = 0; i < gridCount(); ++i) {
-List gridKeys = keys.get(grid(i).name());
-
-if (gridKeys.size() > 0) {
-keysToRemove.addAll(gridKeys);
-
-g = grid(i);
-
-break;
-}
-}
-
-g.jcache(null).localClear();
-
-for (int i = 0
[16/50] [abbrv] incubator-ignite git commit: # IGNITE-411 Fixed issues with message dialog under java 8: non transparent text area and vertical scroll bar is shown when not needed.
# IGNITE-411 Fixed issues with message dialog under java 8: non transparent
text area and vertical scroll bar is shown when not needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7096ca9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7096ca9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7096ca9d
Branch: refs/heads/ignite-368
Commit: 7096ca9db74507f035108b270f0850a269b852c5
Parents: 8749696
Author: AKuznetsov
Authored: Fri Mar 13 16:46:29 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 13 16:46:29 2015 +0700
--
modules/schema-import/src/main/java/media/style.css | 16
.../org/apache/ignite/schema/ui/MessageBox.java | 16 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7096ca9d/modules/schema-import/src/main/java/media/style.css
--
diff --git a/modules/schema-import/src/main/java/media/style.css
b/modules/schema-import/src/main/java/media/style.css
index 1a7bf2a..e4ccb08 100644
--- a/modules/schema-import/src/main/java/media/style.css
+++ b/modules/schema-import/src/main/java/media/style.css
@@ -47,6 +47,22 @@
-fx-background-color: transparent, transparent, transparent;
}
+.text-area .scroll-pane {
+-fx-background-color: transparent;
+}
+
+.text-area .scroll-pane .viewport{
+-fx-background-color: transparent;
+}
+
+.text-area .scroll-pane .content{
+-fx-background-color: transparent;
+}
+
+.text-area .scroll-bar:vertical:disabled {
+-fx-opacity: 0;
+}
+
.text-field {
-fx-font-size: 14;
-fx-background-color: -fx-text-box-border, -fx-control-inner-background,
-fx-control-inner-background;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7096ca9d/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
--
diff --git
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
index cf6a705..ac26b4b 100644
---
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
+++
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
@@ -17,6 +17,7 @@
package org.apache.ignite.schema.ui;
+import javafx.beans.value.*;
import javafx.event.*;
import javafx.geometry.*;
import javafx.scene.control.*;
@@ -115,13 +116,26 @@ public class MessageBox extends ModalDialog {
contentPnl.add(hBox(0, true, imageView(iconFile, 48)));
-TextArea ta = new TextArea(msg);
+final TextArea ta = new TextArea(msg);
ta.setEditable(false);
ta.setWrapText(true);
ta.setFocusTraversable(false);
contentPnl.add(ta);
+// Workaround for vertical scrollbar.
+if (msg.split("\r\n|\r|\n").length < 3)
+showingProperty().addListener(new ChangeListener() {
+@Override public void changed(ObservableValue val, Boolean oldVal, Boolean newVal) {
+if (newVal) {
+ScrollBar scrollBar =
(ScrollBar)ta.lookup(".scroll-bar:vertical");
+
+if (scrollBar != null)
+scrollBar.setDisable(true);
+}
+}
+});
+
final CheckBox rememberChoiceCh = checkBox("Remember choice", "",
false);
if (rememberChoice) {
[48/50] [abbrv] incubator-ignite git commit: # Minor: Fixed combo-box drop-down list font size in Ignite schema import app.
# Minor: Fixed combo-box drop-down list font size in Ignite schema import app.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a530f1d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a530f1d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a530f1d2
Branch: refs/heads/ignite-368
Commit: a530f1d2f32eb8acc7a2717746e48c7402e92341
Parents: 52ee235
Author: AKuznetsov
Authored: Mon Mar 16 10:27:31 2015 +0700
Committer: AKuznetsov
Committed: Mon Mar 16 10:27:31 2015 +0700
--
modules/schema-import/src/main/java/media/style.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a530f1d2/modules/schema-import/src/main/java/media/style.css
--
diff --git a/modules/schema-import/src/main/java/media/style.css
b/modules/schema-import/src/main/java/media/style.css
index e4ccb08..6eee5f9 100644
--- a/modules/schema-import/src/main/java/media/style.css
+++ b/modules/schema-import/src/main/java/media/style.css
@@ -39,7 +39,7 @@
}
.combo-box-popup .list-view {
--fx-font-size : 14pt;
+-fx-font-size : 14;
}
.text-area {
[09/50] [abbrv] incubator-ignite git commit: # IGNITE-411 Fixes for Java 8.
# IGNITE-411 Fixes for Java 8.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6f5944cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f5944cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f5944cc
Branch: refs/heads/ignite-368
Commit: 6f5944cca3da334691f84a5a8f40e7194d551beb
Parents: d8c0766
Author: AKuznetsov
Authored: Fri Mar 13 08:08:45 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 13 08:08:45 2015 +0700
--
.../ignite/schema/ui/SchemaImportApp.java | 25 ++--
1 file changed, 7 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f5944cc/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
--
diff --git
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index 6d14d31..365ea07 100644
---
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -1498,6 +1498,7 @@ public class SchemaImportApp extends Application {
super.updateItem(item, empty);
setGraphic(null);
+setText(null);
if (!empty) {
setText(item);
@@ -1509,7 +1510,6 @@ public class SchemaImportApp extends Application {
if (pojo != null) {
comboBox.setItems(pojo.conversions());
-
comboBox.getSelectionModel().select(pojo.javaTypeName());
}
}
@@ -1530,30 +1530,24 @@ public class SchemaImportApp extends Application {
};
}
-/** Previous POJO bound to cell. */
-private PojoDescriptor prevPojo;
-
/** {@inheritDoc} */
@Override public void updateItem(Boolean item, boolean empty) {
super.updateItem(item, empty);
+setGraphic(null);
+
if (!empty) {
TableRow row = getTableRow();
if (row != null) {
final PojoDescriptor pojo = (PojoDescriptor)row.getItem();
-if (pojo != prevPojo) {
-prevPojo = pojo;
-
+if (pojo != null) {
boolean isTbl = pojo.parent() != null;
CheckBox ch = new CheckBox();
-
ch.setAllowIndeterminate(false);
-
ch.indeterminateProperty().bindBidirectional(pojo.indeterminate());
-
ch.selectedProperty().bindBidirectional(pojo.useProperty());
Label lb = new Label(isTbl ? pojo.table() :
pojo.schema());
@@ -1582,28 +1576,23 @@ public class SchemaImportApp extends Application {
};
}
-/** Previous POJO field bound to cell. */
-private PojoField prevField;
-
/** {@inheritDoc} */
@Override public void updateItem(Boolean item, boolean empty) {
super.updateItem(item, empty);
+setGraphic(null);
+
if (!empty) {
TableRow row = getTableRow();
if (row != null) {
final PojoField field = (PojoField)row.getItem();
-if (field != prevField) {
-prevField = field;
-
+if (field != null) {
setAlignment(Pos.CENTER);
CheckBox ch = new CheckBox();
-
ch.setDisable(!field.nullable());
-
ch.selectedProperty().bindBidirectional(field.useProperty());
setGraphic(ch);
[29/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-cleanup-bin' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-cleanup-bin
Merge branches 'ignite-cleanup-bin' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-cleanup-bin Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e806106 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e806106 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e806106 Branch: refs/heads/ignite-368 Commit: 7e806106fc863f2c54b04ba5afd007e1926d2b08 Parents: 76bb9c3 ea6c9a4 Author: AKuznetsov Authored: Fri Mar 13 22:05:46 2015 +0700 Committer: AKuznetsov Committed: Fri Mar 13 22:05:46 2015 +0700 -- bin/ignite-schema-import.bat| 25 +--- bin/ignite-schema-import.sh | 4 +- .../ignite/internal/util/IgniteUtils.java | 1 - modules/schema-import/pom.xml | 6 -- .../schema-import/src/main/java/media/style.css | 17 ++ .../ignite/schema/generator/XmlGenerator.java | 28 + .../apache/ignite/schema/model/IndexItem.java | 54 + .../ignite/schema/model/PojoDescriptor.java | 9 ++- .../org/apache/ignite/schema/ui/MessageBox.java | 16 - .../ignite/schema/ui/SchemaImportApp.java | 61 .../schema/test/AbstractSchemaImportTest.java | 19 +- 11 files changed, 160 insertions(+), 80 deletions(-) --
[38/50] [abbrv] incubator-ignite git commit: Removed shmem from communication
Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c598c8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c598c8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c598c8d
Branch: refs/heads/ignite-368
Commit: 8c598c8db613c5611479d30f0a0c30374fab3e42
Parents: dca3ca7
Author: Valentin Kulichenko
Authored: Fri Mar 13 19:39:21 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 19:39:21 2015 -0700
--
assembly/dependencies-hadoop.xml | 7 ++--
pom.xml | 66 ++-
2 files changed, 6 insertions(+), 67 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c598c8d/assembly/dependencies-hadoop.xml
--
diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml
index ee49731..af52d76 100644
--- a/assembly/dependencies-hadoop.xml
+++ b/assembly/dependencies-hadoop.xml
@@ -119,9 +119,10 @@
target/libs
/
-
-*asm*.jar
-
+
+hadoop*.jar
+log4j*.jar
+
target
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c598c8d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b4f1dba..5a32a57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,6 +361,7 @@
${basedir}
libs
false
+
true
@@ -377,6 +378,7 @@
${basedir}/libs
optional
false
+
true
@@ -1361,69 +1363,5 @@
-
-
-opt-clns-prop
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-1.7
-false
-
-
-org.apache.ignite
-ignite-tools
-${ignite.version}
-
-
-
-
-optimized-classnames-generation
-
-run
-
-process-classes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
[18/50] [abbrv] incubator-ignite git commit: # IGNITE-411 Minor.
# IGNITE-411 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/3ccf6562
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ccf6562
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ccf6562
Branch: refs/heads/ignite-368
Commit: 3ccf65621308a749499925228864a94ecba0cd92
Parents: 7096ca9
Author: AKuznetsov
Authored: Fri Mar 13 17:13:52 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 13 17:13:52 2015 +0700
--
bin/ignite-schema-import.sh | 9 +
.../main/java/org/apache/ignite/schema/ui/MessageBox.java | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ccf6562/bin/ignite-schema-import.sh
--
diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh
index b4a062c..f145f02 100644
--- a/bin/ignite-schema-import.sh
+++ b/bin/ignite-schema-import.sh
@@ -29,6 +29,13 @@ if [ "${IGNITE_HOME}" = "" ];
fi
#
+# Set SCRIPTS_HOME - base path to scripts.
+#
+SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
+
+source "${SCRIPTS_HOME}"/include/functions.sh
+
+#
# Discover path to Java executable and check it's version.
#
checkJava
@@ -41,6 +48,8 @@ setIgniteHome
#
# Set CLASS PATH.
#
+. "${SCRIPTS_HOME}"/include/setenv.sh
+. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.
CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import/*"
# Mac OS specific support to display correct name in the dock.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ccf6562/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
--
diff --git
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
index ac26b4b..0cb1e41 100644
---
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
+++
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
@@ -124,7 +124,7 @@ public class MessageBox extends ModalDialog {
contentPnl.add(ta);
// Workaround for vertical scrollbar.
-if (msg.split("\r\n|\r|\n").length < 3)
+if (msg.split("\r\n|\r|\n").length < 4)
showingProperty().addListener(new ChangeListener() {
@Override public void changed(ObservableValue val, Boolean oldVal, Boolean newVal) {
if (newVal) {
[47/50] [abbrv] incubator-ignite git commit: # IGNITE-330 Store demo.
# IGNITE-330 Store demo. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52ee2353 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52ee2353 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52ee2353 Branch: refs/heads/ignite-368 Commit: 52ee2353941d6559e73c93d272e6a1172aa36f5b Parents: 435543f Author: AKuznetsov Authored: Sun Mar 15 21:25:55 2015 +0700 Committer: AKuznetsov Committed: Sun Mar 15 21:25:55 2015 +0700 -- examples/config/store/example-database.script | 22 +-- .../config/store/example-jdbc-pojo-store.xml| 142 --- .../store/CacheNodeWithStoreStartup.java| 45 -- .../datagrid/store/CacheStoreExample.java | 19 +++ .../store/jdbc/CacheJdbcPojoPersonStore.java| 11 -- .../datagrid/store/model/PersonKey.java | 97 - 6 files changed, 66 insertions(+), 270 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-database.script -- diff --git a/examples/config/store/example-database.script b/examples/config/store/example-database.script index 1397f28..80e418b 100644 --- a/examples/config/store/example-database.script +++ b/examples/config/store/example-database.script @@ -13,15 +13,15 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -create table PERSONS(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); +create table PERSON(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); -insert into PERSONS(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); -insert into PERSONS(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); -insert into PERSONS(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); -insert into PERSONS(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); -insert into PERSONS(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); -insert into PERSONS(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); -insert into PERSONS(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); -insert into PERSONS(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); -insert into PERSONS(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); -insert into PERSONS(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); +insert into PERSON(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); +insert into PERSON(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); +insert into PERSON(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); +insert into PERSON(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); +insert into PERSON(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); +insert into PERSON(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); +insert into PERSON(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); +insert into PERSON(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); +insert into PERSON(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); +insert into PERSON(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-jdbc-pojo-store.xml -- diff --git a/examples/config/store/example-jdbc-pojo-store.xml b/examples/config/store/example-jdbc-pojo-store.xml deleted file mode 100644 index 4fc089f..000 --- a/examples/config/store/example-jdbc-pojo-store.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - -http://www.springframework.org/schema/beans"; - xmlns:util="http://www.springframework.org/schema/util"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" -http://www.springframework.org/schema/beans -http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/util -http://www.springframework.org/schema/util/spring-util.xsd";> - - - - - - - - - - - - - - - - - - - - - - - - -
[27/50] [abbrv] incubator-ignite git commit: # ignite-333 review
# ignite-333 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/cf6677bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf6677bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf6677bb
Branch: refs/heads/ignite-368
Commit: cf6677bb044e6969c67230d5b79b97876989b471
Parents: 62be9d1
Author: sboikov
Authored: Fri Mar 13 17:18:24 2015 +0300
Committer: sboikov
Committed: Fri Mar 13 17:35:20 2015 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 33 +
.../processors/cache/GridCacheAdapter.java | 46 ++--
.../cache/GridCacheAbstractFullApiSelfTest.java | 73 ++--
3 files changed, 77 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf6677bb/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 99a8934..042d811 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -18,10 +18,10 @@
package org.apache.ignite;
import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.store.*;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.lang.*;
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import javax.cache.configuration.*;
import javax.cache.expiry.*;
+import javax.cache.integration.*;
import javax.cache.processor.*;
import java.util.*;
import java.util.concurrent.*;
@@ -380,8 +381,9 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
@Override public void clear();
/**
- * Clear entry from the cache, without notifying listeners or
- * {@link javax.cache.integration.CacheWriter}s.
+ * Clear entry from the cache and swap storage, without notifying
listeners or
+ * {@link CacheWriter}s. Entry is cleared only if it is not currently
locked,
+ * and is not participating in a transaction.
*
* @param key Key to clear.
* @throws IllegalStateException if the cache is {@link #isClosed()}
@@ -391,8 +393,9 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
public void clear(K key);
/**
- * Clear entries from the cache, without notifying listeners or
- * {@link javax.cache.integration.CacheWriter}s.
+ * Clear entries from the cache and swap storage, without notifying
listeners or
+ * {@link CacheWriter}s. Entry is cleared only if it is not currently
locked,
+ * and is not participating in a transaction.
*
* @param keys Keys to clear.
* @throws IllegalStateException if the cache is {@link #isClosed()}
@@ -402,24 +405,26 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
public void clearAll(Set keys);
/**
- * Clears an entry from this cache and swap storage only if the entry
- * is not currently locked, and is not participating in a transaction.
+ * Clear entry from the cache and swap storage, without notifying
listeners or
+ * {@link CacheWriter}s. Entry is cleared only if it is not currently
locked,
+ * and is not participating in a transaction.
*
* Note that this operation is local as it merely clears
- * an entry from local cache. It does not remove entries from
- * remote caches or from underlying persistent storage.
+ * an entry from local cache, it does not remove entries from
+ * remote caches.
*
* @param key Key to clear.
*/
public void localClear(K key);
/**
- * Clears an entry from this cache and swap storage only if the entry
- * is not currently locked, and is not participating in a transaction.
+ * Clear entries from the cache and swap storage, without notifying
listeners or
+ * {@link CacheWriter}s. Entry is cleared only if it is not currently
locked,
+ * and is not participating in a transaction.
*
* Note that this operation is local as it merely clears
- * an entry from local cache. It does not remove entries from
- * remote caches or from underlying persistent storage.
+ * an entry from local cache, it does not remove entries from
+ * remote caches.
*
* @param keys Keys to clear.
*/
ht
[24/50] [abbrv] incubator-ignite git commit: #ignite-333: Remove from swap on clearLocally.
#ignite-333: Remove from swap on clearLocally.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b12945a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b12945a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b12945a0
Branch: refs/heads/ignite-368
Commit: b12945a05feca1c418d5ed76b71f69daaf2cc2a9
Parents: 0875eb7
Author: ivasilinets
Authored: Fri Mar 13 14:39:33 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 14:39:33 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheAdapter.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b12945a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index e24f13c..a998c2c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1398,6 +1398,9 @@ public abstract class GridCacheAdapter implements
GridCache,
try {
if (e != null)
e.clear(obsoleteVer, readers, null);
+
+if (ctx.isSwapOrOffheapEnabled())
+
entryEx(ctx.toCacheKeyObject(key)).clear(ctx.versions().next(), false,
CU.empty0());
}
catch (IgniteCheckedException ex) {
U.error(log, "Failed to clearLocally entry (will continue to
clearLocally other entries): " + e,
@@ -1422,7 +1425,7 @@ public abstract class GridCacheAdapter implements
GridCache,
GridCacheEntryEx e = peekEx(cacheKey);
if (ctx.isSwapOrOffheapEnabled())
-ctx.swap().readAndRemove(ctx.toCacheKeyObject(key));
+
entryEx(ctx.toCacheKeyObject(key)).clear(ctx.versions().next(), false,
CU.empty0());
return e != null && e.clear(obsoleteVer, false, filter);
}
[08/50] [abbrv] incubator-ignite git commit: #ignite-333: Fix javadocs.
#ignite-333: Fix javadocs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fcdc4ce9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fcdc4ce9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fcdc4ce9
Branch: refs/heads/ignite-368
Commit: fcdc4ce93355514ae36d79acb382df3c476a1a7a
Parents: fa22af3
Author: ivasilinets
Authored: Thu Mar 12 20:28:57 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 12 20:28:57 2015 +0300
--
.../ignite/internal/processors/cache/CacheProjection.java | 3 ---
.../processors/cache/GridCacheAbstractFullApiSelfTest.java | 6 ++
2 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcdc4ce9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 5ca17a0..66507f9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -1265,9 +1265,6 @@ public interface CacheProjection extends
Iterable> {
* Note that this operation is local as it merely clears
* an entry from local cache. It does not remove entries from
* remote caches or from underlying persistent storage.
- * Cache Flags
- * This method is not available if any of the following flags are set on
projection:
- * {@link CacheFlag#READ}.
*
* @param keys Keys to clearLocally.
* @return {@code True} if entry was successfully cleared from cache,
{@code false}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcdc4ce9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 7f3e223..9f7b3dd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4194,6 +4194,11 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
assertEquals(0, g.jcache(null).localSize());
}
+/**
+ * Add 500 keys to cache only on primaries nodes.
+ *
+ * @return Map grid's name to its primary keys.
+ */
private Map> addKeys() {
// Save entries only on their primary nodes. If we didn't do so,
clearLocally() will not remove all entries
// because some of them were blocked due to having readers.
@@ -4245,6 +4250,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
/**
* @param async If {@code true} uses async method.
+ * @param keysToRemove Keys to remove.
* @throws Exception If failed.
*/
protected void testGlobalClearKey(boolean async, Collection
keysToRemove) throws Exception {
[23/50] [abbrv] incubator-ignite git commit: #ignite-333: Remove from swap on clearLocally.
#ignite-333: Remove from swap on clearLocally.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0875eb71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0875eb71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0875eb71
Branch: refs/heads/ignite-368
Commit: 0875eb71dacfce72352ec7756f2d6c3145542a21
Parents: 2442881
Author: ivasilinets
Authored: Fri Mar 13 14:10:32 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 14:10:32 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 15 +++
.../cache/GridCacheAbstractFullApiSelfTest.java | 41 +++-
2 files changed, 36 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0875eb71/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 58645c3..e24f13c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1421,6 +1421,9 @@ public abstract class GridCacheAdapter implements
GridCache,
GridCacheEntryEx e = peekEx(cacheKey);
+if (ctx.isSwapOrOffheapEnabled())
+ctx.swap().readAndRemove(ctx.toCacheKeyObject(key));
+
return e != null && e.clear(obsoleteVer, false, filter);
}
catch (IgniteCheckedException ex) {
@@ -1440,11 +1443,7 @@ public abstract class GridCacheAdapter implements
GridCache,
// Clear local cache synchronously.
clearLocally(key);
-Set keys = U.newHashSet(1);
-
-keys.add(key);
-
-clearRemotes(0, new GlobalClearKeySetCallable(name(), new
HashSet(keys)));
+clearRemotes(0, new GlobalClearKeySetCallable(name(),
Collections.singleton(key)));
}
/** {@inheritDoc} */
@@ -1457,11 +1456,7 @@ public abstract class GridCacheAdapter implements
GridCache,
/** {@inheritDoc} */
@Override public IgniteInternalFuture clearAsync(K key) {
-Set keys = U.newHashSet(1);
-
-keys.add(key);
-
-return clearAsync(new GlobalClearKeySetCallable(name(), keys));
+return clearAsync(new GlobalClearKeySetCallable(name(),
Collections.singleton(key)));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0875eb71/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index ece20a5..f20b571 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -406,7 +406,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
assert 2 == map1.size() : "Invalid map: " + map1;
-assertEquals(1, (int)map1.get("key1"));
+assertEquals(1, (int) map1.get("key1"));
assertEquals(2, (int)map1.get("key2"));
assertNull(map1.get("key"));
@@ -1024,7 +1024,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
tx.close();
}
-assertEquals((Integer)3, cache.get("key"));
+assertEquals((Integer) 3, cache.get("key"));
}
/**
@@ -1188,11 +1188,11 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
assertEquals("null", cache.invoke("k0", INCR_PROCESSOR));
-assertEquals((Integer)1, cache.get("k0"));
+assertEquals((Integer) 1, cache.get("k0"));
assertEquals("1", cache.invoke("k0", INCR_PROCESSOR));
-assertEquals((Integer)2, cache.get("k0"));
+assertEquals((Integer) 2, cache.get("k0"));
cache.put("k1", 1);
@@ -1225,7 +1225,8 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
};
GridTestUtils.assertThrows(log, new Callable() {
-@Override public Void call() throws Exception {
+@Override
+public Void ca
[45/50] [abbrv] incubator-ignite git commit: # sprint-2 - fixed devnotes file.
# sprint-2 - fixed devnotes file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f54fc36c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f54fc36c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f54fc36c
Branch: refs/heads/ignite-368
Commit: f54fc36cc29533ea0ea49eacc345b7f769491bf8
Parents: f732f57
Author: Dmitiry Setrakyan
Authored: Sat Mar 14 05:57:52 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sat Mar 14 05:57:52 2015 -0700
--
.../basic-concepts/async-support.md | 92 -
.../basic-concepts/getting-started.md | 235 ---
.../basic-concepts/ignite-life-cycel.md | 122 --
.../documentation/basic-concepts/maven-setup.md | 85 -
.../basic-concepts/what-is-ignite.md| 48 -
.../basic-concepts/zero-deployment.md | 73 -
wiki/documentation/clustering/aws-config.md | 59 -
wiki/documentation/clustering/cluster-config.md | 193 --
wiki/documentation/clustering/cluster-groups.md | 227 ---
wiki/documentation/clustering/cluster.md| 145 --
.../documentation/clustering/leader-election.md | 76 -
wiki/documentation/clustering/network-config.md | 118 --
wiki/documentation/clustering/node-local-map.md | 52 -
.../documentation/compute-grid/checkpointing.md | 255 ---
.../compute-grid/collocate-compute-and-data.md | 46 -
wiki/documentation/compute-grid/compute-grid.md | 73 -
.../documentation/compute-grid/compute-tasks.md | 122 --
.../compute-grid/distributed-closures.md| 124 --
.../compute-grid/executor-service.md| 40 -
.../compute-grid/fault-tolerance.md | 96 -
.../compute-grid/job-scheduling.md | 86 -
.../compute-grid/load-balancing.md | 76 -
.../data-grid/affinity-collocation.md | 95 -
.../data-grid/automatic-db-integration.md | 119 --
wiki/documentation/data-grid/cache-modes.md | 254 ---
wiki/documentation/data-grid/cache-queries.md | 181 --
wiki/documentation/data-grid/data-grid.md | 85 -
wiki/documentation/data-grid/data-loading.md| 94 -
wiki/documentation/data-grid/evictions.md | 103 --
.../data-grid/hibernate-l2-cache.md | 190 --
wiki/documentation/data-grid/jcache.md | 116 --
wiki/documentation/data-grid/off-heap-memory.md | 197 ---
.../documentation/data-grid/persistent-store.md | 128 --
wiki/documentation/data-grid/rebalancing.md | 122 --
wiki/documentation/data-grid/transactions.md| 144 --
.../data-grid/web-session-clustering.md | 253 ---
.../distributed-data-structures/atomic-types.md | 114 --
.../countdownlatch.md | 41 -
.../distributed-data-structures/id-generator.md | 57 -
.../queue-and-set.md| 133 --
.../distributed-events/automatic-batching.md| 33 -
wiki/documentation/distributed-events/events.md | 118 --
.../distributed-file-system/igfs.md | 18 -
.../distributed-messaging/messaging.md | 90 -
wiki/documentation/http/configuration.md| 67 -
wiki/documentation/http/rest-api.md | 1663 --
.../release-notes/release-notes.md | 30 -
.../service-grid/cluster-singletons.md | 111 --
.../service-grid/service-configuration.md | 50 -
.../service-grid/service-example.md | 111 --
wiki/documentation/service-grid/service-grid.md | 79 -
wiki/licence-prepender.sh | 51 -
52 files changed, 7290 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f54fc36c/wiki/documentation/basic-concepts/async-support.md
--
diff --git a/wiki/documentation/basic-concepts/async-support.md
b/wiki/documentation/basic-concepts/async-support.md
deleted file mode 100644
index e434f70..000
--- a/wiki/documentation/basic-concepts/async-support.md
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-All distributed methods on all Ignite APIs can be executed either
synchronously or asynchronously. However, instead of having a duplicate
asynchronous method for every synchronous one (like `get()` and `getAsync()`,
or `put()` and `putAsync()`, etc.), Ignite chose a more elegant approach, where
methods don't have to be duplicated.
-[block:api-header]
-{
- "type": "basic",
- "title": "IgniteAsyncSupport"
-}
-[/block]
-`IgniteAsyncSupport` interface adds asynchronous mode to many Ignite APIs. For
example, `IgniteCompute`, `IgniteServices`, `IgniteCache`, and
`IgniteTransactions` all extend `IgniteAsyncSupport` interface.
-
-To enable asynchronous mode, you should call `withAsync()` method.
-
-## Compute Grid Ex
[35/50] [abbrv] incubator-ignite git commit: # Removed shmem from communication
# Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c014b001
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c014b001
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c014b001
Branch: refs/heads/ignite-368
Commit: c014b0017cc271a5942e242f0d28d075355e94a6
Parents: 3f23de3
Author: Valentin Kulichenko
Authored: Fri Mar 13 17:20:36 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 17:20:36 2015 -0700
--
.../util/nio/GridShmemCommunicationClient.java | 146 ---
.../communication/tcp/TcpCommunicationSpi.java | 44 ++
2 files changed, 10 insertions(+), 180 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c014b001/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
deleted file mode 100644
index b0a6df3..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.nio;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-/**
- *
- */
-public class GridShmemCommunicationClient extends
GridAbstractCommunicationClient {
-/** */
-private final IpcSharedMemoryClientEndpoint shmem;
-
-/** */
-private final ByteBuffer writeBuf;
-
-/** */
-private final MessageFormatter formatter;
-
-/**
- * @param metricsLsnr Metrics listener.
- * @param port Shared memory IPC server port.
- * @param connTimeout Connection timeout.
- * @param log Logger.
- * @param formatter Message formatter.
- * @throws IgniteCheckedException If failed.
- */
-public GridShmemCommunicationClient(GridNioMetricsListener metricsLsnr,
int port, long connTimeout,
-IgniteLogger log, MessageFormatter formatter) throws
IgniteCheckedException {
-super(metricsLsnr);
-
-assert metricsLsnr != null;
-assert port > 0 && port < 0x;
-assert connTimeout >= 0;
-
-shmem = new IpcSharedMemoryClientEndpoint(port, (int)connTimeout, log);
-
-writeBuf = ByteBuffer.allocate(8 << 10);
-
-writeBuf.order(ByteOrder.nativeOrder());
-
-this.formatter = formatter;
-}
-
-/** {@inheritDoc} */
-@Override public synchronized void
doHandshake(IgniteInClosure2X handshakeC)
-throws IgniteCheckedException {
-handshakeC.applyx(shmem.inputStream(), shmem.outputStream());
-}
-
-/** {@inheritDoc} */
-@Override public boolean close() {
-boolean res = super.close();
-
-if (res)
-shmem.close();
-
-return res;
-}
-
-/** {@inheritDoc} */
-@Override public void forceClose() {
-super.forceClose();
-
-// Do not call forceClose() here.
-shmem.close();
-}
-
-/** {@inheritDoc} */
-@Override public synchronized void sendMessage(byte[] data, int len)
throws IgniteCheckedException {
-if (closed())
-throw new IgniteCheckedException("Communication client was closed:
" + this);
-
-try {
-shmem.outputStream().write(data, 0, len);
-
-metricsLsnr.onBytesSent(len);
-}
-catch (IOException e) {
-throw new IgniteCheckedException("Failed to send message to remote
node: " +
[34/50] [abbrv] incubator-ignite git commit: # Removed shmem from communication
# Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f23de3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f23de3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f23de3d
Branch: refs/heads/ignite-368
Commit: 3f23de3ddf79c2dc1b2a08202d5d9c42c86d9a1e
Parents: fba3155
Author: Valentin Kulichenko
Authored: Fri Mar 13 16:50:51 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 16:50:51 2015 -0700
--
modules/core/pom.xml| 14 ++
.../igfs/IgfsIpcEndpointConfiguration.java | 20 ++--
...cpCommunicationSpiMultithreadedSelfTest.java | 2 +-
3 files changed, 25 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 42c892d..f78a6df 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -35,6 +35,13 @@
ignite-core
+
+
+Maven Central Staging
+
https://oss.sonatype.org/content/repositories/orggridgain-1246
+
+
+
javax.cache
@@ -126,6 +133,13 @@
jdk15
test
+
+
+org.gridgain
+ignite-shmem
+RELEASE
+test
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
index 6aaf739..0b0e9cc 100644
---
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
@@ -26,8 +26,8 @@ import static org.apache.ignite.igfs.IgfsIpcEndpointType.*;
* IGFS IPC endpoint configuration.
*/
public class IgfsIpcEndpointConfiguration {
-/** Default endpoint type; TCP for Windows, SHMEM otherwise. */
-public static IgfsIpcEndpointType DFLT_TYP = U.isWindows() ? TCP : SHMEM;
+/** Default endpoint type is TCP. */
+public static IgfsIpcEndpointType DFLT_TYPE = TCP;
/** Default host. */
public static String DFLT_HOST = "127.0.0.1";
@@ -48,7 +48,7 @@ public class IgfsIpcEndpointConfiguration {
public static final String DFLT_TOKEN_DIR_PATH = "ipc/shmem";
/** Endpoint type. */
-private IgfsIpcEndpointType typ = DFLT_TYP;
+private IgfsIpcEndpointType type = DFLT_TYPE;
/** Host. */
private String host = DFLT_HOST;
@@ -75,7 +75,7 @@ public class IgfsIpcEndpointConfiguration {
* @param cfg Configuration to copy.
*/
public IgfsIpcEndpointConfiguration(IgfsIpcEndpointConfiguration cfg) {
-typ = cfg.getType();
+type = cfg.getType();
host = cfg.getHost();
port = cfg.getPort();
memSize = cfg.getMemorySize();
@@ -88,12 +88,12 @@ public class IgfsIpcEndpointConfiguration {
*
* Shared memory is recommended approach for Linux-based systems. For
Windows TCP is the only available option.
*
- * Defaults to {@link #DFLT_TYP}.
+ * Defaults to {@link #DFLT_TYPE}.
*
* @return Endpoint type.
*/
public IgfsIpcEndpointType getType() {
-return typ;
+return type;
}
/**
@@ -102,12 +102,12 @@ public class IgfsIpcEndpointConfiguration {
*
* Shared memory is recommended approach for Linux-based systems. For
Windows TCP is the only available option.
*
- * Defaults to {@link #DFLT_TYP}.
+ * Defaults to {@link #DFLT_TYPE}.
*
- * @param typ Endpoint type.
+ * @param type Endpoint type.
*/
-public void setType(IgfsIpcEndpointType typ) {
-this.typ = typ;
+public void setType(IgfsIpcEndpointType type) {
+this.type = type;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 03cd4d2..938b2bf 10064
[28/50] [abbrv] incubator-ignite git commit: # ignite-cleanup-bin Removed shmem binaries.
# ignite-cleanup-bin Removed shmem binaries. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/76bb9c3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/76bb9c3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/76bb9c3d Branch: refs/heads/ignite-368 Commit: 76bb9c3daf04bc31c628b9409eda817f43fa5587 Parents: 3e3905b Author: anovikov Authored: Fri Mar 13 21:51:54 2015 +0700 Committer: anovikov Committed: Fri Mar 13 21:55:00 2015 +0700 -- modules/core/pom.xml | 13 + .../META-INF/native/linux64/libigniteshmem.so | Bin 138345 -> 0 bytes .../java/META-INF/native/osx/libigniteshmem.dylib | Bin 33116 -> 0 bytes pom.xml | 2 -- 4 files changed, 13 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76bb9c3d/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 42c892d..850e62d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -35,6 +35,13 @@ ignite-core + + +GridGain External Repository + http://www.gridgainsystems.com/nexus/content/repositories/external + + + javax.cache @@ -126,6 +133,12 @@ jdk15 test + + +org.gridgain +ignite-shmem +1.0.0 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76bb9c3d/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so deleted file mode 100755 index 36de663..000 Binary files a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76bb9c3d/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib -- diff --git a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib deleted file mode 100755 index 2152401..000 Binary files a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76bb9c3d/pom.xml -- diff --git a/pom.xml b/pom.xml index 2196816..b4f1dba 100644 --- a/pom.xml +++ b/pom.xml @@ -593,8 +593,6 @@ src/main/java/META-INF/services/javax.cache.spi.CachingProvider src/main/java/org/jetbrains/annotations/*.java src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider - modules/winservice/IgniteService.sln - modules/winservice/IgniteService/IgniteService.csproj ipc/shmem/**/Makefile.in ipc/shmem/**/Makefile
[19/50] [abbrv] incubator-ignite git commit: # ignite-cleanup-bin Add java check in build. Removed igniteservice.
# ignite-cleanup-bin Add java check in build. Removed igniteservice.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3e3905ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3e3905ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3e3905ba
Branch: refs/heads/ignite-368
Commit: 3e3905ba5d6b8cbaa7ecc2f0b5bc035cd99165be
Parents: b2f1e43
Author: anovikov
Authored: Fri Mar 13 17:34:59 2015 +0700
Committer: anovikov
Committed: Fri Mar 13 17:34:59 2015 +0700
--
bin/include/igniteservice.exe | Bin 6144 -> 0 bytes
.../core/src/test/bin/start-nodes-custom.bat| 3 +-
.../util/nodestart/IgniteNodeCallableImpl.java | 42 +
modules/winservice/IgniteService.sln| 22 ---
.../winservice/IgniteService/IgniteService.cs | 170 ---
.../IgniteService/IgniteService.csproj | 90 --
modules/winservice/README.md| 20 ---
pom.xml | 20 +++
8 files changed, 24 insertions(+), 343 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e3905ba/bin/include/igniteservice.exe
--
diff --git a/bin/include/igniteservice.exe b/bin/include/igniteservice.exe
deleted file mode 100644
index 66deb9c..000
Binary files a/bin/include/igniteservice.exe and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e3905ba/modules/core/src/test/bin/start-nodes-custom.bat
--
diff --git a/modules/core/src/test/bin/start-nodes-custom.bat
b/modules/core/src/test/bin/start-nodes-custom.bat
index 03897bb..bfa226e 100644
--- a/modules/core/src/test/bin/start-nodes-custom.bat
+++ b/modules/core/src/test/bin/start-nodes-custom.bat
@@ -19,6 +19,5 @@ set SCRIPT_DIR=%~dp0
if %SCRIPT_DIR:~-1,1% == \ set SCRIPT_DIR=%SCRIPT_DIR:~0,-1%
-:: -np option is mandatory, if it is not provided then we will wait for a user
input,
-:: as a result igniteservice windows service hangs forever
+:: -np option is mandatory, if it is not provided then we will wait for a user
input.
call "%SCRIPT_DIR%\..\..\..\..\..\bin\ignite.bat" -v -np
modules\core\src\test\config\spring-start-nodes-attr.xml
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e3905ba/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
--
diff --git
a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
index d48ef6d..68e2be4 100644
---
a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
+++
b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
@@ -41,21 +41,9 @@ public class IgniteNodeCallableImpl implements
IgniteNodeCallable {
/** Default Ignite home path for Linux (taken from environment variable).
*/
private static final String DFLT_IGNITE_HOME_LINUX = "$IGNITE_HOME";
-/** Default start script path for Windows. */
-private static final String DFLT_SCRIPT_WIN = "bin\\ignite.bat -v -np";
-
/** Default start script path for Linux. */
private static final String DFLT_SCRIPT_LINUX = "bin/ignite.sh -v";
-/**
- * Logs folder for Windows.
- * Folder for linux is configured in {@code ignite-log4j.xml}.
- */
-private static final String LOG_DIR_WIN = "work\\log";
-
-/** Windows service executable. */
-private static final String SVC_EXE = "bin\\include\\igniteservice.exe";
-
/** Date format for log file name. */
private static final SimpleDateFormat FILE_NAME_DATE_FORMAT = new
SimpleDateFormat("MM-dd---HH-mm-ss");
@@ -125,7 +113,7 @@ public class IgniteNodeCallableImpl implements
IgniteNodeCallable {
String script = spec.script();
if (script == null)
-script = win ? DFLT_SCRIPT_WIN : DFLT_SCRIPT_LINUX;
+script = DFLT_SCRIPT_LINUX;
String cfg = spec.configuration();
@@ -136,32 +124,8 @@ public class IgniteNodeCallableImpl implements
IgniteNodeCallable {
String scriptOutputFileName = FILE_NAME_DATE_FORMAT.format(new
Date()) + '-'
+ UUID.randomUUID().toString().substring(0, 8) + ".log";
-if (win) {
-String logDir = igniteHome + '\\' + LOG_DIR_WIN;
-String tmpDir = env(ses, "%TMP%", logDir);
-String scriptOutputDir = tmpDir + "\
[07/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa22af39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa22af39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa22af39 Branch: refs/heads/ignite-368 Commit: fa22af39527216e8eb3cdb95b468822ea1c388db Parents: e13d9d5 f64212d Author: ivasilinets Authored: Thu Mar 12 20:20:16 2015 +0300 Committer: ivasilinets Committed: Thu Mar 12 20:20:16 2015 +0300 -- DEVNOTES.txt|2 +- LICENSE.txt |2 +- NOTICE.txt |0 RELEASE_NOTES.txt |0 config/hadoop/default-config.xml| 10 +- examples/config/filesystem/example-igfs.xml | 13 +- examples/config/store/example-database.script | 15 + .../datagrid/CacheDataLoaderExample.java| 85 -- .../datagrid/CacheDataStreamerExample.java | 85 ++ .../datagrid/CachePopularNumbersExample.java| 10 +- .../ScalarCachePopularNumbersExample.scala | 14 +- .../ignite/examples/CacheExamplesSelfTest.java |6 +- .../ignite/codegen/MessageCodeGenerator.java|4 +- modules/core/licenses/snaptree-bsd-license.txt | 35 + modules/core/licenses/snaptree-license.txt | 35 - modules/core/licenses/sun-bcl-license.txt | 50 - .../src/main/java/org/apache/ignite/Ignite.java | 10 +- .../org/apache/ignite/IgniteDataLoader.java | 379 - .../org/apache/ignite/IgniteDataStreamer.java | 401 + .../apache/ignite/cluster/ClusterMetrics.java | 66 +- .../configuration/FileSystemConfiguration.java | 55 +- .../igfs/IgfsIpcEndpointConfiguration.java | 241 +++ .../apache/ignite/igfs/IgfsIpcEndpointType.java | 29 + .../ClusterLocalNodeMetricsMXBeanImpl.java |5 + .../ignite/internal/ClusterMetricsSnapshot.java | 26 +- .../ignite/internal/GridKernalContext.java |8 +- .../ignite/internal/GridKernalContextImpl.java | 12 +- .../org/apache/ignite/internal/GridTopic.java |2 +- .../apache/ignite/internal/IgniteKernal.java| 16 +- .../communication/GridIoMessageFactory.java |8 +- .../processors/cache/GridCacheAdapter.java | 22 +- .../processors/cache/GridCacheMapEntry.java |2 +- .../GridDistributedCacheAdapter.java| 10 +- .../distributed/dht/GridDhtTxPrepareFuture.java |6 +- .../transactions/IgniteTxLocalAdapter.java |4 +- .../version/GridCacheRawVersionedEntry.java |4 +- .../dataload/GridDataLoadCacheUpdaters.java | 206 --- .../dataload/GridDataLoadRequest.java | 451 -- .../dataload/GridDataLoadResponse.java | 166 --- .../dataload/GridDataLoadUpdateJob.java | 150 -- .../dataload/GridDataLoaderFuture.java | 62 - .../dataload/GridDataLoaderProcessor.java | 307 .../dataload/IgniteDataLoaderEntry.java | 170 --- .../dataload/IgniteDataLoaderImpl.java | 1391 - .../internal/processors/dataload/package.html | 24 - .../datastreamer/DataStreamProcessor.java | 307 .../datastreamer/DataStreamerCacheUpdaters.java | 206 +++ .../datastreamer/DataStreamerEntry.java | 170 +++ .../datastreamer/DataStreamerFuture.java| 60 + .../datastreamer/DataStreamerImpl.java | 1403 ++ .../datastreamer/DataStreamerRequest.java | 451 ++ .../datastreamer/DataStreamerResponse.java | 166 +++ .../datastreamer/DataStreamerUpdateJob.java | 150 ++ .../processors/datastreamer/package.html| 24 + .../dr/GridDrDataLoadCacheUpdater.java | 92 -- .../dr/IgniteDrDataStreamerCacheUpdater.java| 92 ++ .../processors/igfs/IgfsDataManager.java| 25 +- .../internal/processors/igfs/IgfsImpl.java |2 +- .../internal/processors/igfs/IgfsServer.java| 49 +- .../processors/igfs/IgfsServerManager.java | 35 +- .../processors/rest/GridRestCommand.java|8 +- .../processors/rest/GridRestProcessor.java |2 - .../processors/streamer/IgniteStreamerImpl.java |4 +- .../ignite/internal/util/IgniteUtils.java |2 +- .../util/ipc/IpcServerEndpointDeserializer.java | 66 - .../visor/node/VisorIgfsConfiguration.java |5 +- .../mxbean/ClusterLocalNodeMetricsMXBean.java |4 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 11 +- .../resources/META-INF/licenses/apache-2.0.txt |0 modules/core/src/test/config/igfs-loopback.xml |6 +- modules/core/src/test/config/igfs-shmem.xml |8 +- .../ignite/internal/ClusterMetricsSelfTest.java |2 + .../cache/IgniteCacheTxPreloadNoWrite
[50/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-368' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-368
Merge branches 'ignite-368' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-368 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b330068f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b330068f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b330068f Branch: refs/heads/ignite-368 Commit: b330068febe72ef63c88770679a6507b966577d4 Parents: ab6119e 42ee9ae Author: AKuznetsov Authored: Mon Mar 16 10:36:55 2015 +0700 Committer: AKuznetsov Committed: Mon Mar 16 10:36:55 2015 +0700 -- assembly/dependencies-hadoop.xml|7 +- bin/ignite-schema-import.bat| 27 +- bin/ignite-schema-import.sh |8 +- bin/include/igniteservice.exe | Bin 6144 -> 0 bytes examples/config/store/example-database.script | 22 +- .../config/store/example-jdbc-pojo-store.xml| 142 -- examples/pom.xml|7 + .../store/CacheNodeWithStoreStartup.java| 45 +- .../datagrid/store/CacheStoreExample.java | 19 + .../store/jdbc/CacheJdbcPojoPersonStore.java| 11 - .../examples/datagrid/store/model/Person.java |2 +- .../datagrid/store/model/PersonKey.java | 97 - modules/core/pom.xml|7 + .../META-INF/native/linux64/libigniteshmem.so | Bin 138345 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib| Bin 33116 -> 0 bytes .../java/org/apache/ignite/IgniteCache.java | 55 +- .../igfs/IgfsIpcEndpointConfiguration.java | 20 +- .../apache/ignite/igfs/IgfsIpcEndpointType.java |2 +- .../processors/cache/CacheProjection.java | 60 + .../processors/cache/GridCacheAdapter.java | 173 +- .../cache/GridCacheProjectionImpl.java | 25 + .../processors/cache/GridCacheProxyImpl.java| 60 + .../processors/cache/IgniteCacheProxy.java | 61 + .../ignite/internal/util/IgniteUtils.java | 27 +- .../util/nio/GridShmemCommunicationClient.java | 146 -- .../communication/tcp/TcpCommunicationSpi.java | 392 + .../tcp/TcpCommunicationSpiMBean.java |8 - .../core/src/test/bin/start-nodes-custom.bat|3 +- .../src/test/config/io-manager-benchmark.xml|1 - .../config/spring-cache-put-remove-load.xml |6 - .../core/src/test/config/store/jdbc/Ignite.xml |2 +- .../cache/store/jdbc/model/Organization.java|2 +- .../cache/store/jdbc/model/OrganizationKey.java |2 +- .../ignite/cache/store/jdbc/model/Person.java |2 +- .../store/jdbc/model/PersonComplexKey.java |2 +- .../cache/store/jdbc/model/PersonKey.java |2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 195 ++ .../IgniteCacheContainsKeyAbstractSelfTest.java |2 - .../GridCacheAtomicTimeoutSelfTest.java |6 - .../IgniteCrossCacheTxStoreSelfTest.java|6 - .../igfs/IgfsExUniversalFileSystemAdapter.java | 17 + .../igfs/UniversalFileSystemAdapter.java| 17 + .../communication/GridIoManagerBenchmark0.java |1 - .../spi/GridTcpSpiForwardingSelfTest.java |1 - .../GridTcpCommunicationSpiAbstractTest.java| 17 +- ...mmunicationSpiConcurrentConnectSelfTest.java |1 - .../GridTcpCommunicationSpiConfigSelfTest.java |2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 13 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 - ...ommunicationSpiMultithreadedTcpSelfTest.java | 28 - ...dTcpCommunicationSpiRecoveryAckSelfTest.java |1 - ...GridTcpCommunicationSpiRecoverySelfTest.java |1 - .../GridTcpCommunicationSpiShmemSelfTest.java | 31 - .../tcp/GridTcpCommunicationSpiTcpSelfTest.java |6 +- .../GridCacheStoreValueBytesNode.java |5 - .../IgniteSpiCommunicationSelfTestSuite.java|4 +- modules/hadoop/pom.xml |6 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 11 - ...oopSecondaryFileSystemConfigurationTest.java | 12 - .../IgniteHadoopFileSystemAbstractSelfTest.java | 14 - ...IgniteHadoopFileSystemHandshakeSelfTest.java |7 - .../IgniteHadoopFileSystemIpcCacheSelfTest.java |7 - .../hadoop/HadoopAbstractSelfTest.java |6 - modules/schema-import/pom.xml |6 - .../schema-import/src/main/java/media/style.css | 19 +- .../ignite/schema/generator/XmlGenerator.java | 28 +- .../apache/ignite/schema/model/IndexItem.java | 54 + .../ignite/schema/model/PojoDescriptor.java |9 +- .../org/apache/ignite/schema/ui/MessageBox.java | 16 +- .../ignite/schema/ui/SchemaImportApp.java | 61 +- .../schema/test/AbstractSchemaImportTest.java | 19 +- .../util/nodestart/IgniteNodeCallableImpl.java | 42 +- .../commands/c
[32/50] [abbrv] incubator-ignite git commit: Removed shmem from communication
Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96742b52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96742b52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96742b52
Branch: refs/heads/ignite-368
Commit: 96742b5286b66606d1dc209ecc5afc88cedf1d43
Parents: c2a895d
Author: Valentin Kulichenko
Authored: Fri Mar 13 16:07:47 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 16:07:47 2015 -0700
--
modules/core/pom.xml| 13 -
.../apache/ignite/igfs/IgfsIpcEndpointType.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 348 +--
.../tcp/TcpCommunicationSpiMBean.java | 8 -
.../src/test/config/io-manager-benchmark.xml| 1 -
.../config/spring-cache-put-remove-load.xml | 6 -
.../IgniteCacheContainsKeyAbstractSelfTest.java | 2 -
.../GridCacheAtomicTimeoutSelfTest.java | 6 -
.../IgniteCrossCacheTxStoreSelfTest.java| 6 -
.../communication/GridIoManagerBenchmark0.java | 1 -
.../spi/GridTcpSpiForwardingSelfTest.java | 1 -
.../GridTcpCommunicationSpiAbstractTest.java| 17 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 1 -
.../GridTcpCommunicationSpiConfigSelfTest.java | 2 -
...cpCommunicationSpiMultithreadedSelfTest.java | 13 +-
...pCommunicationSpiMultithreadedShmemTest.java | 28 --
...ommunicationSpiMultithreadedTcpSelfTest.java | 28 --
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 -
...GridTcpCommunicationSpiRecoverySelfTest.java | 1 -
.../GridTcpCommunicationSpiShmemSelfTest.java | 31 --
.../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 6 +-
.../GridCacheStoreValueBytesNode.java | 5 -
.../IgniteSpiCommunicationSelfTestSuite.java| 4 +-
modules/hadoop/pom.xml | 13 +
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 11 -
...oopSecondaryFileSystemConfigurationTest.java | 12 -
.../IgniteHadoopFileSystemAbstractSelfTest.java | 14 -
...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 -
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 -
.../hadoop/HadoopAbstractSelfTest.java | 6 -
modules/yardstick/config/ignite-base-config.xml | 6 -
.../yardstick/config/ignite-store-config.xml| 6 -
32 files changed, 22 insertions(+), 591 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 850e62d..42c892d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -35,13 +35,6 @@
ignite-core
-
-
-GridGain External Repository
-
http://www.gridgainsystems.com/nexus/content/repositories/external
-
-
-
javax.cache
@@ -133,12 +126,6 @@
jdk15
test
-
-
-org.gridgain
-ignite-shmem
-1.0.0
-
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
index 475d36f..a7ecaa2 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
@@ -25,5 +25,5 @@ public enum IgfsIpcEndpointType {
SHMEM,
/** TCP endpoint. */
-TCP;
+TCP
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/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 852f369..b38dc15 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
@@ -25,19 +25,15 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.ipc.s
[15/50] [abbrv] incubator-ignite git commit: #ignite-333: Fix IgniteCache javadoc.
#ignite-333: Fix IgniteCache javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ada58813
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ada58813
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ada58813
Branch: refs/heads/ignite-368
Commit: ada58813621c82c29954d78720f36a3ce134d139
Parents: b39bfbe
Author: ivasilinets
Authored: Fri Mar 13 12:23:20 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 13 12:23:20 2015 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 20
.../processors/cache/CacheProjection.java | 11 +--
2 files changed, 9 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ada58813/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 5a7c934..99a8934 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -380,7 +380,7 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
@Override public void clear();
/**
- * Clear key, without notifying listeners or
+ * Clear entry from the cache, without notifying listeners or
* {@link javax.cache.integration.CacheWriter}s.
*
* @param key Key to clear.
@@ -391,7 +391,7 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
public void clear(K key);
/**
- * Clear keys, without notifying listeners or
+ * Clear entries from the cache, without notifying listeners or
* {@link javax.cache.integration.CacheWriter}s.
*
* @param keys Keys to clear.
@@ -405,35 +405,23 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
* Clears an entry from this cache and swap storage only if the entry
* is not currently locked, and is not participating in a transaction.
*
- * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and
- * {@link CacheFlag#SKIP_SWAP} is not enabled, the evicted entries will
- * also be cleared from swap.
- *
* Note that this operation is local as it merely clears
* an entry from local cache. It does not remove entries from
* remote caches or from underlying persistent storage.
- * This method is not transactionally consistent.
- * Transactional semantics must be guaranteed outside of Ignite.
*
* @param key Key to clear.
*/
public void localClear(K key);
/**
- * Clears entries from this cache and swap storage only if the entry
+ * Clears an entry from this cache and swap storage only if the entry
* is not currently locked, and is not participating in a transaction.
*
- * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and
- * {@link CacheFlag#SKIP_SWAP} is not enabled, the evicted entries will
- * also be cleared from swap.
- *
* Note that this operation is local as it merely clears
* an entry from local cache. It does not remove entries from
* remote caches or from underlying persistent storage.
- * This method is not transactionally consistent.
- * Transactional semantics must be guaranteed outside of Ignite.
*
- * @param keys Set of keys to clear.
+ * @param keys Keys to clear.
*/
public void localClearAll(Set keys);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ada58813/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 66507f9..f268c2f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -1265,6 +1265,9 @@ public interface CacheProjection extends
Iterable> {
* Note that this operation is local as it merely clears
* an entry from local cache. It does not remove entries from
* remote caches or from underlying persistent storage.
+ * Cache Flags
+ * This method is not available if any of the following flags are set on
projection:
+ * {@link CacheFlag#READ}.
*
* @param keys Keys to clearLocally.
* @r
[31/50] [abbrv] incubator-ignite git commit: # Fixed message.
# Fixed message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2a895d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2a895d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2a895d4
Branch: refs/heads/ignite-368
Commit: c2a895d4957e5b7429b1de142edc2873e591849c
Parents: e4afa03
Author: AKuznetsov
Authored: Fri Mar 13 22:59:55 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 13 22:59:55 2015 +0700
--
.../ignite/internal/util/nodestart/IgniteNodeCallableImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2a895d4/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
--
diff --git
a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
index 68e2be4..9b873bf 100644
---
a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
+++
b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
@@ -125,7 +125,7 @@ public class IgniteNodeCallableImpl implements
IgniteNodeCallable {
+ UUID.randomUUID().toString().substring(0, 8) + ".log";
if (win)
-throw new UnsupportedOperationException("Apache Ignite can't
be run as service under Windows.");
+throw new UnsupportedOperationException("Apache Ignite cannot
be auto-started on Windows from IgniteCluster.startNodes(…) API.");
else { // Assume Unix.
int spaceIdx = script.indexOf(' ');
[39/50] [abbrv] incubator-ignite git commit: Removed shmem from communication
Removed shmem from communication Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d3f2abf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d3f2abf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d3f2abf Branch: refs/heads/ignite-368 Commit: 5d3f2abfc838c9fdd054a97cefad23ab92e8f6fd Parents: 8c598c8 Author: Valentin Kulichenko Authored: Fri Mar 13 19:46:06 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 13 19:46:06 2015 -0700 -- examples/pom.xml | 7 --- modules/core/pom.xml | 7 --- modules/hadoop/pom.xml | 7 --- 3 files changed, 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3f2abf/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 8fea360..337f0aa 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,13 +32,6 @@ ignite-examples - - -Maven Central Staging - https://oss.sonatype.org/content/repositories/orggridgain-1246 - - - javax.cache http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3f2abf/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f78a6df..af72397 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -35,13 +35,6 @@ ignite-core - - -Maven Central Staging - https://oss.sonatype.org/content/repositories/orggridgain-1246 - - - javax.cache http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3f2abf/modules/hadoop/pom.xml -- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index 9c44bfb..ec65f0f 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -35,13 +35,6 @@ ignite-hadoop - - -Maven Central Staging - https://oss.sonatype.org/content/repositories/orggridgain-1246 - - - org.apache.ignite
[41/50] [abbrv] incubator-ignite git commit: # sprint-2 - fixed devnotes file.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f54fc36c/wiki/documentation/http/configuration.md
--
diff --git a/wiki/documentation/http/configuration.md
b/wiki/documentation/http/configuration.md
deleted file mode 100644
index 4696661..000
--- a/wiki/documentation/http/configuration.md
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-[block:api-header]
-{
- "type": "basic",
- "title": "General Configuration"
-}
-[/block]
-
-[block:parameters]
-{
- "data": {
-"h-0": "Parameter name",
-"h-3": "Default value",
-"h-2": "Optional",
-"h-1": "Description",
-"0-0": "**setSecretKey(String)**",
-"0-1": "Defines secret key used for client authentication. When provided,
client request must contain HTTP header **X-Signature** with Base64 encoded
SHA1 hash of the string \"[1];[2]\", where [1] is timestamp in milliseconds and
[2] is the secret key.",
-"0-3": "**null**",
-"0-2": "Yes",
-"1-0": "**setPortRange(int)**",
-"1-1": "Port range for Jetty server. In case port provided in Jetty
configuration or **IGNITE_JETTY_PORT** system property is already in use,
Ignite will iteratively increment port by 1 and try binding once again until
provided port range is exceeded.",
-"1-3": "**100**",
-"1-2": "Yes",
-"2-0": "**setJettyPath(String)**",
-"2-1": "Path to Jetty configuration file. Should be either absolute or
relative to **IGNITE_HOME**. If not provided then GridGain will start Jetty
server with simple HTTP connector. This connector will use
**IGNITE_JETTY_HOST** and **IGNITE_JETTY_PORT** system properties as host and
port respectively. In case **IGNITE_JETTY_HOST** is not provided, localhost
will be used as default. In case **IGNITE_JETTY_PORT** is not provided, port
8080 will be used as default.",
-"2-3": "**null**",
-"2-2": "Yes"
- },
- "cols": 4,
- "rows": 3
-}
-[/block]
-
-[block:api-header]
-{
- "type": "basic",
- "title": "Sample Jetty XML configuration"
-}
-[/block]
-
-[block:code]
-{
- "codes": [
-{
- "code": "\nhttp://www.eclipse.org/jetty/configure.dtd\";>\n\n\n
\n\n20\n200\n
\n\n\nhttps\n8443\ntrue\ntrue\n\n\n\n\n\n\n\n
\n\n
\n\n
\n\n
\n\n \n \t\n
\n \n \t\n
3\ntrue\n\n\n
\n\n\n\n\n
\n\n
\n\n\n
\n\nfalse\n",
- "language": "xml",
- "name": ""
-}
- ]
-}
-[/block]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f54fc36c/wiki/documentation/http/rest-api.md
--
diff --git a/wiki/documentation/http/rest-api.md
b/wiki/documentation/http/rest-api.md
deleted file mode 100644
index 26f3240..000
--- a/wiki/documentation/http/rest-api.md
+++ /dev/null
@@ -1,1663 +0,0 @@
-
-
-Ignite provides HTTP REST client that gives you the ability to communicate
with the grid over HTTP and HTTPS protocols using REST approach. REST APIs can
be used to perform various operations like read/write from/to cache, execute
tasks, get cache and node metrics and more.
-
-* [Returned value](#returned-value)
-* [Log](#log)
-* [Version](#version)
-* [Decrement](#decrement)
-* [Increment](#increment)
-* [Cache metrics](#cache-metrics)
-* [Compare-And-Swap](#compare-and-swap)
-* [Prepend](#prepend)
-* [Append](#append)
-* [Replace](#replace)
-* [Remove all](#remove-all)
-* [Remove](#remove)
-* [Add](#add)
-* [Put all](#put-all)
-* [Put](#put)
-* [Get all](#get-all)
-* [Get](#get)
-* [Node](#node)
-* [Topology](#topology)
-* [Execute](#execute)
-* [Result](#result)
-
-[block:api-header]
-{
- "type": "basic",
- "title": "Returned value"
-}
-[/block]
-HTTP REST request returns JSON object which has similar structure for each
command. This object has the following structure:
-[block:parameters]
-{
- "data": {
-"h-0": "name",
-"h-1": "type",
-"h-2": "description",
-"h-3": "example",
-"0-0": "affinityNodeId",
-"0-1": "string",
-"0-2": "Affinity node ID.",
-"0-3": "2bd7b049-3fa0-4c44-9a6d-b5c7a597ce37",
-"1-0": "error",
-"1-1": "string",
-"1-2": "The field contains description of error if server could not handle
the request",
-"1-3": "specifically for each command",
-"2-0": "response",
-"2-1": "jsonObject",
-"2-2": "The field contains result of command.",
-"2-3"
svn commit: r1666854 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 04:30:33 2015 New Revision: 1666854 URL: http://svn.apache.org/r1666854 Log: Community page Added: incubator/ignite/site/trunk/community.html (with props) Added: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666854&view=auto == Binary file - no diff available. Propchange: incubator/ignite/site/trunk/community.html -- svn:mime-type = application/octet-stream
svn commit: r1666855 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 04:31:45 2015 New Revision: 1666855 URL: http://svn.apache.org/r1666855 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666855&r1=1666854&r2=1666855&view=diff == Binary files - no diff available.
svn commit: r1666857 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 04:45:50 2015 New Revision: 1666857 URL: http://svn.apache.org/r1666857 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666857&r1=1666856&r2=1666857&view=diff == Binary files - no diff available.
svn commit: r1666858 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 04:46:16 2015 New Revision: 1666858 URL: http://svn.apache.org/r1666858 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666858&r1=1666857&r2=1666858&view=diff == Binary files - no diff available.
svn commit: r1666859 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 04:48:48 2015 New Revision: 1666859 URL: http://svn.apache.org/r1666859 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666859&r1=1666858&r2=1666859&view=diff == Binary files - no diff available.
svn commit: r1666860 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 04:50:22 2015 New Revision: 1666860 URL: http://svn.apache.org/r1666860 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666860&r1=1666859&r2=1666860&view=diff == Binary files - no diff available.
svn commit: r1666861 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 04:51:22 2015 New Revision: 1666861 URL: http://svn.apache.org/r1666861 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666861&r1=1666860&r2=1666861&view=diff == Binary files - no diff available.
svn commit: r1666864 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:10:43 2015 New Revision: 1666864 URL: http://svn.apache.org/r1666864 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666864&r1=1666863&r2=1666864&view=diff == Binary files - no diff available.
svn commit: r1666865 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:11:09 2015 New Revision: 1666865 URL: http://svn.apache.org/r1666865 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666865&r1=1666864&r2=1666865&view=diff == Binary files - no diff available.
svn commit: r1666867 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:12:08 2015 New Revision: 1666867 URL: http://svn.apache.org/r1666867 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666867&r1=1666866&r2=1666867&view=diff == Binary files - no diff available.
svn commit: r1666866 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:11:27 2015 New Revision: 1666866 URL: http://svn.apache.org/r1666866 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666866&r1=1666865&r2=1666866&view=diff == Binary files - no diff available.
svn commit: r1666868 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:12:24 2015 New Revision: 1666868 URL: http://svn.apache.org/r1666868 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666868&r1=1666867&r2=1666868&view=diff == Binary files - no diff available.
svn commit: r1666869 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:17:08 2015 New Revision: 1666869 URL: http://svn.apache.org/r1666869 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666869&r1=1666868&r2=1666869&view=diff == Binary files - no diff available.
svn commit: r1666870 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:20:59 2015 New Revision: 1666870 URL: http://svn.apache.org/r1666870 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666870&r1=1666869&r2=1666870&view=diff == Binary files - no diff available.
svn commit: r1666871 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:22:05 2015 New Revision: 1666871 URL: http://svn.apache.org/r1666871 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666871&r1=1666870&r2=1666871&view=diff == Binary files - no diff available.
svn commit: r1666872 - /incubator/ignite/site/trunk/community.html
Author: dsetrakyan Date: Mon Mar 16 05:23:00 2015 New Revision: 1666872 URL: http://svn.apache.org/r1666872 Log: Community page Modified: incubator/ignite/site/trunk/community.html Modified: incubator/ignite/site/trunk/community.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/community.html?rev=1666872&r1=1666871&r2=1666872&view=diff == Binary files - no diff available.
[05/39] incubator-ignite git commit: # Removed shmem from communication
# Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f23de3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f23de3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f23de3d
Branch: refs/heads/ignite-45
Commit: 3f23de3ddf79c2dc1b2a08202d5d9c42c86d9a1e
Parents: fba3155
Author: Valentin Kulichenko
Authored: Fri Mar 13 16:50:51 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 16:50:51 2015 -0700
--
modules/core/pom.xml| 14 ++
.../igfs/IgfsIpcEndpointConfiguration.java | 20 ++--
...cpCommunicationSpiMultithreadedSelfTest.java | 2 +-
3 files changed, 25 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 42c892d..f78a6df 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -35,6 +35,13 @@
ignite-core
+
+
+Maven Central Staging
+
https://oss.sonatype.org/content/repositories/orggridgain-1246
+
+
+
javax.cache
@@ -126,6 +133,13 @@
jdk15
test
+
+
+org.gridgain
+ignite-shmem
+RELEASE
+test
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
index 6aaf739..0b0e9cc 100644
---
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
@@ -26,8 +26,8 @@ import static org.apache.ignite.igfs.IgfsIpcEndpointType.*;
* IGFS IPC endpoint configuration.
*/
public class IgfsIpcEndpointConfiguration {
-/** Default endpoint type; TCP for Windows, SHMEM otherwise. */
-public static IgfsIpcEndpointType DFLT_TYP = U.isWindows() ? TCP : SHMEM;
+/** Default endpoint type is TCP. */
+public static IgfsIpcEndpointType DFLT_TYPE = TCP;
/** Default host. */
public static String DFLT_HOST = "127.0.0.1";
@@ -48,7 +48,7 @@ public class IgfsIpcEndpointConfiguration {
public static final String DFLT_TOKEN_DIR_PATH = "ipc/shmem";
/** Endpoint type. */
-private IgfsIpcEndpointType typ = DFLT_TYP;
+private IgfsIpcEndpointType type = DFLT_TYPE;
/** Host. */
private String host = DFLT_HOST;
@@ -75,7 +75,7 @@ public class IgfsIpcEndpointConfiguration {
* @param cfg Configuration to copy.
*/
public IgfsIpcEndpointConfiguration(IgfsIpcEndpointConfiguration cfg) {
-typ = cfg.getType();
+type = cfg.getType();
host = cfg.getHost();
port = cfg.getPort();
memSize = cfg.getMemorySize();
@@ -88,12 +88,12 @@ public class IgfsIpcEndpointConfiguration {
*
* Shared memory is recommended approach for Linux-based systems. For
Windows TCP is the only available option.
*
- * Defaults to {@link #DFLT_TYP}.
+ * Defaults to {@link #DFLT_TYPE}.
*
* @return Endpoint type.
*/
public IgfsIpcEndpointType getType() {
-return typ;
+return type;
}
/**
@@ -102,12 +102,12 @@ public class IgfsIpcEndpointConfiguration {
*
* Shared memory is recommended approach for Linux-based systems. For
Windows TCP is the only available option.
*
- * Defaults to {@link #DFLT_TYP}.
+ * Defaults to {@link #DFLT_TYPE}.
*
- * @param typ Endpoint type.
+ * @param type Endpoint type.
*/
-public void setType(IgfsIpcEndpointType typ) {
-this.typ = typ;
+public void setType(IgfsIpcEndpointType type) {
+this.type = type;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 03cd4d2..938b2bf 100644
[21/39] incubator-ignite git commit: ignite-sql-tests - offheap validation
ignite-sql-tests - offheap 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/6b0503a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b0503a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b0503a1 Branch: refs/heads/ignite-45 Commit: 6b0503a148a6ac19761bc8615edbb8ddfb117cc0 Parents: 4bf6436 Author: S.Vladykin Authored: Sun Mar 15 20:20:23 2015 +0300 Committer: S.Vladykin Committed: Sun Mar 15 20:20:23 2015 +0300 -- .../cache/GridCacheConfigurationValidationSelfTest.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b0503a1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java index dea5baf..69f77b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java @@ -84,6 +84,9 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract dfltCacheCfg.setRebalanceMode(ASYNC); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); dfltCacheCfg.setAffinity(new CacheRendezvousAffinityFunction()); +dfltCacheCfg.setIndexedTypes( +Integer.class, String.class +); // Non-default cache configuration. CacheConfiguration namedCacheCfg = defaultCacheConfiguration();
[37/39] incubator-ignite git commit: ignite-45 - Fixed listeners test.
ignite-45 - Fixed listeners 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/3df716d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3df716d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3df716d9
Branch: refs/heads/ignite-45
Commit: 3df716d94e1c9f7d254e68cbbbcf7ca7cd49656d
Parents: afe27c7
Author: Alexey Goncharuk
Authored: Sun Mar 15 22:20:47 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Mar 15 22:20:47 2015 -0700
--
.../IgniteCacheEntryListenerAbstractTest.java | 191 ---
1 file changed, 123 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3df716d9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index 66892ea..b07493d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -283,11 +283,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest
extends IgniteCacheAb
return;
lsnrCfg = new MutableCacheEntryListenerConfiguration<>(
-new Factory>() {
-@Override public CacheEntryListener create()
{
-return new NoOpCreateUpdateListener();
-}
-},
+new NoOpCreateUpdateListenerFactory(),
null,
true,
true
@@ -382,34 +378,6 @@ public abstract class IgniteCacheEntryListenerAbstractTest
extends IgniteCacheAb
* @throws Exception If failed.
*/
public void testEvents() throws Exception {
-CacheEntryCreatedListener createLsnr = new
CacheEntryCreatedListener() {
-@Override public void onCreated(Iterable> evts) {
-for (CacheEntryEvent evt
: evts)
-onEvent(evt);
-}
-};
-
-CacheEntryUpdatedListener updateLsnr = new
CacheEntryUpdatedListener() {
-@Override public void onUpdated(Iterable> evts) {
-for (CacheEntryEvent evt
: evts)
-onEvent(evt);
-}
-};
-
-CacheEntryRemovedListener rmvLsnr = new
CacheEntryRemovedListener() {
-@Override public void onRemoved(Iterable> evts) {
-for (CacheEntryEvent evt
: evts)
-onEvent(evt);
-}
-};
-
-CacheEntryExpiredListener expireLsnr = new
CacheEntryExpiredListener() {
-@Override public void onExpired(Iterable> evts) {
-for (CacheEntryEvent evt
: evts)
-onEvent(evt);
-}
-};
-
IgniteCache cache = jcache();
Map vals = new HashMap<>();
@@ -422,35 +390,31 @@ public abstract class
IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
for (Integer key : keys()) {
log.info("Check create event [key=" + key + ']');
-checkEvents(cache, createLsnr, key, true, false, false, false);
+checkEvents(cache, new CreateListenerFactory(), key, true, false,
false, false);
log.info("Check update event [key=" + key + ']');
-checkEvents(cache, updateLsnr, key, false, true, false, false);
+checkEvents(cache, new UpdateListenerFactory(), key, false, true,
false, false);
log.info("Check remove event [key=" + key + ']');
-checkEvents(cache, rmvLsnr, key, false, false, true, false);
+checkEvents(cache, new RemoveListenerFactory(), key, false, false,
true, false);
log.info("Check expire event [key=" + key + ']');
-checkEvents(cache, expireLsnr, key, false, false, false, true);
+checkEvents(cache, new ExpireListenerFactory(), key, false, false,
false, true);
log.info("Check create/update events [key=" + key + ']');
-checkEvents(cache, new CreateUpdateListener(), key, true, true,
false, false);
+checkEvents(cache, new CreateUpdateListenerFactory(), key, true,
true, false, false);
log.info("Check create/update/remove/expire events [key=" + key +
']');
-checkEvents(cache, new CreateUpdateRemoveExpireListener(), key,
true, true, true, true);
+checkEvents(ca
[06/39] incubator-ignite git commit: # Removed shmem from communication
# Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c014b001
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c014b001
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c014b001
Branch: refs/heads/ignite-45
Commit: c014b0017cc271a5942e242f0d28d075355e94a6
Parents: 3f23de3
Author: Valentin Kulichenko
Authored: Fri Mar 13 17:20:36 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 17:20:36 2015 -0700
--
.../util/nio/GridShmemCommunicationClient.java | 146 ---
.../communication/tcp/TcpCommunicationSpi.java | 44 ++
2 files changed, 10 insertions(+), 180 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c014b001/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
deleted file mode 100644
index b0a6df3..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.nio;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-/**
- *
- */
-public class GridShmemCommunicationClient extends
GridAbstractCommunicationClient {
-/** */
-private final IpcSharedMemoryClientEndpoint shmem;
-
-/** */
-private final ByteBuffer writeBuf;
-
-/** */
-private final MessageFormatter formatter;
-
-/**
- * @param metricsLsnr Metrics listener.
- * @param port Shared memory IPC server port.
- * @param connTimeout Connection timeout.
- * @param log Logger.
- * @param formatter Message formatter.
- * @throws IgniteCheckedException If failed.
- */
-public GridShmemCommunicationClient(GridNioMetricsListener metricsLsnr,
int port, long connTimeout,
-IgniteLogger log, MessageFormatter formatter) throws
IgniteCheckedException {
-super(metricsLsnr);
-
-assert metricsLsnr != null;
-assert port > 0 && port < 0x;
-assert connTimeout >= 0;
-
-shmem = new IpcSharedMemoryClientEndpoint(port, (int)connTimeout, log);
-
-writeBuf = ByteBuffer.allocate(8 << 10);
-
-writeBuf.order(ByteOrder.nativeOrder());
-
-this.formatter = formatter;
-}
-
-/** {@inheritDoc} */
-@Override public synchronized void
doHandshake(IgniteInClosure2X handshakeC)
-throws IgniteCheckedException {
-handshakeC.applyx(shmem.inputStream(), shmem.outputStream());
-}
-
-/** {@inheritDoc} */
-@Override public boolean close() {
-boolean res = super.close();
-
-if (res)
-shmem.close();
-
-return res;
-}
-
-/** {@inheritDoc} */
-@Override public void forceClose() {
-super.forceClose();
-
-// Do not call forceClose() here.
-shmem.close();
-}
-
-/** {@inheritDoc} */
-@Override public synchronized void sendMessage(byte[] data, int len)
throws IgniteCheckedException {
-if (closed())
-throw new IgniteCheckedException("Communication client was closed:
" + this);
-
-try {
-shmem.outputStream().write(data, 0, len);
-
-metricsLsnr.onBytesSent(len);
-}
-catch (IOException e) {
-throw new IgniteCheckedException("Failed to send message to remote
node: " +
[18/39] incubator-ignite git commit: ignite-sql-tests - UUID fix
ignite-sql-tests - UUID fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4bf6436c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4bf6436c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4bf6436c
Branch: refs/heads/ignite-45
Commit: 4bf6436cd19fe73b1f63b15ddd589450f24cc36e
Parents: c80dd85
Author: S.Vladykin
Authored: Sat Mar 14 20:53:26 2015 +0300
Committer: S.Vladykin
Committed: Sat Mar 14 20:53:26 2015 +0300
--
.../processors/query/h2/sql/GridSqlElement.java | 17 ++
.../query/h2/sql/GridSqlQueryParser.java| 6 +
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +
.../processors/query/h2/sql/GridSqlType.java| 94 ++
.../h2/twostep/GridReduceQueryExecutor.java | 182 +--
5 files changed, 170 insertions(+), 133 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4bf6436c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
index 62370ba..e36d6ff 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
@@ -26,6 +26,23 @@ public abstract class GridSqlElement implements Cloneable,
Iterable children = new ArrayList<>();
+/** */
+private GridSqlType expressionResultType;
+
+/**
+ * @return Optional expression result type.
+ */
+public GridSqlType expressionResultType() {
+return expressionResultType;
+}
+
+/**
+ * @param type Optional expression result type (if this is expression).
+ */
+public void expressionResultType(GridSqlType type) {
+expressionResultType = type;
+}
+
/** {@inheritDoc} */
public abstract String getSQL();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4bf6436c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index fbb75d4..acb72ac 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -307,6 +307,12 @@ public class GridSqlQueryParser {
if (res == null) {
res = parseExpression0(expression);
+Column c = new Column(null, expression.getType(),
expression.getPrecision(), expression.getScale(),
+expression.getDisplaySize());
+
+res.expressionResultType(new GridSqlType(c.getType(),
c.getScale(), c.getPrecision(), c.getDisplaySize(),
+c.getCreateSQL()));
+
h2ObjToGridObj.put(expression, res);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4bf6436c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 9877e61..ea146ca 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.query.h2.sql;
import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.query.*;
+import org.h2.value.*;
import java.sql.*;
import java.util.*;
@@ -311,6 +312,9 @@ public class GridSqlQuerySplitter {
if (idx < rdcSelect.length) { // SELECT __C0 AS orginal_alias
GridSqlElement rdcEl = column(mapColAlias);
+if (el.expressionResultType().type() == Value.UUID)
+rdcEl = function(CAST).setCastType("UUID").addChild(rdcEl);
+
if (colNames.
[08/39] incubator-ignite git commit: # Removed shmem from communication
# Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dca3ca7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dca3ca7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dca3ca7d
Branch: refs/heads/ignite-45
Commit: dca3ca7dedb73f18c2e107d27358cece1d2092de
Parents: d0ac78f
Author: Valentin Kulichenko
Authored: Fri Mar 13 17:46:44 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 13 17:46:44 2015 -0700
--
examples/pom.xml | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dca3ca7d/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 717a7c7..8fea360 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -32,6 +32,13 @@
ignite-examples
+
+
+Maven Central Staging
+
https://oss.sonatype.org/content/repositories/orggridgain-1246
+
+
+
javax.cache
@@ -167,6 +174,13 @@
${ignite.version}
test
+
+
+org.gridgain
+ignite-shmem
+RELEASE
+test
+
[10/39] incubator-ignite git commit: Removed shmem from communication
Removed shmem from communication Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d3f2abf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d3f2abf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d3f2abf Branch: refs/heads/ignite-45 Commit: 5d3f2abfc838c9fdd054a97cefad23ab92e8f6fd Parents: 8c598c8 Author: Valentin Kulichenko Authored: Fri Mar 13 19:46:06 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 13 19:46:06 2015 -0700 -- examples/pom.xml | 7 --- modules/core/pom.xml | 7 --- modules/hadoop/pom.xml | 7 --- 3 files changed, 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3f2abf/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 8fea360..337f0aa 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,13 +32,6 @@ ignite-examples - - -Maven Central Staging - https://oss.sonatype.org/content/repositories/orggridgain-1246 - - - javax.cache http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3f2abf/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f78a6df..af72397 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -35,13 +35,6 @@ ignite-core - - -Maven Central Staging - https://oss.sonatype.org/content/repositories/orggridgain-1246 - - - javax.cache http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3f2abf/modules/hadoop/pom.xml -- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index 9c44bfb..ec65f0f 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -35,13 +35,6 @@ ignite-hadoop - - -Maven Central Staging - https://oss.sonatype.org/content/repositories/orggridgain-1246 - - - org.apache.ignite
[01/39] incubator-ignite git commit: ignite-sql-tests - assert
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 c7137c3cb -> 5d2de377e
ignite-sql-tests - assert
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c631704
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c631704
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c631704
Branch: refs/heads/ignite-45
Commit: 7c6317047efb2fddd6a2f9d5ebaf4d9051ef55c2
Parents: a0d6f5d
Author: S.Vladykin
Authored: Fri Mar 13 20:44:18 2015 +0300
Committer: S.Vladykin
Committed: Fri Mar 13 20:44:18 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheSwapManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c631704/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index ca29f89..ffb9ed8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -1886,7 +1886,7 @@ public class GridCacheSwapManager extends
GridCacheManagerAdapter {
else
e0 = swapEntry(e0);
-assert e0 != null;
+assert e0 != null && e0.value() != null : e0;
entry = e0;
}
[26/39] incubator-ignite git commit: ignite-sql-tests - handle unknown sql type
ignite-sql-tests - handle unknown sql type
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4644fa67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4644fa67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4644fa67
Branch: refs/heads/ignite-45
Commit: 4644fa676d9a2d644f08e4996f855fe5ea1f1f04
Parents: 0e8a442
Author: S.Vladykin
Authored: Sun Mar 15 22:12:40 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 22:12:40 2015 +0300
--
.../processors/query/h2/sql/GridSqlElement.java | 4 ++--
.../processors/query/h2/sql/GridSqlQueryParser.java | 15 +--
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +++-
3 files changed, 14 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4644fa67/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
index e36d6ff..77e6cf0 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
@@ -30,14 +30,14 @@ public abstract class GridSqlElement implements Cloneable,
Iterablehttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4644fa67/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index acb72ac..a8c83d6 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -24,6 +24,7 @@ import org.h2.expression.*;
import org.h2.jdbc.*;
import org.h2.result.*;
import org.h2.table.*;
+import org.h2.value.*;
import org.jetbrains.annotations.*;
import java.lang.reflect.*;
@@ -307,11 +308,13 @@ public class GridSqlQueryParser {
if (res == null) {
res = parseExpression0(expression);
-Column c = new Column(null, expression.getType(),
expression.getPrecision(), expression.getScale(),
-expression.getDisplaySize());
+if (expression.getType() != Value.UNKNOWN) {
+Column c = new Column(null, expression.getType(),
expression.getPrecision(), expression.getScale(),
+expression.getDisplaySize());
-res.expressionResultType(new GridSqlType(c.getType(),
c.getScale(), c.getPrecision(), c.getDisplaySize(),
-c.getCreateSQL()));
+res.expressionResultType(new GridSqlType(c.getType(),
c.getScale(), c.getPrecision(), c.getDisplaySize(),
+c.getCreateSQL()));
+}
h2ObjToGridObj.put(expression, res);
}
@@ -389,13 +392,13 @@ public class GridSqlQueryParser {
assert0(qry instanceof Select, expression);
-return new GridSqlSubquery(parse((Select) qry));
+return new GridSqlSubquery(parse((Select)qry));
}
if (expression instanceof ConditionIn) {
GridSqlOperation res = new GridSqlOperation(IN);
-res.addChild(parseExpression(LEFT_CI.get((ConditionIn)
expression)));
+
res.addChild(parseExpression(LEFT_CI.get((ConditionIn)expression)));
List vals = VALUE_LIST_CI.get((ConditionIn)expression);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4644fa67/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index ea146ca..af9ffaf 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -312,7 +
[32/39] incubator-ignite git commit: ignite-sql-tests - replicated client only cache -> run on random node
ignite-sql-tests - replicated client only cache -> run on random node
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59528bd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59528bd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59528bd9
Branch: refs/heads/ignite-45
Commit: 59528bd9fcea9f8dca9bfd11e533272af06c8ecf
Parents: 95666e9
Author: S.Vladykin
Authored: Mon Mar 16 01:52:23 2015 +0300
Committer: S.Vladykin
Committed: Mon Mar 16 01:52:23 2015 +0300
--
.../internal/processors/cache/IgniteCacheProxy.java | 16 ++--
.../query/h2/twostep/GridReduceQueryExecutor.java | 10 +-
2 files changed, 23 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59528bd9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index baea0d6..4138d11 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -413,7 +413,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter> queryFields(SqlFieldsQuery qry) {
A.notNull(qry, "qry");
@@ -441,7 +453,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59528bd9/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 365fb43..f3d6bfc 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
@@ -240,7 +240,15 @@ public class GridReduceQueryExecutor implements
GridMessageListener {
r.conn = h2.connectionForSpace(space);
// TODO Add topology version.
-final Collection nodes =
ctx.grid().cluster().forCacheNodes(space).nodes();
+ClusterGroup dataNodes = ctx.grid().cluster().forDataNodes(space);
+
+if (ctx.cache().internalCache(space).context().isReplicated()) {
+assert dataNodes.node(ctx.localNodeId()) == null : "We must be on
a client node.";
+
+dataNodes = dataNodes.forRandom(); // Select random data node to
run query on a replicated data.
+}
+
+final Collection nodes = dataNodes.nodes();
for (GridCacheSqlQuery mapQry : qry.mapQueries()) {
GridMergeTable tbl;
[11/39] incubator-ignite git commit: Shmem version
Shmem version Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f732f57c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f732f57c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f732f57c Branch: refs/heads/ignite-45 Commit: f732f57cb319f5af1add6106d67eff338c59aedd Parents: 5d3f2ab Author: Valentin Kulichenko Authored: Fri Mar 13 21:36:42 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 13 21:36:42 2015 -0700 -- examples/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f732f57c/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 337f0aa..99ec04f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -171,7 +171,7 @@ org.gridgain ignite-shmem -RELEASE +1.0.0 test http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f732f57c/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index af72397..6d6440d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -130,7 +130,7 @@ org.gridgain ignite-shmem -RELEASE +1.0.0 test http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f732f57c/modules/hadoop/pom.xml -- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index ec65f0f..859d8db 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -98,7 +98,7 @@ org.gridgain ignite-shmem -RELEASE +1.0.0
[29/39] incubator-ignite git commit: ignite-sql-tests - remarks
ignite-sql-tests - remarks
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b12f928
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b12f928
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b12f928
Branch: refs/heads/ignite-45
Commit: 0b12f928fc221d0e2216876a69ca48d830748f0d
Parents: a43be64
Author: S.Vladykin
Authored: Sun Mar 15 23:20:42 2015 +0300
Committer: S.Vladykin
Committed: Sun Mar 15 23:20:42 2015 +0300
--
.../internal/processors/query/h2/sql/GridSqlQuerySplitter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b12f928/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index af9ffaf..019ed59 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -314,10 +314,10 @@ public class GridSqlQuerySplitter {
GridSqlType type = el.expressionResultType();
-if (type != null && type.type() == Value.UUID)
+if (type != null && type.type() == Value.UUID) // There is no
JDBC type UUID, so conversion to bytes occurs.
rdcEl = function(CAST).setCastType("UUID").addChild(rdcEl);
-if (colNames.add(rdcColAlias))
+if (colNames.add(rdcColAlias)) // To handle column name
duplication (usually wildcard for few tables).
rdcEl = alias(rdcColAlias, rdcEl);
rdcSelect[idx] = rdcEl;
[33/39] incubator-ignite git commit: ignite-45 - Fixed Full API suite.
ignite-45 - Fixed Full API suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41dd7379
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41dd7379
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41dd7379
Branch: refs/heads/ignite-45
Commit: 41dd7379c76607b18088159ea2cdc8248656a90d
Parents: f68fa57
Author: Alexey Goncharuk
Authored: Sun Mar 15 18:58:59 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Mar 15 18:58:59 2015 -0700
--
.../discovery/GridDiscoveryManager.java | 58
.../affinity/AffinityTopologyVersion.java | 8 ---
.../affinity/GridAffinityAssignmentCache.java | 11 +++-
.../cache/DynamicCacheChangeBatch.java | 18 ++
.../processors/cache/GridCacheAdapter.java | 2 +-
.../GridCachePartitionExchangeManager.java | 32 ---
.../processors/cache/GridCacheProcessor.java| 18 +-
.../distributed/dht/GridDhtCacheAdapter.java| 14 ++---
.../dht/GridDhtPartitionTopologyImpl.java | 3 +-
.../transactions/IgniteTxLocalAdapter.java | 11 +++-
.../cache/GridCacheAbstractFullApiSelfTest.java | 23 ++--
.../cache/GridCacheAbstractSelfTest.java| 2 +
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 11 ++--
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 22 +++-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 10 +++-
...achePartitionedMultiNodeFullApiSelfTest.java | 25 ++---
18 files changed, 250 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41dd7379/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 4be1ee6..fe3dc1b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -234,13 +234,44 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
* Adds near node ID to cache filter.
*
* @param cacheName Cache name.
- * @param nearNodeId Near node ID.
+ * @param clientNodeId Near node ID.
*/
-public void addNearNode(String cacheName, UUID nearNodeId) {
+public void addClientNode(String cacheName, UUID clientNodeId, boolean
nearEnabled) {
CachePredicate predicate = registeredCaches.get(cacheName);
if (predicate != null)
-predicate.addNearNode(nearNodeId);
+predicate.addClientNode(clientNodeId, nearEnabled);
+}
+
+/**
+ * @return Client nodes map.
+ */
+public Map> clientNodesMap() {
+Map> res = null;
+
+for (Map.Entry entry :
registeredCaches.entrySet()) {
+CachePredicate pred = entry.getValue();
+
+if (!F.isEmpty(pred.clientNodes)) {
+if (res == null)
+res = U.newHashMap(registeredCaches.size());
+
+res.put(entry.getKey(), new HashMap<>(pred.clientNodes));
+}
+}
+
+return res;
+}
+
+/**
+ * @param leftNodeId Left node ID.
+ */
+private void updateClientNodes(UUID leftNodeId) {
+for (Map.Entry entry :
registeredCaches.entrySet()) {
+CachePredicate pred = entry.getValue();
+
+pred.onNodeLeft(leftNodeId);
+}
}
/**
@@ -332,6 +363,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
if (type == EVT_NODE_FAILED || type == EVT_NODE_LEFT) {
for (DiscoCache c : discoCacheHist.values())
c.updateAlives(node);
+
+updateClientNodes(node.id());
}
if (type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT) {
@@ -1440,6 +1473,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
* @param node Remote node this event is connected with.
* @param topSnapshot Topology snapshot.
*/
+@SuppressWarnings("RedundantTypeArguments")
private void recordEvent(int type, long topVer, ClusterNode node,
Collection topSnapshot) {
assert node != null;
@@ -1806,7 +1840,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
private long awaitVer;
[30/39] incubator-ignite git commit: ignite-sql-tests - events tests
ignite-sql-tests - events tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/794e715d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/794e715d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/794e715d
Branch: refs/heads/ignite-45
Commit: 794e715deff423f96f46fea2b44dae69ea56817a
Parents: 0b12f92
Author: S.Vladykin
Authored: Mon Mar 16 00:08:23 2015 +0300
Committer: S.Vladykin
Committed: Mon Mar 16 00:08:23 2015 +0300
--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 32 +---
1 file changed, 14 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/794e715d/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 b19e8f0..d770d54 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
@@ -1066,7 +1066,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
* @throws Exception If failed.
*/
private void testTextQueryEvents(final boolean customSubjId) throws
Exception {
-final Map map = new ConcurrentHashMap8<>();
+final Map map = new ConcurrentHashMap8<>();
final CountDownLatch latch = new CountDownLatch(2);
final CountDownLatch execLatch = new CountDownLatch(cacheMode() ==
REPLICATED ? 1 : gridCount());
@@ -1075,7 +1075,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryReadEvent;
-CacheQueryReadEvent qe =
(CacheQueryReadEvent)evt;
+CacheQueryReadEvent qe =
(CacheQueryReadEvent)evt;
assertEquals(FULL_TEXT, qe.queryType());
assertNull(qe.cacheName());
@@ -1116,14 +1116,17 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
}, EVT_CACHE_QUERY_EXECUTED);
}
-IgniteCache cache = ignite.jcache(null);
+IgniteCache cache = ignite.jcache(null);
-cache.put(1, new Person("Bob White", 1000));
-cache.put(2, new Person("Tom White", 1000));
-cache.put(3, new Person("Mike Green", 1000));
+UUID k1 = UUID.randomUUID();
+UUID k2 = UUID.randomUUID();
+UUID k3 = UUID.randomUUID();
+cache.put(k1, new Person("Bob White", 1000));
+cache.put(k2, new Person("Tom White", 1000));
+cache.put(k3, new Person("Mike Green", 1000));
-QueryCursor> q = cache.query(new
TextQuery(Person.class, "White"));
+QueryCursor> q = cache.query(new
TextQuery(Person.class, "White"));
q.getAll();
@@ -1132,21 +1135,14 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
assertEquals(2, map.size());
-assertEquals("Bob White", map.get(1).name());
-assertEquals("Tom White", map.get(2).name());
+assertEquals("Bob White", map.get(k1).name());
+assertEquals("Tom White", map.get(k2).name());
}
/**
* @throws Exception If failed.
*/
public void testFieldsQueryEvents() throws Exception {
-checkFieldsQueryEvents();
-}
-
-/**
- * @throws Exception If failed.
- */
-private void checkFieldsQueryEvents() throws Exception {
final CountDownLatch execLatch = new CountDownLatch(cacheMode() ==
REPLICATED ? 1 : gridCount());
for (int i = 0; i < gridCount(); i++) {
@@ -1169,10 +1165,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest
extends GridCommonAbstrac
}, EVT_CACHE_QUERY_EXECUTED);
}
-IgniteCache cache = ignite.jcache(null);
+IgniteCache cache = ignite.jcache(null);
for (int i = 1; i <= 20; i++)
-cache.put(i, new Person("Person " + i, i));
+cache.put(UUID.randomUUID(), new Person("Person " + i, i));
QueryCursor> q = cache
.queryFields(new SqlFieldsQuery("select _key, name from Person
where salary > ?").setArgs(10));
[20/39] incubator-ignite git commit: # IGNITE-330 Store demo.
# IGNITE-330 Store demo. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52ee2353 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52ee2353 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52ee2353 Branch: refs/heads/ignite-45 Commit: 52ee2353941d6559e73c93d272e6a1172aa36f5b Parents: 435543f Author: AKuznetsov Authored: Sun Mar 15 21:25:55 2015 +0700 Committer: AKuznetsov Committed: Sun Mar 15 21:25:55 2015 +0700 -- examples/config/store/example-database.script | 22 +-- .../config/store/example-jdbc-pojo-store.xml| 142 --- .../store/CacheNodeWithStoreStartup.java| 45 -- .../datagrid/store/CacheStoreExample.java | 19 +++ .../store/jdbc/CacheJdbcPojoPersonStore.java| 11 -- .../datagrid/store/model/PersonKey.java | 97 - 6 files changed, 66 insertions(+), 270 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-database.script -- diff --git a/examples/config/store/example-database.script b/examples/config/store/example-database.script index 1397f28..80e418b 100644 --- a/examples/config/store/example-database.script +++ b/examples/config/store/example-database.script @@ -13,15 +13,15 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -create table PERSONS(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); +create table PERSON(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); -insert into PERSONS(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); -insert into PERSONS(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); -insert into PERSONS(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); -insert into PERSONS(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); -insert into PERSONS(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); -insert into PERSONS(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); -insert into PERSONS(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); -insert into PERSONS(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); -insert into PERSONS(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); -insert into PERSONS(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); +insert into PERSON(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); +insert into PERSON(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); +insert into PERSON(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); +insert into PERSON(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); +insert into PERSON(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); +insert into PERSON(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); +insert into PERSON(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); +insert into PERSON(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); +insert into PERSON(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); +insert into PERSON(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52ee2353/examples/config/store/example-jdbc-pojo-store.xml -- diff --git a/examples/config/store/example-jdbc-pojo-store.xml b/examples/config/store/example-jdbc-pojo-store.xml deleted file mode 100644 index 4fc089f..000 --- a/examples/config/store/example-jdbc-pojo-store.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - -http://www.springframework.org/schema/beans"; - xmlns:util="http://www.springframework.org/schema/util"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" -http://www.springframework.org/schema/beans -http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/util -http://www.springframework.org/schema/util/spring-util.xsd";> - - - - - - - - - - - - - - - - - - - - - - - - -
[13/39] incubator-ignite git commit: # sprint-2 - fixed devnotes file.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f54fc36c/wiki/documentation/data-grid/persistent-store.md
--
diff --git a/wiki/documentation/data-grid/persistent-store.md
b/wiki/documentation/data-grid/persistent-store.md
deleted file mode 100644
index ce913a4..000
--- a/wiki/documentation/data-grid/persistent-store.md
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-JCache specification comes with APIs for
[javax.cache.inegration.CacheLoader](https://ignite.incubator.apache.org/jcache/1.0.0/javadoc/javax/cache/integration/CacheLoader.html)
and
[javax.cache.inegration.CacheWriter](https://ignite.incubator.apache.org/jcache/1.0.0/javadoc/javax/cache/integration/CacheWriter.html)
which are used for **write-through** and **read-through** to and from an
underlying persistent storage respectively (e.g. an RDBMS database like Oracle
or MySQL, or NoSQL database like MongoDB or Couchbase).
-
-While Ignite allows you to configure the `CacheLoader` and `CacheWriter`
separately, it is very awkward to implement a transactional store within 2
separate classes, as multiple `load` and `put` operations have to share the
same connection within the same transaction. To mitigate that, Ignite provides
`org.apache.ignite.cache.store.CacheStore` interface which extends both,
`CacheLoader` and `CacheWriter`.
-[block:callout]
-{
- "type": "info",
- "title": "Transactions",
- "body": "`CacheStore` is fully transactional and automatically merges into
the ongoing cache transaction."
-}
-[/block]
-
-[block:api-header]
-{
- "type": "basic",
- "title": "CacheStore"
-}
-[/block]
-`CacheStore` interface in Ignite is used to write and load data to and from
the underlying data store. In addition to standard JCache loading and storing
methods, it also introduces end-of-transaction demarcation and ability to bulk
load a cache from the underlying data store.
-
-## loadCache()
-`CacheStore.loadCache()` method allows for cache loading even without passing
all the keys that need to be loaded. It is generally used for hot-loading the
cache on startup, but can be also called at any point after the cache has been
started.
-
-`IgniteCache.loadCache()` method will delegate to `CacheStore.loadCache()`
method on every cluster member that is running the cache. To invoke loading
only on the local cluster node, use `IgniteCache.localLoadCache()` method.
-[block:callout]
-{
- "type": "info",
- "body": "In case of partitioned caches, keys that are not mapped to this
node, either as primary or backups, will be automatically discarded by the
cache."
-}
-[/block]
-## load(), write(), delete()
-Methods `load()`, `write()`, and `delete()` on the `CacheStore` are called
whenever methods `get()`, `put()`, and `remove()` are called correspondingly on
the `IgniteCache` interface. These methods are used to enable **read-through**
and **write-through** behavior when working with individual cache entries.
-
-## loadAll(), writeAll(), deleteAll()
-Methods `loadAll()`, `writeAll()`, and `deleteAll()` on the `CacheStore` are
called whenever methods `getAll()`, `putAll()`, and `removeAll()` are called
correspondingly on the `IgniteCache` interface. These methods are used to
enable **read-through** and **write-through** behavior when working with
multiple cache entries and should generally be implemented using batch
operations to provide better performance.
-[block:callout]
-{
- "type": "info",
- "title": "",
- "body": "`CacheStoreAdapter` provides default implementation for
`loadAll()`, `writeAll()`, and `deleteAll()` methods which simply iterates
through all keys one by one."
-}
-[/block]
-## sessionEnd()
-Ignite has a concept of store session which may span more than one cache store
operation. Sessions are especially useful when working with transactions.
-
-In case of `ATOMIC` caches, method `sessionEnd()` is called after completion
of each `CacheStore` method. In case of `TRANSACTIONAL` caches, `sessionEnd()`
is called at the end of each transaction, which allows to either commit or
rollback multiple operations on the underlying persistent store.
-[block:callout]
-{
- "type": "info",
- "body": "`CacheStoreAdapater` provides default empty implementation of
`sessionEnd()` method."
-}
-[/block]
-
-[block:api-header]
-{
- "type": "basic",
- "title": "CacheStoreSession"
-}
-[/block]
-The main purpose of cache store session is to hold the context between
multiple store invocations whenever `CacheStore` is used in a cache
transaction. For example, if using JDBC, you can store the ongoing database
connection via `CacheStoreSession.attach()` method. You can then commit this
connection in the `CacheStore#sessionEnd(boolean)` method.
-
-`CacheStoreSession` can be injected into your cache store implementation via
`@GridCacheStoreSessionResource` annotation.
-[block:api-header]
-{
- "type": "basic",
- "title": "CacheStore Example"
-}
-[/block]
-Below
[02/39] incubator-ignite git commit: ignite-sql-tests - node failures
ignite-sql-tests - node failures
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eacbac44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eacbac44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eacbac44
Branch: refs/heads/ignite-45
Commit: eacbac44d26c259fbd3c8cb5da57affbd7a7c769
Parents: 7c63170
Author: S.Vladykin
Authored: Fri Mar 13 22:04:55 2015 +0300
Committer: S.Vladykin
Committed: Fri Mar 13 22:04:55 2015 +0300
--
.../query/h2/twostep/GridMapQueryExecutor.java | 17 +++-
.../query/h2/twostep/GridMergeIndex.java| 15 +++
.../h2/twostep/GridMergeIndexUnsorted.java | 34 ++-
.../h2/twostep/GridReduceQueryExecutor.java | 45 +---
.../query/h2/twostep/GridResultPage.java| 4 +-
5 files changed, 84 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eacbac44/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 adade06..99cbaa8 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
@@ -22,6 +22,7 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.managers.communication.*;
+import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.processors.query.h2.*;
import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
@@ -86,7 +87,19 @@ public class GridMapQueryExecutor implements
GridMessageListener {
log = ctx.log(GridMapQueryExecutor.class);
-// TODO handle node failures.
+ctx.event().addLocalEventListener(new GridLocalEventListener() {
+@Override public void onEvent(final Event evt) {
+UUID nodeId = ((DiscoveryEvent)evt).eventNode().id();
+
+ConcurrentMap nodeRess =
qryRess.remove(nodeId);
+
+if (nodeRess == null)
+return;
+
+for (QueryResults ress : nodeRess.values())
+ress.cancel();
+}
+}, EventType.EVT_NODE_FAILED, EventType.EVT_NODE_LEFT);
ctx.io().addMessageListener(GridTopic.TOPIC_QUERY, this);
}
@@ -171,7 +184,7 @@ public class GridMapQueryExecutor implements
GridMessageListener {
QueryResults qr = new QueryResults(req.requestId(), qrys.size());
-if (nodeRess.putIfAbsent(req.requestId(), qr) != null)
+if (nodeRess.put(req.requestId(), qr) != null)
throw new IllegalStateException();
h2.setFilters(h2.backupFilter());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eacbac44/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
index f6989ae..a6a3fea 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
@@ -61,6 +61,14 @@ public abstract class GridMergeIndex extends BaseIndex {
initBaseIndex(tbl, 0, name, cols, type);
}
+/**
+ * @param nodeId Node ID.
+ * @return {@code true} If this index needs data from the given source
node.
+ */
+public boolean hasSource(UUID nodeId) {
+return remainingRows.containsKey(nodeId);
+}
+
/** {@inheritDoc} */
@Override public long getRowCount(Session session) {
return rowsCnt.get();
@@ -80,6 +88,13 @@ public abstract class GridMergeIndex extends BaseIndex {
}
/**
+ * @param nodeId Node ID.
+ */
+public void fail(UUID nodeId) {
+addPage0(new GridResultPage(nodeId, null, false));
+}
+
+/**
* @param page Page.
*/
public final void addPage(GridResultP
