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 2017/01/12 08:01:50 UTC
[24/24] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3477' into ignite-gg-11810
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810
# Conflicts:
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1d5081f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1d5081f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1d5081f
Branch: refs/heads/ignite-gg-11810
Commit: c1d5081f92020a57781ca7cb110d928c7d35c987
Parents: 1b1ca16
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jan 12 11:01:28 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jan 12 11:01:28 2017 +0300
----------------------------------------------------------------------
.../util/GridCursorIteratorWrapper.java | 7 ++-
.../apache/ignite/internal/util/IgniteTree.java | 31 +++++++------
.../internal/processors/query/h2/H2Cursor.java | 9 ++--
.../query/IgniteSqlDistributedJoinSelfTest.java | 46 ++++++++++++++------
.../IgniteDistributedJoinTestSuite.java | 2 +-
5 files changed, 60 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1d5081f/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
index 927e365..201c8dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
@@ -1,9 +1,8 @@
package org.apache.ignite.internal.util;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCursor;
/**
* Wrap {@code Iterator} and adapt it to {@code GridCursor}.
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1d5081f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteTree.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteTree.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteTree.java
index 0c08cd9..8dcd205 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteTree.java
@@ -17,10 +17,8 @@
package org.apache.ignite.internal.util;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-
-import java.util.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCursor;
/**
* Interface for ignite internal tree.
@@ -29,10 +27,11 @@ public interface IgniteTree<L, T> {
/**
* Put value in this tree.
*
- * @param value value to be associated with the specified key
- * @return the previous value associated with key
+ * @param val Value to be associated with the specified key.
+ * @return The previous value associated with key.
+ * @throws IgniteCheckedException If failed.
*/
- T put(T value) throws IgniteCheckedException;
+ public T put(T val) throws IgniteCheckedException;
/**
* Returns the value to which the specified key is mapped, or {@code null} if this tree contains no mapping for the
@@ -40,9 +39,10 @@ public interface IgniteTree<L, T> {
*
* @param key the key whose associated value is to be returned
* @return the value to which the specified key is mapped, or {@code null} if this tree contains no mapping for the
- * key
+ * key.
+ * @throws IgniteCheckedException If failed.
*/
- T findOne(L key) throws IgniteCheckedException;
+ public T findOne(L key) throws IgniteCheckedException;
/**
* Returns a cursor from lower to upper bounds inclusive.
@@ -50,21 +50,24 @@ public interface IgniteTree<L, T> {
* @param lower Lower bound or {@code null} if unbounded.
* @param upper Upper bound or {@code null} if unbounded.
* @return Cursor.
+ * @throws IgniteCheckedException If failed.
*/
- GridCursor<T> find(L lower, L upper) throws IgniteCheckedException;
+ public GridCursor<T> find(L lower, L upper) throws IgniteCheckedException;
/**
* Removes the mapping for a key from this tree if it is present.
*
- * @param key key whose mapping is to be removed from the tree
- * @return the previous value associated with key, or null if there was no mapping for key.
+ * @param key Key whose mapping is to be removed from the tree.
+ * @return The previous value associated with key, or null if there was no mapping for key.
+ * @throws IgniteCheckedException If failed.
*/
- T remove(L key) throws IgniteCheckedException;
+ public T remove(L key) throws IgniteCheckedException;
/**
* Returns the number of elements in this tree.
*
* @return the number of elements in this tree
+ * @throws IgniteCheckedException If failed.
*/
- long size() throws IgniteCheckedException;
+ public long size() throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1d5081f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Cursor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Cursor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Cursor.java
index cc71813..de3111d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Cursor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Cursor.java
@@ -31,13 +31,13 @@ import org.h2.result.*;
*/
public class H2Cursor implements Cursor {
/** */
- final GridCursor<GridH2Row> cursor;
+ private final GridCursor<GridH2Row> cursor;
/** */
- final IgniteBiPredicate<Object,Object> filter;
+ private final IgniteBiPredicate<Object,Object> filter;
/** */
- final long time = U.currentTimeMillis();
+ private final long time = U.currentTimeMillis();
/**
* @param cursor Cursor.
@@ -50,6 +50,9 @@ public class H2Cursor implements Cursor {
this.filter = filter;
}
+ /**
+ * @param cursor Cursor.
+ */
public H2Cursor(GridCursor<GridH2Row> cursor) {
this(cursor, null);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1d5081f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
index e9f41c8..81201c8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
@@ -17,18 +17,18 @@
package org.apache.ignite.internal.processors.query;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
* Tests for correct distributed sql joins.
@@ -36,8 +36,14 @@ import java.util.*;
public class IgniteSqlDistributedJoinSelfTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
private static final int NODES_COUNT = 2;
+
+ /** */
private static final int ORG_COUNT = NODES_COUNT;
+
+ /** */
private static final int PERSON_PER_ORG_COUNT = 50;
/** {@inheritDoc} */
@@ -81,7 +87,7 @@ public class IgniteSqlDistributedJoinSelfTest extends GridCommonAbstractTest {
}
/**
- *
+ * @throws Exception If failed.
*/
public void testNonCollocatedDistributedJoin() throws Exception {
CacheConfiguration ccfg1 = cacheConfig("pers", true, String.class, Person.class);
@@ -141,11 +147,19 @@ public class IgniteSqlDistributedJoinSelfTest extends GridCommonAbstractTest {
}
}
+ /**
+ *
+ */
private static class Person {
+ /** */
@QuerySqlField(index = true)
private String id;
+
+ /** */
@QuerySqlField(index = true)
private String orgId;
+
+ /** */
@QuerySqlField(index = true)
private String name;
@@ -162,9 +176,15 @@ public class IgniteSqlDistributedJoinSelfTest extends GridCommonAbstractTest {
public void setName(String name) { this.name = name; }
}
+ /**
+ *
+ */
private static class Organization {
+ /** */
@QuerySqlField(index = true)
private String id;
+
+ /** */
@QuerySqlField(index = true)
private String name;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1d5081f/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
index dca640f..0882188 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
@@ -17,7 +17,7 @@ import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryDistr
*/
public class IgniteDistributedJoinTestSuite extends TestSuite {
/**
- *
+ * @return Suite.
*/
public static TestSuite suite() {
TestSuite suite = new TestSuite("Distributed Joins Test Suite.");