You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/03/04 13:22:01 UTC
[ignite] 01/01: IGNITE-11464: Automatic modules support for Apache
Ignite: Move of internal classes & lucene-less build allows to compile with
-indexing.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11464-modules-indexing
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 0a39c1230b501acb80379fe21beb4a2887a20d2e
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Mar 4 16:21:39 2019 +0300
IGNITE-11464: Automatic modules support for Apache Ignite: Move of internal classes & lucene-less build allows to compile with -indexing.
---
modules/dev-utils/ignite-modules-test/build.gradle | 8 +-
modules/dev-utils/ignite-modules-test/deps.txt | 94 +++++++++++++++-------
.../{ => indexing}/GridCacheTwoStepQuery.java | 3 +-
.../cache/query/{ => indexing}/QueryTable.java | 2 +-
.../{ => indexing}/RegisteredQueryCursor.java | 2 +-
.../internal/processors/query/h2/H2Utils.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
.../internal/processors/query/h2/QueryParser.java | 2 +-
.../query/h2/QueryParserResultSelect.java | 2 +-
.../processors/query/h2/SchemaManager.java | 2 +-
.../processors/query/h2/dml/UpdatePlanBuilder.java | 2 +-
.../processors/query/h2/opt/GridH2Table.java | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +-
.../query/h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../query/h2/twostep/msg/GridH2QueryRequest.java | 2 +-
.../h2/twostep/msg/GridH2ValueMessageFactory.java | 2 +-
.../{ => indexing}/ValidateIndexesClosure.java | 6 +-
.../{ => indexing}/VisorValidateIndexesTask.java | 5 +-
...xingMultithreadedLoadContinuousRestartTest.java | 2 +-
.../query/IgniteCachelessQueriesSelfTest.java | 2 +-
.../query/IgniteQueryDedicatedPoolTest.java | 1 -
21 files changed, 98 insertions(+), 53 deletions(-)
diff --git a/modules/dev-utils/ignite-modules-test/build.gradle b/modules/dev-utils/ignite-modules-test/build.gradle
index a71ac5b..283a408 100644
--- a/modules/dev-utils/ignite-modules-test/build.gradle
+++ b/modules/dev-utils/ignite-modules-test/build.gradle
@@ -26,8 +26,8 @@ sourceCompatibility = 11
targetCompatibility = 11
ext {
- //ignVer = '2.8.0-SNAPSHOT'
- ignVer = '2.7.0'
+ ignVer = '2.8.0-SNAPSHOT'
+ //ignVer = '2.7.0'
moduleName = 'ignite_modules_test'
}
@@ -64,9 +64,9 @@ dependencies {
compile group: 'org.apache.ignite', name: 'ignite-core', version: ignVer
//todo https://issues.apache.org/jira/browse/IGNITE-11464 - Fix indexing modularity:
- /* compile(group: 'org.apache.ignite', name: 'ignite-indexing', version: ignVer) {
+ compile(group: 'org.apache.ignite', name: 'ignite-indexing', version: ignVer) {
exclude group: 'org.apache.lucene' // to remove "lucene-sandbox and analyzers-commons" package conflicts.
- }*/
+ }
def luceneVer = '7.7.1'
// compile 'org.apache.lucene:lucene-core:' + luceneVer
diff --git a/modules/dev-utils/ignite-modules-test/deps.txt b/modules/dev-utils/ignite-modules-test/deps.txt
index 45e686d..2337570 100644
--- a/modules/dev-utils/ignite-modules-test/deps.txt
+++ b/modules/dev-utils/ignite-modules-test/deps.txt
@@ -15,40 +15,60 @@ archives - Configuration for archive artifacts.
No dependencies
compile - Dependencies for source set 'main' (deprecated, use 'implementation' instead).
-\--- org.apache.ignite:ignite-core:2.7.0
- +--- javax.cache:cache-api:1.0.0
- +--- org.jetbrains:annotations:13.0
- \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
+| +--- javax.cache:cache-api:1.0.0
+| +--- org.jetbrains:annotations:16.0.3
+| \--- org.gridgain:ignite-shmem:1.0.0
+\--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+ +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+ +--- commons-codec:commons-codec:1.11
+ \--- com.h2database:h2:1.4.197
compileClasspath - Compile classpath for source set 'main'.
-\--- org.apache.ignite:ignite-core:2.7.0
- +--- javax.cache:cache-api:1.0.0
- +--- org.jetbrains:annotations:13.0
- \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
+| +--- javax.cache:cache-api:1.0.0
+| +--- org.jetbrains:annotations:16.0.3
+| \--- org.gridgain:ignite-shmem:1.0.0
+\--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+ +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+ +--- commons-codec:commons-codec:1.11
+ \--- com.h2database:h2:1.4.197
compileOnly - Compile only dependencies for source set 'main'.
No dependencies
default - Configuration for default artifacts.
-\--- org.apache.ignite:ignite-core:2.7.0
- +--- javax.cache:cache-api:1.0.0
- +--- org.jetbrains:annotations:13.0
- \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
+| +--- javax.cache:cache-api:1.0.0
+| +--- org.jetbrains:annotations:16.0.3
+| \--- org.gridgain:ignite-shmem:1.0.0
+\--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+ +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+ +--- commons-codec:commons-codec:1.11
+ \--- com.h2database:h2:1.4.197
implementation - Implementation only dependencies for source set 'main'. (n)
No dependencies
runtime - Runtime dependencies for source set 'main' (deprecated, use 'runtimeOnly' instead).
-\--- org.apache.ignite:ignite-core:2.7.0
- +--- javax.cache:cache-api:1.0.0
- +--- org.jetbrains:annotations:13.0
- \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
+| +--- javax.cache:cache-api:1.0.0
+| +--- org.jetbrains:annotations:16.0.3
+| \--- org.gridgain:ignite-shmem:1.0.0
+\--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+ +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+ +--- commons-codec:commons-codec:1.11
+ \--- com.h2database:h2:1.4.197
runtimeClasspath - Runtime classpath of source set 'main'.
-\--- org.apache.ignite:ignite-core:2.7.0
- +--- javax.cache:cache-api:1.0.0
- +--- org.jetbrains:annotations:13.0
- \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
+| +--- javax.cache:cache-api:1.0.0
+| +--- org.jetbrains:annotations:16.0.3
+| \--- org.gridgain:ignite-shmem:1.0.0
+\--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+ +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+ +--- commons-codec:commons-codec:1.11
+ \--- com.h2database:h2:1.4.197
runtimeElements - Elements of runtime for main. (n)
No dependencies
@@ -60,18 +80,26 @@ testAnnotationProcessor - Annotation processors and their dependencies for sourc
No dependencies
testCompile - Dependencies for source set 'test' (deprecated, use 'testImplementation' instead).
-+--- org.apache.ignite:ignite-core:2.7.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
| +--- javax.cache:cache-api:1.0.0
-| +--- org.jetbrains:annotations:13.0
+| +--- org.jetbrains:annotations:16.0.3
| \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+| +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+| +--- commons-codec:commons-codec:1.11
+| \--- com.h2database:h2:1.4.197
\--- junit:junit:4.12
\--- org.hamcrest:hamcrest-core:1.3
testCompileClasspath - Compile classpath for source set 'test'.
-+--- org.apache.ignite:ignite-core:2.7.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
| +--- javax.cache:cache-api:1.0.0
-| +--- org.jetbrains:annotations:13.0
+| +--- org.jetbrains:annotations:16.0.3
| \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+| +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+| +--- commons-codec:commons-codec:1.11
+| \--- com.h2database:h2:1.4.197
\--- junit:junit:4.12
\--- org.hamcrest:hamcrest-core:1.3
@@ -82,24 +110,34 @@ testImplementation - Implementation only dependencies for source set 'test'. (n)
No dependencies
testRuntime - Runtime dependencies for source set 'test' (deprecated, use 'testRuntimeOnly' instead).
-+--- org.apache.ignite:ignite-core:2.7.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
| +--- javax.cache:cache-api:1.0.0
-| +--- org.jetbrains:annotations:13.0
+| +--- org.jetbrains:annotations:16.0.3
| \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+| +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+| +--- commons-codec:commons-codec:1.11
+| \--- com.h2database:h2:1.4.197
\--- junit:junit:4.12
\--- org.hamcrest:hamcrest-core:1.3
testRuntimeClasspath - Runtime classpath of source set 'test'.
-+--- org.apache.ignite:ignite-core:2.7.0
++--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT
| +--- javax.cache:cache-api:1.0.0
-| +--- org.jetbrains:annotations:13.0
+| +--- org.jetbrains:annotations:16.0.3
| \--- org.gridgain:ignite-shmem:1.0.0
++--- org.apache.ignite:ignite-indexing:2.8.0-SNAPSHOT
+| +--- org.apache.ignite:ignite-core:2.8.0-SNAPSHOT (*)
+| +--- commons-codec:commons-codec:1.11
+| \--- com.h2database:h2:1.4.197
\--- junit:junit:4.12
\--- org.hamcrest:hamcrest-core:1.3
testRuntimeOnly - Runtime only dependencies for source set 'test'. (n)
No dependencies
+(*) - dependencies omitted (listed previously)
+
A web-based, searchable dependency report is available by adding the --scan option.
BUILD SUCCESSFUL in 1s
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/GridCacheTwoStepQuery.java
similarity index 97%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
rename to modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/GridCacheTwoStepQuery.java
index 0fcddeb..122ee2f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/GridCacheTwoStepQuery.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.query;
+package org.apache.ignite.internal.processors.cache.query.indexing;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
import org.apache.ignite.internal.sql.optimizer.affinity.PartitionResult;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/QueryTable.java
similarity index 98%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryTable.java
rename to modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/QueryTable.java
index ca6343c..168234c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryTable.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/QueryTable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.query;
+package org.apache.ignite.internal.processors.cache.query.indexing;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/RegisteredQueryCursor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/RegisteredQueryCursor.java
similarity index 97%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/RegisteredQueryCursor.java
rename to modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/RegisteredQueryCursor.java
index 667c713..4d2bfb6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/RegisteredQueryCursor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/indexing/RegisteredQueryCursor.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.ignite.internal.processors.cache.query;
+package org.apache.ignite.internal.processors.cache.query.indexing;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
index d4430ea..35e35a5 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
@@ -49,7 +49,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
-import org.apache.ignite.internal.processors.cache.query.QueryTable;
+import org.apache.ignite.internal.processors.cache.query.indexing.QueryTable;
import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
import org.apache.ignite.internal.processors.query.GridQueryProperty;
import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 65a85ba..3e1d776 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -68,9 +68,9 @@ import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.cache.query.indexing.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
-import org.apache.ignite.internal.processors.cache.query.RegisteredQueryCursor;
+import org.apache.ignite.internal.processors.cache.query.indexing.RegisteredQueryCursor;
import org.apache.ignite.internal.processors.cache.query.SqlFieldsQueryEx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter;
import org.apache.ignite.internal.processors.cache.tree.CacheDataTree;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
index 6ddea41..fcb6558 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
@@ -25,7 +25,7 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheContextInfo;
import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.cache.query.indexing.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
import org.apache.ignite.internal.processors.cache.query.SqlFieldsQueryEx;
import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultSelect.java
index 1c4be7d..73ef8f5 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultSelect.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.query.h2;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.cache.query.indexing.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
import org.apache.ignite.internal.processors.query.h2.sql.GridSqlStatement;
import org.jetbrains.annotations.Nullable;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
index e7c5bee..accd9ea 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
@@ -38,7 +38,7 @@ import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.cache.GridCacheContextInfo;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
-import org.apache.ignite.internal.processors.cache.query.QueryTable;
+import org.apache.ignite.internal.processors.cache.query.indexing.QueryTable;
import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
import org.apache.ignite.internal.processors.query.IgniteSQLException;
import org.apache.ignite.internal.processors.query.QueryField;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java
index aa47c1b..b95a49b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java
@@ -32,7 +32,7 @@ import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.cache.query.indexing.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
import org.apache.ignite.internal.processors.cache.query.SqlFieldsQueryEx;
import org.apache.ignite.internal.processors.query.GridQueryProperty;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
index cb0adb9..42e0d17 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
@@ -34,7 +34,7 @@ import org.apache.ignite.cache.query.QueryRetryException;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheContextInfo;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
-import org.apache.ignite.internal.processors.cache.query.QueryTable;
+import org.apache.ignite.internal.processors.cache.query.indexing.QueryTable;
import org.apache.ignite.internal.processors.query.IgniteSQLException;
import org.apache.ignite.internal.processors.query.QueryField;
import org.apache.ignite.internal.processors.query.QueryUtils;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 582b62a..c798ec9 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -34,9 +34,9 @@ import javax.cache.CacheException;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.cache.query.indexing.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
-import org.apache.ignite.internal.processors.cache.query.QueryTable;
+import org.apache.ignite.internal.processors.cache.query.indexing.QueryTable;
import org.apache.ignite.internal.processors.query.IgniteSQLException;
import org.apache.ignite.internal.processors.query.h2.H2Utils;
import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index b2c5170..fc9700e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -62,7 +62,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.TxTopologyVe
import org.apache.ignite.internal.processors.cache.mvcc.MvccQueryTracker;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.cache.query.indexing.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.query.GridQueryCacheObjectsIterator;
import org.apache.ignite.internal.processors.query.GridQueryCancel;
import org.apache.ignite.internal.processors.query.IgniteSQLException;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index b5c1f77..2cafd65 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -35,7 +35,7 @@ import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
-import org.apache.ignite.internal.processors.cache.query.QueryTable;
+import org.apache.ignite.internal.processors.cache.query.indexing.QueryTable;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
index c399d76..101e225 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.processors.cache.query.QueryTable;
+import org.apache.ignite.internal.processors.cache.query.indexing.QueryTable;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2ValueCacheObject;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/indexing/ValidateIndexesClosure.java
similarity index 98%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
rename to modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/indexing/ValidateIndexesClosure.java
index b3c5fd3..41492eb 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/indexing/ValidateIndexesClosure.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.visor.verify.indexing;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -70,6 +70,10 @@ import org.apache.ignite.internal.util.lang.GridIterator;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.verify.IndexIntegrityCheckIssue;
+import org.apache.ignite.internal.visor.verify.IndexValidationIssue;
+import org.apache.ignite.internal.visor.verify.ValidateIndexesPartitionResult;
+import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/indexing/VisorValidateIndexesTask.java
similarity index 93%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
rename to modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/indexing/VisorValidateIndexesTask.java
index 922c53e..4203c6d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/indexing/VisorValidateIndexesTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.visor.verify.indexing;
import java.util.ArrayList;
import java.util.Collection;
@@ -33,6 +33,9 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorMultiNodeTask;
import org.apache.ignite.internal.visor.VisorTaskArgument;
+import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
+import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskArg;
+import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskResult;
import org.jetbrains.annotations.Nullable;
/**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java
index 2b5d882..57a8490 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java
@@ -32,7 +32,7 @@ import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
+import org.apache.ignite.internal.visor.verify.indexing.ValidateIndexesClosure;
import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java
index c8ba516..0705d59 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.cache.query.indexing.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.query.h2.QueryParserCacheEntry;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
index 4cd3faf..df0fc7c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
@@ -36,7 +36,6 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.managers.communication.GridIoManager;
import org.apache.ignite.internal.managers.communication.GridIoPolicy;
import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
-import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.spi.IgniteSpiAdapter;