You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/07/22 12:28:53 UTC
ignite git commit: ignite-1232 Enabled tests.
Repository: ignite
Updated Branches:
refs/heads/ignite-1232 2b5900a75 -> 606f401b9
ignite-1232 Enabled tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/606f401b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/606f401b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/606f401b
Branch: refs/heads/ignite-1232
Commit: 606f401b9babd5ee89185071f31e0ee8236e3528
Parents: 2b5900a
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jul 22 15:28:52 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jul 22 15:28:52 2016 +0300
----------------------------------------------------------------------
.../IgniteCacheCrossCacheJoinRandomTest.java | 12 ++++----
.../cache/IgniteCacheDistributedJoinTest.java | 32 +++++++++++++++++++-
2 files changed, 37 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/606f401b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
index f646ce2..4d5a44e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
@@ -73,14 +73,14 @@ public class IgniteCacheCrossCacheJoinRandomTest extends AbstractH2CompareQueryT
/** */
private static final List<T2<CacheMode, Integer>> MODES_1 = F.asList(
- new T2<>(REPLICATED, 0),
+ //new T2<>(REPLICATED, 0),
new T2<>(PARTITIONED, 0),
new T2<>(PARTITIONED, 1),
new T2<>(PARTITIONED, 2));
/** */
private static final List<T2<CacheMode, Integer>> MODES_2 = F.asList(
- new T2<>(REPLICATED, 0),
+ //new T2<>(REPLICATED, 0),
new T2<>(PARTITIONED, 0),
new T2<>(PARTITIONED, 1));
@@ -206,21 +206,21 @@ public class IgniteCacheCrossCacheJoinRandomTest extends AbstractH2CompareQueryT
/**
* @throws Exception If failed.
*/
- public void _testJoin3Caches() throws Exception {
+ public void testJoin3Caches() throws Exception {
testJoin(3, MODES_1);
}
/**
* @throws Exception If failed.
*/
- public void _testJoin4Caches() throws Exception {
- testJoin(4, MODES_1);
+ public void testJoin4Caches() throws Exception {
+ testJoin(4, MODES_2);
}
/**
* @throws Exception If failed.
*/
- public void _testJoin5Caches() throws Exception {
+ public void testJoin5Caches() throws Exception {
testJoin(5, MODES_2);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/606f401b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
index 97afab7..ea3b141 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
@@ -147,6 +147,12 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
s.close();
}
+ /**
+ * @param s Statement.
+ * @param c Cache.
+ * @param qry Query.
+ * @throws SQLException If failed.
+ */
private <Z extends X> void checkSameResult(Statement s, IgniteCache<Integer, Z> c, String qry) throws SQLException {
s.executeUpdate("SET SCHEMA " + c.getName());
@@ -173,6 +179,12 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
}
}
+ /**
+ * @param s Statement.
+ * @param z Value.
+ * @return Value.
+ * @throws SQLException If failed.
+ */
private static <Z extends X> Z insert(Statement s, Z z) throws SQLException {
String tbl = z.getClass().getSimpleName();
@@ -185,7 +197,10 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
return z;
}
- public void testJoins() throws SQLException {
+ /**
+ * @throws Exception If failed.
+ */
+ public void testJoins() throws Exception {
Ignite ignite = ignite(0);
IgniteCache<Integer,A> a = ignite.cache("a");
@@ -214,6 +229,9 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
stopAllGrids();
}
+ /**
+ *
+ */
public static class X {
/** */
public long a;
@@ -235,22 +253,28 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
this.c = c;
}
+ /** */
@QuerySqlField(index = true)
public long getA() {
return a;
}
+ /** */
@QuerySqlField(index = true)
public long getB() {
return b;
}
+ /** */
@QuerySqlField(index = true)
public long getC() {
return c;
}
}
+ /**
+ *
+ */
public static class A extends X {
/**
* @param a A.
@@ -262,6 +286,9 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
}
}
+ /**
+ *
+ */
public static class B extends X {
/**
* @param a A.
@@ -273,6 +300,9 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
}
}
+ /**
+ *
+ */
public static class C extends X {
/**
* @param a A.