You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2017/02/22 13:43:38 UTC
[1/2] ignite git commit: ignite-1.9 - compilation
Repository: ignite
Updated Branches:
refs/heads/ignite-1.9 80352d0a8 -> 57291773c
ignite-1.9 - compilation
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf3de19c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf3de19c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf3de19c
Branch: refs/heads/ignite-1.9
Commit: cf3de19ccacf5c15c16df8a4e4c193d88c7dc56b
Parents: e3d7326
Author: Sergi Vladykin <se...@gmail.com>
Authored: Wed Feb 22 16:43:05 2017 +0300
Committer: Sergi Vladykin <se...@gmail.com>
Committed: Wed Feb 22 16:43:05 2017 +0300
----------------------------------------------------------------------
.../query/h2/GridH2IndexingGeoSelfTest.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf3de19c/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
index 839514b..b53387f 100644
--- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
+++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
@@ -43,7 +43,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
-import org.jetbrains.annotations.NotNull;
/**
* Geo-indexing test.
@@ -90,7 +89,8 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception If failed.
*/
public void testPrimitiveGeometry() throws Exception {
- IgniteCache<Long, Geometry> cache = grid(0).getOrCreateCache(cacheConfig("geom", true, Long.class, Geometry.class));
+ IgniteCache<Long, Geometry> cache = grid(0).getOrCreateCache(
+ this.<Long, Geometry>cacheConfig("geom", true, Long.class, Geometry.class));
try {
WKTReader r = new WKTReader();
@@ -114,7 +114,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest {
@SuppressWarnings("unchecked")
public void testGeo() throws Exception {
IgniteCache<Integer, EnemyCamp> cache = grid(0).getOrCreateCache(
- cacheConfig("camp", true, Integer.class, EnemyCamp.class));
+ this.<Integer, EnemyCamp>cacheConfig("camp", true, Integer.class, EnemyCamp.class));
try {
WKTReader r = new WKTReader();
@@ -301,8 +301,10 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception if fails.
*/
public void testSegmentedGeoIndexJoin() throws Exception {
- IgniteCache<Integer, Enemy> c1 = ignite(0).getOrCreateCache(cacheConfig("enemy", true, Integer.class, Enemy.class));
- IgniteCache<Integer, EnemyCamp> c2 = ignite(0).getOrCreateCache(cacheConfig("camp", true, Integer.class, EnemyCamp.class));
+ IgniteCache<Integer, Enemy> c1 = ignite(0).getOrCreateCache(
+ this.<Integer, Enemy>cacheConfig("enemy", true, Integer.class, Enemy.class));
+ IgniteCache<Integer, EnemyCamp> c2 = ignite(0).getOrCreateCache(
+ this.<Integer, EnemyCamp>cacheConfig("camp", true, Integer.class, EnemyCamp.class));
try {
fillCache();
@@ -321,8 +323,10 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception if fails.
*/
public void testSegmentedGeoIndexJoin2() throws Exception {
- IgniteCache<Integer, Enemy> c1 = ignite(0).getOrCreateCache(cacheConfig("enemy", true, Integer.class, Enemy.class));
- IgniteCache<Integer, EnemyCamp> c2 = ignite(0).getOrCreateCache(cacheConfig("camp", false, Integer.class, EnemyCamp.class));
+ IgniteCache<Integer, Enemy> c1 = ignite(0).getOrCreateCache(
+ this.<Integer, Enemy>cacheConfig("enemy", true, Integer.class, Enemy.class));
+ IgniteCache<Integer, EnemyCamp> c2 = ignite(0).getOrCreateCache(
+ this.<Integer, EnemyCamp>cacheConfig("camp", false, Integer.class, EnemyCamp.class));
try {
fillCache();
[2/2] ignite git commit: Merge branch 'ignite-1.9' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.9
Posted by se...@apache.org.
Merge branch 'ignite-1.9' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.9
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57291773
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57291773
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57291773
Branch: refs/heads/ignite-1.9
Commit: 57291773cf9ddfbf78c3370429a1fb630a907603
Parents: cf3de19 80352d0
Author: Sergi Vladykin <se...@gmail.com>
Authored: Wed Feb 22 16:43:21 2017 +0300
Committer: Sergi Vladykin <se...@gmail.com>
Committed: Wed Feb 22 16:43:21 2017 +0300
----------------------------------------------------------------------
.../cpp/common/project/vs/common.vcxproj | 1 -
.../common/project/vs/common.vcxproj.filters | 6 -----
.../platforms/cpp/common/project/vs/targetver.h | 25 --------------------
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 -
.../cpp/jni/project/vs/jni.vcxproj.filters | 3 ---
.../platforms/cpp/jni/project/vs/targetver.h | 25 --------------------
6 files changed, 61 deletions(-)
----------------------------------------------------------------------