You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2017/05/25 13:28:28 UTC
[06/10] ignite git commit: IGNITE-5190 -
ArrayIndexOutOfBoundsException in GridMergeIndexSorted
IGNITE-5190 - ArrayIndexOutOfBoundsException in GridMergeIndexSorted
(cherry picked from commit 3a9dba5)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c45750b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c45750b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c45750b
Branch: refs/heads/ignite-5232
Commit: 0c45750bdcaabf72980f775e0bc2f18edc603607
Parents: b051163
Author: Sergi Vladykin <se...@gmail.com>
Authored: Thu May 11 16:01:38 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Thu May 11 17:44:22 2017 +0300
----------------------------------------------------------------------
.../query/h2/twostep/GridMergeIndexSorted.java | 3 +
.../query/IgniteSqlSplitterSelfTest.java | 68 ++++++++++++++++++++
2 files changed, 71 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c45750b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java
index f2d9de4..54c8dd4 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java
@@ -252,6 +252,9 @@ public final class GridMergeIndexSorted extends GridMergeIndex {
*
*/
private void goNext() {
+ if (off == streams.length)
+ return; // All streams are done.
+
if (streams[off].next())
bubbleUp(streams, off, streamCmp);
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c45750b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 8e56d36..6391286 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -1579,6 +1579,37 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
}
}
+ /**
+ * @throws Exception If failed.
+ */
+ public void testJoinWithSubquery() throws Exception {
+ IgniteCache<Integer, Contract> c1 = ignite(0).createCache(
+ cacheConfig("Contract", true,
+ Integer.class, Contract.class));
+
+ IgniteCache<Integer, PromoContract> c2 = ignite(0).createCache(
+ cacheConfig("PromoContract", true,
+ Integer.class, PromoContract.class));
+
+ for (int i = 0; i < 100; i++) {
+ int coId = i % 10;
+ int cust = i / 10;
+ c1.put( i, new Contract(coId, cust));
+ }
+
+ for (int i = 0; i < 10; i++)
+ c2.put(i, new PromoContract((i % 5) + 1, i));
+
+ final List<List<?>> res = c2.query(new SqlFieldsQuery("SELECT CO.CO_ID \n" +
+ "FROM PromoContract PMC \n" +
+ "INNER JOIN \"Contract\".Contract CO ON PMC.CO_ID = 5 \n" +
+ "AND PMC.CO_ID = CO.CO_ID \n" +
+ "INNER JOIN (SELECT CO_ID FROM PromoContract EBP WHERE EBP.CO_ID = 5 LIMIT 1) VPMC \n" +
+ "ON PMC.CO_ID = VPMC.CO_ID ")).getAll();
+
+ assertFalse(res.isEmpty());
+ }
+
/** @throws Exception if failed. */
public void testDistributedAggregates() throws Exception {
final String cacheName = "ints";
@@ -2098,4 +2129,41 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
@QuerySqlField
private int goodId;
}
+
+ /** */
+ private static class Contract implements Serializable {
+ /** */
+ @QuerySqlField(index = true)
+ private final int CO_ID;
+
+ /** */
+ @QuerySqlField(index = true)
+ private final int CUSTOMER_ID;
+
+ /** */
+ public Contract(final int CO_ID, final int CUSTOMER_ID) {
+ this.CO_ID = CO_ID;
+ this.CUSTOMER_ID = CUSTOMER_ID;
+ }
+
+ }
+
+ /** */
+ public class PromoContract implements Serializable {
+ /** */
+ @QuerySqlField(index = true, orderedGroups = {
+ @QuerySqlField.Group(name = "myIdx", order = 1)})
+ private final int CO_ID;
+
+ /** */
+ @QuerySqlField(index = true, orderedGroups = {
+ @QuerySqlField.Group(name = "myIdx", order = 0)})
+ private final int OFFER_ID;
+
+ /** */
+ public PromoContract(final int co_Id, final int offer_Id) {
+ this.CO_ID = co_Id;
+ this.OFFER_ID = offer_Id;
+ }
+ }
}