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/03/22 13:17:38 UTC
ignite git commit: IGNITE-1232: H2CompareBigQueryDistributedJoin (Fix
not-colocated data population)
Repository: ignite
Updated Branches:
refs/heads/ignite-1232 a48e40317 -> ca2dbc2d3
IGNITE-1232: H2CompareBigQueryDistributedJoin (Fix not-colocated data population)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca2dbc2d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca2dbc2d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca2dbc2d
Branch: refs/heads/ignite-1232
Commit: ca2dbc2d3a1e762d845936e2a37754dd9c35c77d
Parents: a48e403
Author: ashutak <as...@gridgain.com>
Authored: Tue Mar 22 15:17:50 2016 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Mar 22 15:17:50 2016 +0300
----------------------------------------------------------------------
.../query/h2/sql/H2CompareBigQueryTest.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca2dbc2d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
index 17453e8..dc73e96 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
@@ -122,9 +122,9 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
if (mode == CacheMode.PARTITIONED)
cc.setIndexedTypes(
Integer.class, CustOrder.class,
- AffinityKey.class, ReplaceOrder.class,
- AffinityKey.class, OrderParams.class,
- AffinityKey.class, Cancel.class
+ useColocatedData() ? AffinityKey.class : Integer.class, ReplaceOrder.class,
+ useColocatedData() ? AffinityKey.class : Integer.class, OrderParams.class,
+ useColocatedData() ? AffinityKey.class : Integer.class, Cancel.class
);
else if (mode == CacheMode.REPLICATED)
cc.setIndexedTypes(
@@ -255,6 +255,8 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
@Override protected Statement initializeH2Schema() throws SQLException {
Statement st = super.initializeH2Schema();
+ final String keyType = useColocatedData() ? "other" : "int";
+
st.execute("create table \"part\".CustOrder" +
" (" +
" _key int not null," +
@@ -269,7 +271,7 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
st.execute("create table \"part\".ReplaceOrder" +
" (" +
- " _key other not null," +
+ " _key " + keyType + " not null," +
" _val other not null," +
" id int unique," +
" orderId int ," +
@@ -282,7 +284,7 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
st.execute("create table \"part\".OrderParams" +
" (" +
- " _key other not null," +
+ " _key " + keyType + " not null," +
" _val other not null," +
" id int unique," +
" orderId int ," +
@@ -292,7 +294,7 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
st.execute("create table \"part\".Cancel" +
" (" +
- " _key other not null," +
+ " _key " + keyType + " not null," +
" _val other not null," +
" id int unique," +
" date Date, " +
@@ -381,7 +383,7 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
st.setObject(++i, o.orderId);
st.setObject(++i, o.parentAlgo);
- st.executeUpdate();
+ st.executeUpdate();
}
}