Fixes after merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/61ab650e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/61ab650e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/61ab650e Branch: refs/heads/master Commit: 61ab650ecd353b4014a30f793090e9dab3519ad5 Parents: b8b9abe Author: devozerov <[email protected]> Authored: Mon Oct 31 21:33:59 2016 +0300 Committer: thatcoach <[email protected]> Committed: Mon Oct 31 21:59:30 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/query/SqlQuery.java | 5 ++--- .../internal/processors/cache/QueryCursorImpl.java | 16 +++++++++------- .../internal/processors/query/GridQueryCancel.java | 3 +-- .../h2/twostep/messages/GridQueryFailResponse.java | 3 +-- .../testframework/junits/GridTestKernalContext.java | 13 ++++++++----- ...teCacheQueryAbstractDistributedJoinSelfTest.java | 5 ++--- 6 files changed, 23 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/61ab650e/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java index 3b8fe6d..83e171d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java @@ -17,15 +17,14 @@ package org.apache.ignite.cache.query; +import java.util.concurrent.TimeUnit; +import javax.cache.Cache; import org.apache.ignite.IgniteCache; import org.apache.ignite.internal.processors.query.GridQueryProcessor; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.S; -import javax.cache.Cache; -import java.util.concurrent.TimeUnit; - /** * SQL Query. * http://git-wip-us.apache.org/repos/asf/ignite/blob/61ab650e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java index f93a747..5a46d65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java @@ -17,6 +17,11 @@ package org.apache.ignite.internal.processors.cache; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import javax.cache.CacheException; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.query.QueryCancelledException; @@ -24,13 +29,10 @@ import org.apache.ignite.internal.processors.cache.query.QueryCursorEx; import org.apache.ignite.internal.processors.query.GridQueryCancel; import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; -import javax.cache.CacheException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; - -import static org.apache.ignite.internal.processors.cache.QueryCursorImpl.State.*; +import static org.apache.ignite.internal.processors.cache.QueryCursorImpl.State.CLOSED; +import static org.apache.ignite.internal.processors.cache.QueryCursorImpl.State.EXECUTION; +import static org.apache.ignite.internal.processors.cache.QueryCursorImpl.State.IDLE; +import static org.apache.ignite.internal.processors.cache.QueryCursorImpl.State.RESULT_READY; /** * Query cursor implementation. http://git-wip-us.apache.org/repos/asf/ignite/blob/61ab650e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCancel.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCancel.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCancel.java index 7391f39..d49bcc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCancel.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCancel.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.query; -import org.apache.ignite.cache.query.QueryCancelledException; - import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import org.apache.ignite.cache.query.QueryCancelledException; /** * Holds query cancel state. http://git-wip-us.apache.org/repos/asf/ignite/blob/61ab650e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java index 7554ae9..0baf6ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java @@ -17,14 +17,13 @@ package org.apache.ignite.internal.processors.query.h2.twostep.messages; +import java.nio.ByteBuffer; import org.apache.ignite.cache.query.QueryCancelledException; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageWriter; -import java.nio.ByteBuffer; - /** * Error message. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/61ab650e/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java index 03138c3..f9e2ff4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java @@ -17,18 +17,21 @@ package org.apache.ignite.testframework.junits; +import java.util.List; +import java.util.ListIterator; +import java.util.concurrent.ExecutorService; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.*; +import org.apache.ignite.internal.GridComponent; +import org.apache.ignite.internal.GridKernalContextImpl; +import org.apache.ignite.internal.GridKernalGatewayImpl; +import org.apache.ignite.internal.GridLoggerProxy; +import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; -import java.util.List; -import java.util.ListIterator; -import java.util.concurrent.ExecutorService; - /** * Test context. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/61ab650e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java index 339e0d3..be3e22d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java @@ -17,6 +17,8 @@ package org.apache.ignite.internal.processors.cache.distributed.near; +import java.io.Serializable; +import java.util.Random; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.cache.query.annotations.QuerySqlField; @@ -32,9 +34,6 @@ 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; -import java.io.Serializable; -import java.util.Random; - import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
