diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD index ddb21ac079..25b0ed3739 100644 --- a/gerrit-acceptance-framework/BUILD +++ b/gerrit-acceptance-framework/BUILD @@ -7,6 +7,7 @@ PROVIDED = [ "//gerrit-common:server", "//gerrit-extension-api:api", "//gerrit-httpd:httpd", + "//gerrit-index:index", "//gerrit-lucene:lucene", "//gerrit-pgm:init", "//gerrit-reviewdb:server", diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java index 7f502e4d18..7809ae060c 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java @@ -14,13 +14,13 @@ package com.google.gerrit.acceptance; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change.Id; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.change.ChangeIndex; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import java.io.IOException; diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD index 3ba339d60d..fb86aaff08 100644 --- a/gerrit-elasticsearch/BUILD +++ b/gerrit-elasticsearch/BUILD @@ -4,6 +4,7 @@ java_library( visibility = ["//visibility:public"], deps = [ "//gerrit-extension-api:api", + "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-reviewdb:server", "//gerrit-server:server", @@ -35,6 +36,7 @@ java_library( deps = [ ":elasticsearch", "//gerrit-extension-api:api", + "//gerrit-index:index", "//gerrit-reviewdb:server", "//gerrit-server:server", "//lib:gson", diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java index 3462eebaf3..8f0ea8fb84 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java @@ -23,12 +23,12 @@ import com.google.common.base.Strings; import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; import com.google.common.collect.Streams; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.Schema.Values; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.Index; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.Schema.Values; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java index 34b6d0fda4..18eb6608ef 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java @@ -20,6 +20,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.gerrit.elasticsearch.ElasticMapping.MappingProperties; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountCache; @@ -27,12 +31,8 @@ import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.account.AccountField; import com.google.gerrit.server.index.account.AccountIndex; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java index b53313ac26..b99f2969c3 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java @@ -30,6 +30,9 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.gerrit.elasticsearch.ElasticMapping.MappingProperties; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; @@ -41,13 +44,10 @@ import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.change.ChangeIndexRewriter; import com.google.gerrit.server.project.SubmitRuleOptions; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeDataSource; import com.google.gson.JsonArray; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java index f52db4b0fa..38c4e238ba 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java @@ -18,18 +18,18 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.gerrit.elasticsearch.ElasticMapping.MappingProperties; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.group.GroupField; import com.google.gerrit.server.index.group.GroupIndex; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java index a6901366a0..7868443e0a 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java @@ -16,9 +16,9 @@ package com.google.gerrit.elasticsearch; import static com.google.common.base.Preconditions.checkArgument; +import com.google.gerrit.index.IndexConfig; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.OnlineUpgrader; import com.google.gerrit.server.index.SingleVersionModule; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java index af74daf8c6..9e1c7298db 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java @@ -15,9 +15,9 @@ package com.google.gerrit.elasticsearch; import com.google.common.collect.ImmutableMap; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.FieldType; -import com.google.gerrit.server.index.Schema; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.FieldType; +import com.google.gerrit.index.Schema; import java.util.Map; class ElasticMapping { diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java index 8492104829..a470696a86 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java @@ -14,17 +14,17 @@ package com.google.gerrit.elasticsearch; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.FieldType; +import com.google.gerrit.index.query.AndPredicate; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.IntegerRangePredicate; +import com.google.gerrit.index.query.NotPredicate; +import com.google.gerrit.index.query.OrPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.FieldType; -import com.google.gerrit.server.index.IndexPredicate; -import com.google.gerrit.server.index.IntegerRangePredicate; -import com.google.gerrit.server.index.RegexPredicate; -import com.google.gerrit.server.index.TimestampRangePredicate; -import com.google.gerrit.server.query.AndPredicate; -import com.google.gerrit.server.query.NotPredicate; -import com.google.gerrit.server.query.OrPredicate; -import com.google.gerrit.server.query.Predicate; +import com.google.gerrit.index.query.RegexPredicate; +import com.google.gerrit.index.query.TimestampRangePredicate; import com.google.gerrit.server.query.change.AfterPredicate; import java.time.Instant; import org.apache.lucene.search.BooleanQuery; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java index 609c4d95cf..b2b241fd54 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java @@ -17,13 +17,13 @@ package com.google.gerrit.elasticsearch; import com.google.common.base.MoreObjects; import com.google.common.primitives.Ints; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.Schema; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.GerritIndexStatus; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexDefinition; import com.google.gerrit.server.index.OnlineUpgradeListener; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.VersionManager; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java index ece9edddd8..694348fe0b 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java @@ -26,10 +26,10 @@ import com.google.common.io.Files; import com.google.gerrit.elasticsearch.ElasticAccountIndex.AccountMapping; import com.google.gerrit.elasticsearch.ElasticChangeIndex.ChangeMapping; import com.google.gerrit.elasticsearch.ElasticGroupIndex.GroupMapping; +import com.google.gerrit.index.Schema; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.index.IndexModule.IndexType; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.account.AccountSchemaDefinitions; import com.google.gerrit.server.index.change.ChangeSchemaDefinitions; import com.google.gerrit.server.index.group.GroupSchemaDefinitions; diff --git a/gerrit-index/BUILD b/gerrit-index/BUILD index f3743cbbc9..3031a26f0e 100644 --- a/gerrit-index/BUILD +++ b/gerrit-index/BUILD @@ -1,9 +1,11 @@ load("//tools/bzl:genrule2.bzl", "genrule2") load("//tools/bzl:junit.bzl", "junit_tests") +QUERY_PARSE_EXCEPTION_SRCS = ["src/main/java/com/google/gerrit/index/query/QueryParseException.java"] + java_library( name = "query_exception", - srcs = ["src/main/java/com/google/gerrit/index/query/QueryParseException.java"], + srcs = QUERY_PARSE_EXCEPTION_SRCS, visibility = ["//visibility:public"], ) @@ -25,21 +27,47 @@ genrule2( java_library( name = "query_parser", srcs = [":query_antlr"], - visibility = ["//visibility:public"], + visibility = ["//gerrit-plugin-api:__pkg__"], deps = [ ":query_exception", "//lib/antlr:java_runtime", ], ) +java_library( + name = "index", + srcs = glob( + ["src/main/java/**/*.java"], + exclude = QUERY_PARSE_EXCEPTION_SRCS, + ), + visibility = ["//visibility:public"], + deps = [ + ":query_exception", + ":query_parser", + "//gerrit-common:annotations", + "//gerrit-extension-api:api", + "//lib:guava", + "//lib:gwtjsonrpc", + "//lib:gwtorm", + "//lib/antlr:java_runtime", + "//lib/auto:auto-value", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/log:api", + ], +) + junit_tests( name = "index_tests", size = "small", srcs = glob(["src/test/java/**/*.java"]), visibility = ["//visibility:public"], deps = [ + ":index", ":query_exception", ":query_parser", + "//lib:junit", + "//lib:truth", "//lib/antlr:java_runtime", + "//lib/jgit/org.eclipse.jgit:jgit", ], ) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java b/gerrit-index/src/main/java/com/google/gerrit/index/FieldDef.java similarity index 99% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java rename to gerrit-index/src/main/java/com/google/gerrit/index/FieldDef.java index 5e226e23af..b1ffac1a1b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/FieldDef.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java b/gerrit-index/src/main/java/com/google/gerrit/index/FieldType.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java rename to gerrit-index/src/main/java/com/google/gerrit/index/FieldType.java index 820b62a884..0db0284388 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/FieldType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import java.sql.Timestamp; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/Index.java b/gerrit-index/src/main/java/com/google/gerrit/index/Index.java similarity index 93% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/Index.java rename to gerrit-index/src/main/java/com/google/gerrit/index/Index.java index 4710bc76cf..739c358a99 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/Index.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/Index.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import java.io.IOException; import java.util.List; @@ -26,8 +27,8 @@ import java.util.Optional; * Secondary index implementation for arbitrary documents. * *

Documents are inserted into the index and are queried by converting special {@link - * com.google.gerrit.server.query.Predicate} instances into index-aware predicates that use the - * index search results as a source. + * com.google.gerrit.index.query.Predicate} instances into index-aware predicates that use the index + * search results as a source. * *

Implementations must be thread-safe and should batch inserts/updates where appropriate. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java b/gerrit-index/src/main/java/com/google/gerrit/index/IndexCollection.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java rename to gerrit-index/src/main/java/com/google/gerrit/index/IndexCollection.java index a88785204f..77cabd19e0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/IndexCollection.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import com.google.common.collect.Lists; import com.google.gerrit.extensions.events.LifecycleListener; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexConfig.java b/gerrit-index/src/main/java/com/google/gerrit/index/IndexConfig.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexConfig.java rename to gerrit-index/src/main/java/com/google/gerrit/index/IndexConfig.java index 5c3cdf2982..b53b59b0ba 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexConfig.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/IndexConfig.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.base.Preconditions.checkArgument; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexDefinition.java b/gerrit-index/src/main/java/com/google/gerrit/index/IndexDefinition.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexDefinition.java rename to gerrit-index/src/main/java/com/google/gerrit/index/IndexDefinition.java index 0d42ee5af7..f283bf1739 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexDefinition.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/IndexDefinition.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import com.google.common.collect.ImmutableSortedMap; import com.google.gerrit.common.Nullable; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriter.java b/gerrit-index/src/main/java/com/google/gerrit/index/IndexRewriter.java similarity index 89% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriter.java rename to gerrit-index/src/main/java/com/google/gerrit/index/IndexRewriter.java index bca380ae1a..4d6a35b587 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriter.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/IndexRewriter.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.query.Predicate; public interface IndexRewriter { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexedQuery.java b/gerrit-index/src/main/java/com/google/gerrit/index/IndexedQuery.java similarity index 94% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexedQuery.java rename to gerrit-index/src/main/java/com/google/gerrit/index/IndexedQuery.java index ee626376ef..050b4a9d28 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexedQuery.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/IndexedQuery.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Paginated; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Paginated; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; import java.util.Collection; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/QueryOptions.java b/gerrit-index/src/main/java/com/google/gerrit/index/QueryOptions.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/QueryOptions.java rename to gerrit-index/src/main/java/com/google/gerrit/index/QueryOptions.java index a26b0ace16..b57fb5f351 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/QueryOptions.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/QueryOptions.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.base.Preconditions.checkArgument; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java b/gerrit-index/src/main/java/com/google/gerrit/index/Schema.java similarity index 99% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java rename to gerrit-index/src/main/java/com/google/gerrit/index/Schema.java index d14a37fa35..307095112b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/Schema.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.base.Preconditions.checkState; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/SchemaDefinitions.java b/gerrit-index/src/main/java/com/google/gerrit/index/SchemaDefinitions.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/SchemaDefinitions.java rename to gerrit-index/src/main/java/com/google/gerrit/index/SchemaDefinitions.java index 261734d985..f9c690c411 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/SchemaDefinitions.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/SchemaDefinitions.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/SchemaUtil.java b/gerrit-index/src/main/java/com/google/gerrit/index/SchemaUtil.java similarity index 99% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/SchemaUtil.java rename to gerrit-index/src/main/java/com/google/gerrit/index/SchemaUtil.java index ea33190e6a..c59f251acf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/SchemaUtil.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/SchemaUtil.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.base.Preconditions.checkArgument; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java b/gerrit-index/src/main/java/com/google/gerrit/index/SiteIndexer.java similarity index 99% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java rename to gerrit-index/src/main/java/com/google/gerrit/index/SiteIndexer.java index 0d84be7977..4ad082781d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/SiteIndexer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/AndPredicate.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/AndPredicate.java index 7d99052c57..7fba05fccf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/AndPredicate.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static com.google.common.base.Preconditions.checkState; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/AndSource.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/AndSource.java similarity index 99% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/AndSource.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/AndSource.java index dcd8a664e5..16620b3897 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/AndSource.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/AndSource.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static com.google.common.base.Preconditions.checkArgument; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/DataSource.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/DataSource.java similarity index 95% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/DataSource.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/DataSource.java index 8a1718d305..77dcca26ac 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/DataSource.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/DataSource.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/IndexPredicate.java similarity index 90% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/IndexPredicate.java index ff9ff03dcf..7811a32d90 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/IndexPredicate.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index.query; -import com.google.gerrit.server.query.OperatorPredicate; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.FieldType; /** Index-aware predicate that includes a field type annotation. */ public abstract class IndexPredicate extends OperatorPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/IntPredicate.java similarity index 97% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/IntPredicate.java index 42dcff8dd3..16e59e7360 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/IntPredicate.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; /** Predicate to filter a field by matching integer value. */ public abstract class IntPredicate extends OperatorPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IntegerRangePredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/IntegerRangePredicate.java similarity index 91% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IntegerRangePredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/IntegerRangePredicate.java index 68cc00383c..66351a8f45 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IntegerRangePredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/IntegerRangePredicate.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index.query; -import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.index.RangeUtil.Range; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.query.RangeUtil.Range; import com.google.gwtorm.server.OrmException; public abstract class IntegerRangePredicate extends IndexPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/IsVisibleToPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/IsVisibleToPredicate.java similarity index 95% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/IsVisibleToPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/IsVisibleToPredicate.java index 6d6014d4b8..9cc6f50c23 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/IsVisibleToPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/IsVisibleToPredicate.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; public abstract class IsVisibleToPredicate extends OperatorPredicate implements Matchable { public IsVisibleToPredicate(String name, String value) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/LimitPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/LimitPredicate.java similarity index 92% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/LimitPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/LimitPredicate.java index e4bdb16441..23e0f6dbd0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/LimitPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/LimitPredicate.java @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; - -import com.google.gerrit.index.query.QueryParseException; +package com.google.gerrit.index.query; public class LimitPredicate extends IntPredicate implements Matchable { @SuppressWarnings("unchecked") diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/Matchable.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/Matchable.java similarity index 95% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/Matchable.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/Matchable.java index b37e1121d6..3d07943874 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/Matchable.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/Matchable.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/NotPredicate.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/NotPredicate.java index 306b4cbba8..750759d24c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/NotPredicate.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static com.google.common.base.Preconditions.checkState; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/OperatorPredicate.java similarity index 95% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/OperatorPredicate.java index 7fd205fd45..368ee2419a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/OperatorPredicate.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; -import com.google.gerrit.index.query.QueryParser; import java.util.Collection; /** Predicate to filter a field by matching value. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/OrPredicate.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/OrPredicate.java index f357344be4..8c3ed1c596 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/OrPredicate.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static com.google.common.base.Preconditions.checkState; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/Paginated.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/Paginated.java similarity index 89% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/Paginated.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/Paginated.java index a51555ec85..20f65dcf06 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/Paginated.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/Paginated.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; -import com.google.gerrit.server.index.QueryOptions; +import com.google.gerrit.index.QueryOptions; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/Predicate.java similarity index 99% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/Predicate.java index c5b2b96cbd..ca74a52ee5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/Predicate.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static com.google.common.base.Preconditions.checkState; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/QueryBuilder.java similarity index 97% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/QueryBuilder.java index 67a8a7f92d..c6c39c3fe0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/QueryBuilder.java @@ -12,8 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; +import static com.google.gerrit.index.query.Predicate.and; +import static com.google.gerrit.index.query.Predicate.not; +import static com.google.gerrit.index.query.Predicate.or; import static com.google.gerrit.index.query.QueryParser.AND; import static com.google.gerrit.index.query.QueryParser.DEFAULT_FIELD; import static com.google.gerrit.index.query.QueryParser.EXACT_PHRASE; @@ -21,13 +24,8 @@ import static com.google.gerrit.index.query.QueryParser.FIELD_NAME; import static com.google.gerrit.index.query.QueryParser.NOT; import static com.google.gerrit.index.query.QueryParser.OR; import static com.google.gerrit.index.query.QueryParser.SINGLE_WORD; -import static com.google.gerrit.server.query.Predicate.and; -import static com.google.gerrit.server.query.Predicate.not; -import static com.google.gerrit.server.query.Predicate.or; import com.google.common.base.Strings; -import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.index.query.QueryParser; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryResult.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/QueryResult.java similarity index 86% rename from gerrit-server/src/main/java/com/google/gerrit/server/query/QueryResult.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/QueryResult.java index f86eb70766..341e2b60f7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryResult.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/QueryResult.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import com.google.auto.value.AutoValue; import com.google.gerrit.common.Nullable; @@ -21,7 +21,7 @@ import java.util.List; /** Results of a query over entities. */ @AutoValue public abstract class QueryResult { - static QueryResult create( + public static QueryResult create( @Nullable String query, Predicate predicate, int limit, List entites) { boolean more; if (entites.size() > limit) { @@ -44,8 +44,8 @@ public abstract class QueryResult { public abstract List entities(); /** - * @return whether the query could be retried with {@link QueryProcessor#setStart(int)} to produce - * more results. Never true if {@link #entities()} is empty. + * @return whether the query could be retried with a higher start/limit to produce more results. + * Never true if {@link #entities()} is empty. */ public abstract boolean more(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/RangeUtil.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/RangeUtil.java similarity index 98% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/RangeUtil.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/RangeUtil.java index 5296f46e7a..1f22f3622e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/RangeUtil.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/RangeUtil.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index.query; import com.google.common.primitives.Ints; import com.google.gerrit.common.Nullable; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/RegexPredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/RegexPredicate.java similarity index 91% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/RegexPredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/RegexPredicate.java index b73674dd95..60a2a9ea91 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/RegexPredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/RegexPredicate.java @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index.query; + +import com.google.gerrit.index.FieldDef; public abstract class RegexPredicate extends IndexPredicate { protected RegexPredicate(FieldDef def, String value) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/TimestampRangePredicate.java b/gerrit-index/src/main/java/com/google/gerrit/index/query/TimestampRangePredicate.java similarity index 93% rename from gerrit-server/src/main/java/com/google/gerrit/server/index/TimestampRangePredicate.java rename to gerrit-index/src/main/java/com/google/gerrit/index/query/TimestampRangePredicate.java index a67c0b6d07..edc21205c3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/TimestampRangePredicate.java +++ b/gerrit-index/src/main/java/com/google/gerrit/index/query/TimestampRangePredicate.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index.query; -import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.index.FieldDef; import com.google.gwtjsonrpc.common.JavaSqlTimestampHelper; import java.sql.Timestamp; import java.util.Date; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java b/gerrit-index/src/test/java/com/google/gerrit/index/SchemaUtilTest.java similarity index 92% rename from gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java rename to gerrit-index/src/test/java/com/google/gerrit/index/SchemaUtilTest.java index 9267f37b9d..3c0bbe0e82 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java +++ b/gerrit-index/src/test/java/com/google/gerrit/index/SchemaUtilTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.index; import static com.google.common.truth.Truth.assertThat; -import static com.google.gerrit.server.index.SchemaUtil.getNameParts; -import static com.google.gerrit.server.index.SchemaUtil.getPersonParts; -import static com.google.gerrit.server.index.SchemaUtil.schema; +import static com.google.gerrit.index.SchemaUtil.getNameParts; +import static com.google.gerrit.index.SchemaUtil.getPersonParts; +import static com.google.gerrit.index.SchemaUtil.schema; import java.util.Map; import org.eclipse.jgit.lib.PersonIdent; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java b/gerrit-index/src/test/java/com/google/gerrit/index/query/AndPredicateTest.java similarity index 97% rename from gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java rename to gerrit-index/src/test/java/com/google/gerrit/index/query/AndPredicateTest.java index cc590817c5..21098b315e 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java +++ b/gerrit-index/src/test/java/com/google/gerrit/index/query/AndPredicateTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static com.google.common.collect.ImmutableList.of; -import static com.google.gerrit.server.query.Predicate.and; +import static com.google.gerrit.index.query.Predicate.and; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java b/gerrit-index/src/test/java/com/google/gerrit/index/query/FieldPredicateTest.java similarity index 98% rename from gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java rename to gerrit-index/src/test/java/com/google/gerrit/index/query/FieldPredicateTest.java index 6a72fce4e7..8fe90fceeb 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java +++ b/gerrit-index/src/test/java/com/google/gerrit/index/query/FieldPredicateTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java b/gerrit-index/src/test/java/com/google/gerrit/index/query/NotPredicateTest.java similarity index 95% rename from gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java rename to gerrit-index/src/test/java/com/google/gerrit/index/query/NotPredicateTest.java index f70b8fc85e..88d8349783 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java +++ b/gerrit-index/src/test/java/com/google/gerrit/index/query/NotPredicateTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; -import static com.google.gerrit.server.query.Predicate.and; -import static com.google.gerrit.server.query.Predicate.not; +import static com.google.gerrit.index.query.Predicate.and; +import static com.google.gerrit.index.query.Predicate.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java b/gerrit-index/src/test/java/com/google/gerrit/index/query/OrPredicateTest.java similarity index 97% rename from gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java rename to gerrit-index/src/test/java/com/google/gerrit/index/query/OrPredicateTest.java index 7d97a0d861..255a3f8cce 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java +++ b/gerrit-index/src/test/java/com/google/gerrit/index/query/OrPredicateTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import static com.google.common.collect.ImmutableList.of; -import static com.google.gerrit.server.query.Predicate.or; +import static com.google.gerrit.index.query.Predicate.or; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java b/gerrit-index/src/test/java/com/google/gerrit/index/query/PredicateTest.java similarity index 96% rename from gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java rename to gerrit-index/src/test/java/com/google/gerrit/index/query/PredicateTest.java index 44f0cad862..6979d826d7 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java +++ b/gerrit-index/src/test/java/com/google/gerrit/index/query/PredicateTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.query; +package com.google.gerrit.index.query; import org.junit.Ignore; import org.junit.Rule; diff --git a/gerrit-lucene/BUILD b/gerrit-lucene/BUILD index 8615291ff2..aae50001ed 100644 --- a/gerrit-lucene/BUILD +++ b/gerrit-lucene/BUILD @@ -7,6 +7,7 @@ java_library( srcs = QUERY_BUILDER, visibility = ["//visibility:public"], deps = [ + "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-reviewdb:server", "//gerrit-server:server", @@ -28,6 +29,7 @@ java_library( "//gerrit-common:annotations", "//gerrit-common:server", "//gerrit-extension-api:api", + "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-reviewdb:server", "//gerrit-server:server", diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java index ad72f7080c..9d474dd8ea 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java @@ -25,13 +25,13 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.FieldType; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.Schema.Values; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.FieldType; -import com.google.gerrit.server.index.Index; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.Schema.Values; import java.io.IOException; import java.sql.Timestamp; import java.util.Set; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/ChangeSubIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/ChangeSubIndex.java index 121760b2b6..126c79fc6e 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/ChangeSubIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/ChangeSubIndex.java @@ -19,17 +19,17 @@ import static com.google.gerrit.lucene.LuceneChangeIndex.ID_SORT_FIELD; import static com.google.gerrit.lucene.LuceneChangeIndex.UPDATED_SORT_FIELD; import static com.google.gerrit.server.index.change.ChangeSchemaDefinitions.NAME; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.Schema.Values; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.Schema.Values; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import java.io.IOException; import java.nio.file.Path; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java index 69c24abb10..7a4cd4078f 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java @@ -16,6 +16,10 @@ package com.google.gerrit.lucene; import static com.google.gerrit.server.index.account.AccountField.ID; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountCache; @@ -23,11 +27,7 @@ import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.account.AccountIndex; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; import com.google.inject.Inject; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java index d89baa7cd5..80078dcaa4 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -36,6 +36,9 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; @@ -47,13 +50,10 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexExecutor; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.change.ChangeIndexRewriter; import com.google.gerrit.server.project.SubmitRuleOptions; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeDataSource; import com.google.gwtorm.protobuf.ProtobufCodec; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneGroupIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneGroupIndex.java index ea9a3583cd..f08b3df318 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneGroupIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneGroupIndex.java @@ -16,17 +16,17 @@ package com.google.gerrit.lucene; import static com.google.gerrit.server.index.group.GroupField.UUID; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.group.GroupIndex; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; import com.google.inject.Inject; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java index b5531d54a3..d738540e25 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java @@ -17,9 +17,9 @@ package com.google.gerrit.lucene; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.collect.ImmutableMap; +import com.google.gerrit.index.IndexConfig; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.OnlineUpgrader; import com.google.gerrit.server.index.SingleVersionModule; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java index 9e8007c79a..c7c802f07a 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java @@ -16,13 +16,13 @@ package com.google.gerrit.lucene; import com.google.common.primitives.Ints; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.Schema; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.GerritIndexStatus; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexDefinition; import com.google.gerrit.server.index.OnlineUpgradeListener; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.VersionManager; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java index 738f88dce1..2f2a1cdd42 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java @@ -21,17 +21,17 @@ import static org.apache.lucene.search.BooleanClause.Occur.MUST_NOT; import static org.apache.lucene.search.BooleanClause.Occur.SHOULD; import com.google.common.collect.Lists; +import com.google.gerrit.index.FieldType; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.AndPredicate; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.IntegerRangePredicate; +import com.google.gerrit.index.query.NotPredicate; +import com.google.gerrit.index.query.OrPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.index.FieldType; -import com.google.gerrit.server.index.IndexPredicate; -import com.google.gerrit.server.index.IntegerRangePredicate; -import com.google.gerrit.server.index.RegexPredicate; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.TimestampRangePredicate; -import com.google.gerrit.server.query.AndPredicate; -import com.google.gerrit.server.query.NotPredicate; -import com.google.gerrit.server.query.OrPredicate; -import com.google.gerrit.server.query.Predicate; +import com.google.gerrit.index.query.RegexPredicate; +import com.google.gerrit.index.query.TimestampRangePredicate; import java.util.Date; import java.util.List; import org.apache.lucene.analysis.Analyzer; diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD index 24a19d4062..d814bb7ded 100644 --- a/gerrit-pgm/BUILD +++ b/gerrit-pgm/BUILD @@ -50,6 +50,7 @@ java_library( deps = DEPS + [ ":init-api", ":util", + "//gerrit-index:index", "//gerrit-elasticsearch:elasticsearch", "//gerrit-launcher:launcher", # We want this dep to be provided_deps "//gerrit-lucene:lucene", @@ -116,6 +117,7 @@ REST_PGM_DEPS = [ "//gerrit-cache-h2:cache-h2", "//gerrit-elasticsearch:elasticsearch", "//gerrit-gpg:gpg", + "//gerrit-index:index", "//gerrit-lucene:lucene", "//gerrit-oauth:oauth", "//gerrit-openid:openid", diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java index 232d71b739..bee9928153 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java @@ -22,6 +22,9 @@ import com.google.common.collect.Sets; import com.google.gerrit.common.Die; import com.google.gerrit.elasticsearch.ElasticIndexModule; import com.google.gerrit.extensions.config.FactoryModule; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.SiteIndexer; import com.google.gerrit.lifecycle.LifecycleManager; import com.google.gerrit.lucene.LuceneIndexModule; import com.google.gerrit.pgm.util.BatchProgramModule; @@ -29,11 +32,8 @@ import com.google.gerrit.pgm.util.SiteProgram; import com.google.gerrit.pgm.util.ThreadLimiter; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexDefinition; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.IndexModule.IndexType; -import com.google.gerrit.server.index.SiteIndexer; import com.google.gerrit.server.index.change.ChangeSchemaDefinitions; import com.google.inject.Inject; import com.google.inject.Injector; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java index 0d9a822e5d..6ad0a6b856 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java @@ -16,6 +16,7 @@ package com.google.gerrit.pgm.init; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.pgm.init.api.ConsoleUI; import com.google.gerrit.pgm.init.api.InitFlags; import com.google.gerrit.pgm.init.api.InitStep; @@ -24,7 +25,6 @@ import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.IndexModule.IndexType; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.index.SchemaDefinitions; import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexManagerOnInit.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexManagerOnInit.java index 5273dfbc85..6b1ee26715 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexManagerOnInit.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexManagerOnInit.java @@ -15,7 +15,7 @@ package com.google.gerrit.pgm.init.index; import com.google.gerrit.extensions.events.LifecycleListener; -import com.google.gerrit.server.index.IndexDefinition; +import com.google.gerrit.index.IndexDefinition; import com.google.inject.Inject; import com.google.inject.name.Named; import java.util.Collection; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexModuleOnInit.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexModuleOnInit.java index 0358f13ea9..b417d05452 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexModuleOnInit.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/index/IndexModuleOnInit.java @@ -19,10 +19,10 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gerrit.extensions.events.LifecycleListener; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.GroupCache; -import com.google.gerrit.server.index.IndexDefinition; -import com.google.gerrit.server.index.SchemaDefinitions; import com.google.gerrit.server.index.SingleVersionModule; import com.google.gerrit.server.index.SingleVersionModule.SingleVersionListener; import com.google.gerrit.server.index.account.AccountIndexCollection; diff --git a/gerrit-plugin-api/BUILD b/gerrit-plugin-api/BUILD index 8edbc010e3..98d81d0475 100644 --- a/gerrit-plugin-api/BUILD +++ b/gerrit-plugin-api/BUILD @@ -12,6 +12,7 @@ PLUGIN_API = [ ] EXPORTS = [ + "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-index:query_parser", "//gerrit-common:annotations", diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD index 64cfcd0e2a..de1f448392 100644 --- a/gerrit-server/BUILD +++ b/gerrit-server/BUILD @@ -47,8 +47,8 @@ java_library( "//gerrit-common:annotations", "//gerrit-common:server", "//gerrit-extension-api:api", + "//gerrit-index:index", "//gerrit-index:query_exception", - "//gerrit-index:query_parser", "//gerrit-patch-commonsnet:commons-net", "//gerrit-patch-jgit:server", "//gerrit-prettify:server", @@ -73,7 +73,6 @@ java_library( "//lib:soy", "//lib:tukaani-xz", "//lib:velocity", - "//lib/antlr:java_runtime", "//lib/auto:auto-value", "//lib/bouncycastle:bcpkix-neverlink", "//lib/bouncycastle:bcprov-neverlink", @@ -155,6 +154,7 @@ TESTUTIL_DEPS = [ "//gerrit-cache-h2:cache-h2", "//gerrit-extension-api:api", "//gerrit-gpg:gpg", + "//gerrit-index:index", "//gerrit-lucene:lucene", "//gerrit-reviewdb:server", "//lib:gwtorm", diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeFinder.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeFinder.java index 731d1564ce..2e0fe2badf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeFinder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeFinder.java @@ -19,12 +19,12 @@ import com.google.common.cache.Cache; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; +import com.google.gerrit.index.IndexConfig; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.change.ChangeTriplet; -import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.query.change.ChangeData; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java index 2fab9c9587..b9bd658ba3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.extensions.registration.DynamicMap; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.PatchSetApproval; @@ -37,7 +38,6 @@ import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; import com.google.gerrit.server.query.change.InternalChangeQuery; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java index 73f95983cb..b328e377f2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java @@ -26,6 +26,7 @@ import com.google.gerrit.extensions.common.GroupBaseInfo; import com.google.gerrit.extensions.common.SuggestedReviewerInfo; import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.Description.Units; import com.google.gerrit.metrics.MetricMaker; @@ -42,7 +43,6 @@ import com.google.gerrit.server.change.SuggestReviewers; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.query.QueryResult; import com.google.gerrit.server.query.account.AccountPredicates; import com.google.gerrit.server.query.account.AccountQueryBuilder; import com.google.gerrit.server.query.account.AccountQueryProcessor; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java index bb424d6319..a5c696546d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java @@ -22,13 +22,13 @@ import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.extensions.restapi.TopLevelResource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountDirectory.FillOptions; import com.google.gerrit.server.api.accounts.AccountInfoComparator; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.query.Predicate; -import com.google.gerrit.server.query.QueryResult; import com.google.gerrit.server.query.account.AccountPredicates; import com.google.gerrit.server.query.account.AccountQueryBuilder; import com.google.gerrit.server.query.account.AccountQueryProcessor; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java index 6c66e50d73..4e6bb5ba18 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java @@ -81,6 +81,7 @@ import com.google.gerrit.extensions.config.DownloadCommand; import com.google.gerrit.extensions.config.DownloadScheme; import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.restapi.Url; +import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.ChangeMessage; @@ -117,7 +118,6 @@ import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.SubmitRuleOptions; -import com.google.gerrit.server.query.QueryResult; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeData.ChangedLines; import com.google.gerrit.server.query.change.PluginDefinedAttributesFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java index 9fa5c83c70..30bd31b4f5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java @@ -24,10 +24,10 @@ import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.extensions.restapi.TopLevelResource; import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.index.group.GroupIndex; import com.google.gerrit.server.index.group.GroupIndexCollection; -import com.google.gerrit.server.query.QueryResult; import com.google.gerrit.server.query.group.GroupQueryBuilder; import com.google.gerrit.server.query.group.GroupQueryProcessor; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/DummyIndexModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/DummyIndexModule.java index 1706761e56..51ef634252 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/DummyIndexModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/DummyIndexModule.java @@ -14,6 +14,9 @@ package com.google.gerrit.server.index; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.Schema; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.index.account.AccountIndex; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java index 636cce654f..6854a8772f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java @@ -23,6 +23,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.WorkQueue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java index 33b3641ea2..ea9900b7ac 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java @@ -21,6 +21,7 @@ import static com.google.gerrit.server.index.change.ChangeField.PROJECT; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.gerrit.index.QueryOptions; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.account.AccountField; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java index 8d149315b2..bb6b427d4a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java @@ -18,6 +18,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.Lists; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexCollection; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.SiteIndexer; import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java index bf28d7d31b..e3f9d7af5e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java @@ -16,6 +16,9 @@ package com.google.gerrit.server.index; import com.google.common.collect.ImmutableSet; import com.google.gerrit.extensions.events.LifecycleListener; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.Schema; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GerritServerConfig; import com.google.inject.Inject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/VersionManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/VersionManager.java index 697c9c2568..5284117104 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/VersionManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/VersionManager.java @@ -22,8 +22,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexCollection; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.IndexDefinition.IndexFactory; +import com.google.gerrit.index.Schema; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.IndexDefinition.IndexFactory; import com.google.inject.ProvisionException; import java.io.IOException; import java.util.Collection; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java index 9258913103..b7c5e77e36 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java @@ -14,19 +14,19 @@ package com.google.gerrit.server.index.account; -import static com.google.gerrit.server.index.FieldDef.exact; -import static com.google.gerrit.server.index.FieldDef.integer; -import static com.google.gerrit.server.index.FieldDef.prefix; -import static com.google.gerrit.server.index.FieldDef.timestamp; +import static com.google.gerrit.index.FieldDef.exact; +import static com.google.gerrit.index.FieldDef.integer; +import static com.google.gerrit.index.FieldDef.prefix; +import static com.google.gerrit.index.FieldDef.timestamp; import com.google.common.base.Predicates; import com.google.common.base.Strings; import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.SchemaUtil; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.externalids.ExternalId; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.SchemaUtil; import java.sql.Timestamp; import java.util.Collections; import java.util.Locale; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndex.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndex.java index ffa94ec4be..5c1b3dcafc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndex.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndex.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.index.account; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexDefinition; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.account.AccountPredicates; public interface AccountIndex extends Index { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java index 2eb8235c76..67b507de4d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.index.account; import com.google.common.annotations.VisibleForTesting; +import com.google.gerrit.index.IndexCollection; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.IndexCollection; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexDefinition.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexDefinition.java index 25bf54183e..af23b52406 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexDefinition.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexDefinition.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.index.account; import com.google.gerrit.common.Nullable; +import com.google.gerrit.index.IndexDefinition; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.IndexDefinition; import com.google.inject.Inject; public class AccountIndexDefinition diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexRewriter.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexRewriter.java index 710b714ff2..bc0970e1dd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexRewriter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexRewriter.java @@ -16,11 +16,11 @@ package com.google.gerrit.server.index.account; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.gerrit.index.IndexRewriter; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.IndexRewriter; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.query.Predicate; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java index 879636026b..6ec126047f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java @@ -18,10 +18,10 @@ import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.events.AccountIndexedListener; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.Index; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.Index; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; import java.io.IOException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java index b89256d429..8f9b4434cd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.index.account; -import static com.google.gerrit.server.index.SchemaUtil.schema; +import static com.google.gerrit.index.SchemaUtil.schema; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.SchemaDefinitions; public class AccountSchemaDefinitions extends SchemaDefinitions { @Deprecated diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java index a8cc8aaf5a..b6a95b7c22 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java @@ -20,12 +20,12 @@ import com.google.common.base.Stopwatch; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.gerrit.index.SiteIndexer; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.Accounts; import com.google.gerrit.server.index.IndexExecutor; -import com.google.gerrit.server.index.SiteIndexer; import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/IndexedAccountQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/IndexedAccountQuery.java index ef54a47b02..e8b1861b5d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/IndexedAccountQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/IndexedAccountQuery.java @@ -14,14 +14,14 @@ package com.google.gerrit.server.index.account; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexedQuery; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexedQuery; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; public class IndexedAccountQuery extends IndexedQuery implements DataSource { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java index 35953b0630..02fd609e3f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java @@ -28,6 +28,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.MultimapBuilder; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.gerrit.index.SiteIndexer; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; @@ -36,7 +37,6 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.MultiProgressMonitor; import com.google.gerrit.server.git.MultiProgressMonitor.Task; import com.google.gerrit.server.index.IndexExecutor; -import com.google.gerrit.server.index.SiteIndexer; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.query.change.ChangeData; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java index c780d1967e..cc8f9be51b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java @@ -16,13 +16,13 @@ package com.google.gerrit.server.index.change; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.gerrit.server.index.FieldDef.exact; -import static com.google.gerrit.server.index.FieldDef.fullText; -import static com.google.gerrit.server.index.FieldDef.intRange; -import static com.google.gerrit.server.index.FieldDef.integer; -import static com.google.gerrit.server.index.FieldDef.prefix; -import static com.google.gerrit.server.index.FieldDef.storedOnly; -import static com.google.gerrit.server.index.FieldDef.timestamp; +import static com.google.gerrit.index.FieldDef.exact; +import static com.google.gerrit.index.FieldDef.fullText; +import static com.google.gerrit.index.FieldDef.intRange; +import static com.google.gerrit.index.FieldDef.integer; +import static com.google.gerrit.index.FieldDef.prefix; +import static com.google.gerrit.index.FieldDef.storedOnly; +import static com.google.gerrit.index.FieldDef.timestamp; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; @@ -36,6 +36,8 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Table; import com.google.gerrit.common.data.SubmitRecord; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.SchemaUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.ChangeMessage; @@ -48,8 +50,6 @@ import com.google.gerrit.server.ReviewerByEmailSet; import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.StarredChangesUtil; import com.google.gerrit.server.config.AllUsersName; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.SchemaUtil; import com.google.gerrit.server.index.change.StalenessChecker.RefState; import com.google.gerrit.server.index.change.StalenessChecker.RefStatePattern; import com.google.gerrit.server.mail.Address; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndex.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndex.java index 27b0c269c2..855bfe9f2c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndex.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndex.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.index.change; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexDefinition; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.LegacyChangeIdPredicate; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java index f8acb74540..5ce361f7ad 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.index.change; import com.google.common.annotations.VisibleForTesting; +import com.google.gerrit.index.IndexCollection; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.IndexCollection; import com.google.gerrit.server.query.change.ChangeData; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java index 8b63a1d837..79454298f5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.index.change; import com.google.gerrit.common.Nullable; +import com.google.gerrit.index.IndexDefinition; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.IndexDefinition; import com.google.gerrit.server.query.change.ChangeData; import com.google.inject.Inject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java index 45dd0f5193..28843c98e4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java @@ -18,20 +18,20 @@ import static com.google.gerrit.server.query.change.ChangeStatusPredicate.open; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.IndexRewriter; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.AndPredicate; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.LimitPredicate; +import com.google.gerrit.index.query.NotPredicate; +import com.google.gerrit.index.query.OrPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change.Status; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.IndexPredicate; -import com.google.gerrit.server.index.IndexRewriter; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.query.AndPredicate; -import com.google.gerrit.server.query.LimitPredicate; -import com.google.gerrit.server.query.NotPredicate; -import com.google.gerrit.server.query.OrPredicate; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.AndChangeSource; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeDataSource; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexer.java index e4919c8803..f62b6623e0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexer.java @@ -24,12 +24,12 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.gerrit.extensions.events.ChangeIndexedListener; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.Index; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.index.Index; import com.google.gerrit.server.index.IndexExecutor; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.NotesMigration; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java index 2f037798a4..129c8ac90e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.index.change; -import static com.google.gerrit.server.index.SchemaUtil.schema; +import static com.google.gerrit.index.SchemaUtil.schema; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.SchemaDefinitions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.server.query.change.ChangeData; public class ChangeSchemaDefinitions extends SchemaDefinitions { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/DummyChangeIndex.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/DummyChangeIndex.java index 6cbc1cb075..f6cee6dac4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/DummyChangeIndex.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/DummyChangeIndex.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.index.change; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeDataSource; import java.io.IOException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/IndexedChangeQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/IndexedChangeQuery.java index a5027be3bf..66f8df2534 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/IndexedChangeQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/IndexedChangeQuery.java @@ -21,15 +21,15 @@ import static com.google.gerrit.server.index.change.ChangeField.PROJECT; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.IndexedQuery; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Matchable; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.IndexPredicate; -import com.google.gerrit.server.index.IndexedQuery; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Matchable; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeDataSource; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/StalenessChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/StalenessChecker.java index 63d5f9a181..df92379df5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/StalenessChecker.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/StalenessChecker.java @@ -30,11 +30,11 @@ import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; import com.google.common.collect.Streams; import com.google.gerrit.common.Nullable; +import com.google.gerrit.index.IndexConfig; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage; import com.google.gerrit.server.query.change.ChangeData; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java index 0f03435085..7c4074aea9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java @@ -21,12 +21,12 @@ import com.google.common.base.Stopwatch; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.gerrit.index.SiteIndexer; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.group.Groups; import com.google.gerrit.server.index.IndexExecutor; -import com.google.gerrit.server.index.SiteIndexer; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Inject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java index 70bdb3f4c1..3d4c92fe1a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java @@ -14,15 +14,15 @@ package com.google.gerrit.server.index.group; -import static com.google.gerrit.server.index.FieldDef.exact; -import static com.google.gerrit.server.index.FieldDef.fullText; -import static com.google.gerrit.server.index.FieldDef.integer; -import static com.google.gerrit.server.index.FieldDef.prefix; -import static com.google.gerrit.server.index.FieldDef.timestamp; +import static com.google.gerrit.index.FieldDef.exact; +import static com.google.gerrit.index.FieldDef.fullText; +import static com.google.gerrit.index.FieldDef.integer; +import static com.google.gerrit.index.FieldDef.prefix; +import static com.google.gerrit.index.FieldDef.timestamp; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.SchemaUtil; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.SchemaUtil; import java.sql.Timestamp; /** Secondary index schemas for groups. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java index 48480f8088..1e56837796 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.index.group; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexDefinition; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexDefinition; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.group.GroupPredicates; public interface GroupIndex extends Index { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexCollection.java index 2f0d8e0225..5c49ee54cd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexCollection.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.index.group; import com.google.common.annotations.VisibleForTesting; +import com.google.gerrit.index.IndexCollection; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.IndexCollection; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexDefinition.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexDefinition.java index 8e15b5e3c6..61c3445bac 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexDefinition.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexDefinition.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.index.group; import com.google.gerrit.common.Nullable; +import com.google.gerrit.index.IndexDefinition; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.IndexDefinition; import com.google.inject.Inject; public class GroupIndexDefinition diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexRewriter.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexRewriter.java index 6a11b0d9e0..9ef4ba1618 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexRewriter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexRewriter.java @@ -16,11 +16,11 @@ package com.google.gerrit.server.index.group; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.gerrit.index.IndexRewriter; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.IndexRewriter; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.query.Predicate; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexerImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexerImpl.java index b137fb3740..8c2eec9ded 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexerImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexerImpl.java @@ -18,9 +18,9 @@ import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.events.GroupIndexedListener; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.index.Index; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupCache; -import com.google.gerrit.server.index.Index; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; import java.io.IOException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java index cebde7eb67..ecd4168434 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.index.group; -import static com.google.gerrit.server.index.SchemaUtil.schema; +import static com.google.gerrit.index.SchemaUtil.schema; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.SchemaDefinitions; public class GroupSchemaDefinitions extends SchemaDefinitions { @Deprecated diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/IndexedGroupQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/IndexedGroupQuery.java index 220f5da55e..5f31dd7de8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/IndexedGroupQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/IndexedGroupQuery.java @@ -14,13 +14,13 @@ package com.google.gerrit.server.index.group; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexedQuery; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexedQuery; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.query.DataSource; -import com.google.gerrit.server.query.Predicate; public class IndexedGroupQuery extends IndexedQuery implements DataSource { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java index 8aa7e5c0bb..278cd86fc3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java @@ -19,6 +19,7 @@ import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.common.data.GroupDescriptions; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.errors.NoSuchGroupException; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -32,7 +33,6 @@ import com.google.gerrit.server.account.WatchConfig.ProjectWatchKey; import com.google.gerrit.server.git.NotifyConfig; import com.google.gerrit.server.mail.Address; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; import com.google.gerrit.server.query.change.SingleGroupUser; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/InternalQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/InternalQuery.java index adb2a002eb..64029abe2e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/InternalQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/InternalQuery.java @@ -16,11 +16,13 @@ package com.google.gerrit.server.query; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexCollection; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexCollection; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.Schema; +import com.google.gerrit.index.query.QueryResult; import com.google.gwtorm.server.OrmException; import java.util.List; import java.util.Set; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java index b64e038cc6..92439db8c4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java @@ -19,19 +19,23 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; import com.google.gerrit.common.data.GlobalCapability; +import com.google.gerrit.index.Index; +import com.google.gerrit.index.IndexCollection; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.IndexRewriter; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.SchemaDefinitions; +import com.google.gerrit.index.query.DataSource; +import com.google.gerrit.index.query.LimitPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.Field; import com.google.gerrit.metrics.MetricMaker; import com.google.gerrit.metrics.Timer1; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountLimits; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexCollection; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.IndexRewriter; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.SchemaDefinitions; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmRuntimeException; import com.google.gwtorm.server.ResultSet; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java index 915d736785..cc9fc0d20b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.query.account; +import com.google.gerrit.index.query.IsVisibleToPredicate; import com.google.gerrit.server.account.AccountControl; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.query.IsVisibleToPredicate; import com.google.gwtorm.server.OrmException; public class AccountIsVisibleToPredicate extends IsVisibleToPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountPredicates.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountPredicates.java index e13bd0f2ac..d6552e2aee 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountPredicates.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountPredicates.java @@ -16,14 +16,14 @@ package com.google.gerrit.server.query.account; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Predicate; +import com.google.gerrit.index.query.QueryBuilder; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.IndexPredicate; import com.google.gerrit.server.index.account.AccountField; -import com.google.gerrit.server.query.Predicate; -import com.google.gerrit.server.query.QueryBuilder; import java.util.List; public class AccountPredicates { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryBuilder.java index 86f1ff0ecf..9358a7a100 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryBuilder.java @@ -18,14 +18,14 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; import com.google.gerrit.common.errors.NotSignedInException; +import com.google.gerrit.index.query.LimitPredicate; +import com.google.gerrit.index.query.Predicate; +import com.google.gerrit.index.query.QueryBuilder; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.query.LimitPredicate; -import com.google.gerrit.server.query.Predicate; -import com.google.gerrit.server.query.QueryBuilder; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryProcessor.java index 75213e718b..dd092c74c3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryProcessor.java @@ -17,17 +17,17 @@ package com.google.gerrit.server.query.account; import static com.google.common.base.Preconditions.checkState; import static com.google.gerrit.server.query.account.AccountQueryBuilder.FIELD_LIMIT; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.query.AndSource; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountControl; import com.google.gerrit.server.account.AccountLimits; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.IndexPredicate; import com.google.gerrit.server.index.account.AccountIndexCollection; import com.google.gerrit.server.index.account.AccountIndexRewriter; import com.google.gerrit.server.index.account.AccountSchemaDefinitions; -import com.google.gerrit.server.query.AndSource; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.QueryProcessor; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java index 8fa2975310..46e7d2a31b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java @@ -20,10 +20,10 @@ import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import com.google.gerrit.index.IndexConfig; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.externalids.ExternalId; -import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.index.account.AccountIndexCollection; import com.google.gerrit.server.query.InternalQuery; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AndChangeSource.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AndChangeSource.java index b0fcfd1796..ff1ab23c89 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AndChangeSource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AndChangeSource.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.server.query.AndSource; -import com.google.gerrit.server.query.IsVisibleToPredicate; -import com.google.gerrit.server.query.Predicate; +import com.google.gerrit.index.query.AndSource; +import com.google.gerrit.index.query.IsVisibleToPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmRuntimeException; import java.util.Collection; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BooleanPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BooleanPredicate.java index 50d9c90fc5..5930b74d66 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BooleanPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BooleanPredicate.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.server.index.FieldDef; +import com.google.gerrit.index.FieldDef; import com.google.gwtorm.server.OrmException; public class BooleanPredicate extends ChangeIndexPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeDataSource.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeDataSource.java index c32ff0dcaf..34579a9b95 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeDataSource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeDataSource.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.server.query.DataSource; +import com.google.gerrit.index.query.DataSource; public interface ChangeDataSource extends DataSource { /** @return true if all returned ChangeData.hasChange() will be true. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java index 0362c85582..db3b94c3c1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Matchable; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.IndexPredicate; -import com.google.gerrit.server.query.Matchable; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeQueryBuilder.Arguments; public abstract class ChangeIndexPredicate extends IndexPredicate diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java index b88d616fab..7bbb27b6dc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java @@ -14,6 +14,7 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.query.IsVisibleToPredicate; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; @@ -24,7 +25,6 @@ import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.query.IsVisibleToPredicate; import com.google.gwtorm.server.OrmException; import com.google.inject.Provider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java index 242592e55d..8b08536118 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.server.query.Matchable; -import com.google.gerrit.server.query.OperatorPredicate; +import com.google.gerrit.index.query.Matchable; +import com.google.gerrit.index.query.OperatorPredicate; public abstract class ChangeOperatorPredicate extends OperatorPredicate implements Matchable { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index b1149b4d07..5cd2a01487 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -29,6 +29,12 @@ import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.common.errors.NotSignedInException; import com.google.gerrit.extensions.registration.DynamicMap; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.SchemaUtil; +import com.google.gerrit.index.query.LimitPredicate; +import com.google.gerrit.index.query.Predicate; +import com.google.gerrit.index.query.QueryBuilder; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -53,9 +59,6 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.strategy.SubmitDryRun; import com.google.gerrit.server.group.ListMembers; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.SchemaUtil; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.change.ChangeIndexCollection; @@ -69,9 +72,6 @@ import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ListChildProjects; import com.google.gerrit.server.project.ProjectCache; -import com.google.gerrit.server.query.LimitPredicate; -import com.google.gerrit.server.query.Predicate; -import com.google.gerrit.server.query.QueryBuilder; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java index eeb6d01c2d..d3ec68f715 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java @@ -19,12 +19,13 @@ import static com.google.gerrit.server.query.change.ChangeQueryBuilder.FIELD_LIM import com.google.gerrit.extensions.common.PluginDefinedInfo; import com.google.gerrit.extensions.registration.DynamicMap; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountLimits; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.IndexPredicate; -import com.google.gerrit.server.index.QueryOptions; import com.google.gerrit.server.index.change.ChangeIndexCollection; import com.google.gerrit.server.index.change.ChangeIndexRewriter; import com.google.gerrit.server.index.change.ChangeSchemaDefinitions; @@ -32,7 +33,6 @@ import com.google.gerrit.server.index.change.IndexedChangeQuery; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.project.ChangeControl; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.QueryProcessor; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java index f42198521e..24b8b7afc0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.RegexPredicate; -import com.google.gerrit.server.query.Matchable; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.query.Matchable; +import com.google.gerrit.index.query.RegexPredicate; public abstract class ChangeRegexPredicate extends RegexPredicate implements Matchable { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java index c3cbd2f221..d2065cbd3d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change.Status; import com.google.gerrit.server.index.change.ChangeField; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import java.util.ArrayList; import java.util.List; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentPredicate.java index a622a04b6e..5a6d186ad8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentPredicate.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.change.IndexedChangeQuery; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; public class CommentPredicate extends ChangeIndexPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java index d2537ca607..d1ae529e53 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java @@ -18,8 +18,8 @@ import static com.google.gerrit.server.index.change.ChangeField.COMMIT; import static com.google.gerrit.server.index.change.ChangeField.EXACT_COMMIT; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; +import com.google.gerrit.index.FieldDef; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.server.index.FieldDef; import com.google.gwtorm.server.OrmException; public class CommitPredicate extends ChangeIndexPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java index 02c59a6c82..7890eddd45 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java @@ -15,6 +15,7 @@ package com.google.gerrit.server.query.change; import com.google.gerrit.common.data.SubmitTypeRecord; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -25,7 +26,6 @@ import com.google.gerrit.server.git.strategy.SubmitDryRun; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeQueryBuilder.Arguments; import com.google.gwtorm.server.OrmException; import com.google.inject.Provider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java index 66958695a8..b5a2d05ad5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.server.index.change.ChangeField; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeQueryBuilder.Arguments; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java index e0ca4c55eb..545b6689f6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java @@ -17,11 +17,11 @@ package com.google.gerrit.server.query.change; import static com.google.gerrit.server.index.change.ChangeField.FUZZY_TOPIC; import com.google.common.collect.Iterables; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.change.IndexedChangeQuery; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; public class FuzzyTopicPredicate extends ChangeIndexPredicate { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java index 5a2194e980..312c04eb82 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.query.IntegerRangePredicate; +import com.google.gerrit.index.query.Matchable; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.IntegerRangePredicate; -import com.google.gerrit.server.query.Matchable; public abstract class IntegerRangeChangePredicate extends IntegerRangePredicate implements Matchable { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java index 42e60a4c9a..3c3b22319c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java @@ -15,25 +15,25 @@ package com.google.gerrit.server.query.change; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.gerrit.server.query.Predicate.and; -import static com.google.gerrit.server.query.Predicate.not; -import static com.google.gerrit.server.query.Predicate.or; +import static com.google.gerrit.index.query.Predicate.and; +import static com.google.gerrit.index.query.Predicate.not; +import static com.google.gerrit.index.query.Predicate.or; import static com.google.gerrit.server.query.change.ChangeStatusPredicate.open; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.index.change.ChangeIndexCollection; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.query.InternalQuery; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import java.io.IOException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java index 8b6c8e699b..7ff5a28600 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java @@ -16,9 +16,9 @@ package com.google.gerrit.server.query.change; import static com.google.gerrit.server.index.change.ChangeField.REVIEWEDBY; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.index.change.ChangeField; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import java.util.ArrayList; import java.util.Collection; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java index c803f5b695..90eb8e4235 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java @@ -15,12 +15,12 @@ package com.google.gerrit.server.query.change; import com.google.common.collect.ImmutableList; +import com.google.gerrit.index.query.AndPredicate; +import com.google.gerrit.index.query.Predicate; +import com.google.gerrit.index.query.QueryBuilder; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.WatchConfig.ProjectWatchKey; -import com.google.gerrit.server.query.AndPredicate; -import com.google.gerrit.server.query.Predicate; -import com.google.gerrit.server.query.QueryBuilder; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java index 0962e0831f..c9ddfb7865 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java @@ -15,17 +15,17 @@ package com.google.gerrit.server.query.change; import com.google.common.collect.Lists; +import com.google.gerrit.index.query.OrPredicate; +import com.google.gerrit.index.query.Predicate; +import com.google.gerrit.index.query.RangeUtil; +import com.google.gerrit.index.query.RangeUtil.Range; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.index.RangeUtil; -import com.google.gerrit.server.index.RangeUtil.Range; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ProjectCache; -import com.google.gerrit.server.query.OrPredicate; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.util.LabelVote; import com.google.inject.Provider; import java.util.ArrayList; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/MessagePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/MessagePredicate.java index cfa41be7fb..0cfcedbfb8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/MessagePredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/MessagePredicate.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.change.IndexedChangeQuery; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; /** Predicate to match changes that contains specified text in commit messages body. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OrSource.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OrSource.java index 90c2fb324f..a70385214c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OrSource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OrSource.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.query.change; +import com.google.gerrit.index.query.OrPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.query.OrPredicate; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.ListResultSet; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java index b5f7de712d..1522fcf944 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java @@ -20,6 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -35,7 +36,6 @@ import com.google.gerrit.server.events.EventFactory; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.SubmitRuleEvaluator; -import com.google.gerrit.server.query.QueryResult; import com.google.gson.Gson; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java index 3b00c0ae9d..f5e8d69c1c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java @@ -15,6 +15,8 @@ package com.google.gerrit.server.query.change; import com.google.gerrit.extensions.common.ProjectInfo; +import com.google.gerrit.index.query.OrPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -22,8 +24,6 @@ import com.google.gerrit.server.project.ListChildProjects; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectResource; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.query.OrPredicate; -import com.google.gerrit.server.query.Predicate; import com.google.inject.Provider; import java.util.ArrayList; import java.util.Collections; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java index 807356d9d3..a66eda877c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java @@ -26,9 +26,9 @@ import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.extensions.restapi.TopLevelResource; import com.google.gerrit.index.query.QueryParseException; +import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.server.change.ChangeJson; import com.google.gerrit.server.index.change.ChangeField; -import com.google.gerrit.server.query.QueryResult; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import java.util.ArrayList; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java index a040e18c3b..16feed99f3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java @@ -16,10 +16,10 @@ package com.google.gerrit.server.query.change; import static com.google.common.base.Preconditions.checkArgument; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.mail.Address; import com.google.gerrit.server.notedb.ReviewerStateInternal; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeQueryBuilder.Arguments; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerPredicate.java index f3a86191ec..7bea4a4c09 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerPredicate.java @@ -17,10 +17,10 @@ package com.google.gerrit.server.query.change; import static com.google.common.base.Preconditions.checkArgument; import static java.util.stream.Collectors.toList; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.notedb.ReviewerStateInternal; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeQueryBuilder.Arguments; import com.google.gwtorm.server.OrmException; import java.util.stream.Stream; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java index 81d64e0e94..17034dfff4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.query.change; import static java.util.stream.Collectors.toList; import com.google.gerrit.common.data.SubmitRecord; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.index.change.ChangeField; -import com.google.gerrit.server.query.Predicate; import com.google.gwtorm.server.OrmException; import java.util.Set; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java index f0ac127969..abbd0c9926 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.TimestampRangePredicate; -import com.google.gerrit.server.query.Matchable; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.query.Matchable; +import com.google.gerrit.index.query.TimestampRangePredicate; import java.sql.Timestamp; public abstract class TimestampRangeChangePredicate extends TimestampRangePredicate diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java index 5d788eb8d6..63138cbfc1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java @@ -15,11 +15,11 @@ package com.google.gerrit.server.query.group; import com.google.gerrit.common.errors.NoSuchGroupException; +import com.google.gerrit.index.query.IsVisibleToPredicate; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.index.IndexUtils; -import com.google.gerrit.server.query.IsVisibleToPredicate; import com.google.gerrit.server.query.account.AccountQueryBuilder; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java index 650024cb22..6d3d9bad30 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.query.group; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.IndexPredicate; import com.google.gerrit.server.index.group.GroupField; -import com.google.gerrit.server.query.Predicate; import java.util.Locale; public class GroupPredicates { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java index 7e330031bb..1cba96c271 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java @@ -18,14 +18,14 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; import com.google.gerrit.common.data.GroupReference; +import com.google.gerrit.index.query.LimitPredicate; +import com.google.gerrit.index.query.Predicate; +import com.google.gerrit.index.query.QueryBuilder; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackends; import com.google.gerrit.server.account.GroupCache; -import com.google.gerrit.server.query.LimitPredicate; -import com.google.gerrit.server.query.Predicate; -import com.google.gerrit.server.query.QueryBuilder; import com.google.inject.Inject; import java.util.List; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryProcessor.java index e0966561bc..d5534e227b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryProcessor.java @@ -17,17 +17,17 @@ package com.google.gerrit.server.query.group; import static com.google.common.base.Preconditions.checkState; import static com.google.gerrit.server.query.group.GroupQueryBuilder.FIELD_LIMIT; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.query.AndSource; +import com.google.gerrit.index.query.IndexPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountLimits; import com.google.gerrit.server.account.GroupControl; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.IndexPredicate; import com.google.gerrit.server.index.group.GroupIndexCollection; import com.google.gerrit.server.index.group.GroupIndexRewriter; import com.google.gerrit.server.index.group.GroupSchemaDefinitions; -import com.google.gerrit.server.query.AndSource; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.QueryProcessor; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java index 029fac4a88..b589289fce 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java @@ -16,21 +16,21 @@ package com.google.gerrit.server.index.change; import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.common.data.GlobalCapability.DEFAULT_MAX_QUERY_LIMIT; +import static com.google.gerrit.index.query.Predicate.and; +import static com.google.gerrit.index.query.Predicate.or; import static com.google.gerrit.reviewdb.client.Change.Status.ABANDONED; import static com.google.gerrit.reviewdb.client.Change.Status.DRAFT; import static com.google.gerrit.reviewdb.client.Change.Status.MERGED; import static com.google.gerrit.reviewdb.client.Change.Status.NEW; import static com.google.gerrit.server.index.change.IndexedChangeQuery.convertOptions; -import static com.google.gerrit.server.query.Predicate.and; -import static com.google.gerrit.server.query.Predicate.or; import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableSet; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.AndChangeSource; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeChangeIndex.java b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeChangeIndex.java index e8ed301b50..74e1c099de 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeChangeIndex.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeChangeIndex.java @@ -15,12 +15,12 @@ package com.google.gerrit.server.index.change; import com.google.common.collect.ImmutableList; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeDataSource; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeQueryBuilder.java b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeQueryBuilder.java index edc221ce8b..a194336d1b 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeQueryBuilder.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeQueryBuilder.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.index.change; -import com.google.gerrit.server.query.OperatorPredicate; -import com.google.gerrit.server.query.Predicate; +import com.google.gerrit.index.query.OperatorPredicate; +import com.google.gerrit.index.query.Predicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; import org.junit.Ignore; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 044dbbe9e5..3a1e12336f 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -57,6 +57,10 @@ import com.google.gerrit.extensions.common.ChangeMessageInfo; import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.index.FieldDef; +import com.google.gerrit.index.IndexConfig; +import com.google.gerrit.index.QueryOptions; +import com.google.gerrit.index.Schema; import com.google.gerrit.lifecycle.LifecycleManager; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; @@ -84,10 +88,6 @@ import com.google.gerrit.server.change.ChangeTriplet; import com.google.gerrit.server.change.PatchSetInserter; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.git.MetaDataUpdate; -import com.google.gerrit.server.index.FieldDef; -import com.google.gerrit.server.index.IndexConfig; -import com.google.gerrit.server.index.QueryOptions; -import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndexCollection; import com.google.gerrit.server.index.change.ChangeIndexer; diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java index 0db22d3c47..41647db94a 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java @@ -23,6 +23,7 @@ import com.google.gerrit.extensions.client.AuthType; import com.google.gerrit.extensions.config.FactoryModule; import com.google.gerrit.extensions.systemstatus.ServerInformation; import com.google.gerrit.gpg.GpgModule; +import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.metrics.DisabledMetricMaker; import com.google.gerrit.metrics.MetricMaker; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -50,7 +51,6 @@ import com.google.gerrit.server.git.PerThreadRequestScope; import com.google.gerrit.server.git.SearchingChangeCacheImpl; import com.google.gerrit.server.git.SendEmailExecutor; import com.google.gerrit.server.index.IndexModule.IndexType; -import com.google.gerrit.server.index.SchemaDefinitions; import com.google.gerrit.server.index.account.AccountSchemaDefinitions; import com.google.gerrit.server.index.account.AllAccountsIndexer; import com.google.gerrit.server.index.change.AllChangesIndexer; diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java index 825cd7b803..c2ba740a96 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java @@ -22,8 +22,8 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import com.google.gerrit.server.index.Schema; -import com.google.gerrit.server.index.SchemaDefinitions; +import com.google.gerrit.index.Schema; +import com.google.gerrit.index.SchemaDefinitions; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/lib/antlr/BUILD b/lib/antlr/BUILD index f6653fa07a..fff886fec5 100644 --- a/lib/antlr/BUILD +++ b/lib/antlr/BUILD @@ -1,3 +1,5 @@ +package(default_visibility = ["//gerrit-index:__pkg__"]) + [java_library( name = n, data = ["//lib:LICENSE-antlr"],