You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by fo...@apache.org on 2020/05/22 11:00:22 UTC
svn commit: r1878026 [3/3] - in /jackrabbit/oak/trunk:
oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/
oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/
oak-search-elastic/ oak-search-elastic/src/m...
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/StatisticalElasticFacets.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/StatisticalElasticSearchFacets.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/StatisticalElasticFacets.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/StatisticalElasticFacets.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/StatisticalElasticSearchFacets.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/StatisticalElasticSearchFacets.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/StatisticalElasticFacets.java Fri May 22 11:00:21 2020
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.facets;
+package org.apache.jackrabbit.oak.plugins.index.elastic.query.facets;
import com.google.common.collect.AbstractIterator;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchSearcher;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchSearcherModel;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.util.ElasticsearchConstants;
+import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition;
+import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticSearcher;
+import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticSearcherModel;
+import org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticConstants;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.search.spi.query.FulltextIndex;
import org.apache.jackrabbit.oak.plugins.index.search.util.TapeSampling;
@@ -41,40 +41,40 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-public class StatisticalElasticSearchFacets extends InsecureElasticSearchFacets {
- private static final Logger LOG = LoggerFactory.getLogger(StatisticalElasticSearchFacets.class);
+public class StatisticalElasticFacets extends InsecureElasticFacets {
+ private static final Logger LOG = LoggerFactory.getLogger(StatisticalElasticFacets.class);
private final IndexDefinition.SecureFacetConfiguration secureFacetConfiguration;
- public StatisticalElasticSearchFacets(ElasticsearchSearcher searcher, QueryBuilder query,
- QueryIndex.IndexPlan plan, IndexDefinition.SecureFacetConfiguration secureFacetConfiguration,
- ElasticsearchAggregationData elasticsearchAggregationData) {
- super(searcher, query, plan, elasticsearchAggregationData);
+ public StatisticalElasticFacets(ElasticSearcher searcher, QueryBuilder query,
+ QueryIndex.IndexPlan plan, IndexDefinition.SecureFacetConfiguration secureFacetConfiguration,
+ ElasticAggregationData elasticAggregationData) {
+ super(searcher, query, plan, elasticAggregationData);
this.secureFacetConfiguration = secureFacetConfiguration;
}
@Override
- public Map<String, List<FulltextIndex.Facet>> getElasticSearchFacets(ElasticsearchIndexDefinition indexDefinition,
- int numberOfFacets) throws IOException {
+ public Map<String, List<FulltextIndex.Facet>> getFacets(ElasticIndexDefinition indexDefinition,
+ int numberOfFacets) throws IOException {
Map<String, List<FulltextIndex.Facet>> result = new HashMap<>();
Map<String, List<FulltextIndex.Facet>> topChildren;
Filter filter = getPlan().getFilter();
int hitCount;
int sampleSize = secureFacetConfiguration.getStatisticalFacetSampleSize();
- ElasticsearchAggregationData aggregationData = getElasticsearchAggregationData();
+ ElasticAggregationData aggregationData = getElasticAggregationData();
if (aggregationData == null || aggregationData.getNumberOfFacets() < numberOfFacets) {
LOG.warn("Facets and Totalhit count are being retrieved by calling Elasticsearch");
- topChildren = super.getElasticSearchFacets(indexDefinition, numberOfFacets);
- ElasticsearchSearcherModel elasticsearchSearcherModel = new ElasticsearchSearcherModel.ElasticsearchSearcherModelBuilder()
+ topChildren = super.getFacets(indexDefinition, numberOfFacets);
+ ElasticSearcherModel elasticSearcherModel = new ElasticSearcherModel.ElasticSearcherModelBuilder()
.withQuery(getQuery())
- .withBatchSize(ElasticsearchConstants.ELASTICSEARCH_QUERY_BATCH_SIZE)
+ .withBatchSize(ElasticConstants.ELASTIC_QUERY_BATCH_SIZE)
.build();
- SearchResponse docs = getSearcher().search(elasticsearchSearcherModel);
+ SearchResponse docs = getSearcher().search(elasticSearcherModel);
long totalResults = docs.getHits().getTotalHits().value;
hitCount = Math.toIntExact(totalResults);
} else {
- topChildren = changeToFacetList(getElasticsearchAggregationData().getAggregations().getAsMap(), numberOfFacets);
- hitCount = Math.toIntExact(getElasticsearchAggregationData().getTotalDocuments());
+ topChildren = changeToFacetList(getElasticAggregationData().getAggregations().getAsMap(), numberOfFacets);
+ hitCount = Math.toIntExact(getElasticAggregationData().getTotalDocuments());
}
// In case the hit count is less than sample size(A very small reposiotry perhaps)
@@ -82,7 +82,7 @@ public class StatisticalElasticSearchFac
// instead of statistical count. <OAK-8138>
if (hitCount < sampleSize) {
LOG.debug("SampleSize: {} is greater than hitcount: {}, Getting secure facet count", sampleSize, hitCount);
- return new SecureElasticSearchFacets(getSearcher(), getQuery(), getPlan()).getElasticSearchFacets(indexDefinition,
+ return new SecureElasticFacets(getSearcher(), getQuery(), getPlan()).getFacets(indexDefinition,
numberOfFacets);
}
long randomSeed = secureFacetConfiguration.getRandomSeed();
@@ -101,7 +101,7 @@ public class StatisticalElasticSearchFac
return result;
}
- private Iterator<SearchHit> getMatchingDocIterator(ElasticsearchSearcher searcher, QueryBuilder query) {
+ private Iterator<SearchHit> getMatchingDocIterator(ElasticSearcher searcher, QueryBuilder query) {
return new AbstractIterator<SearchHit>() {
List<SearchHit> matchingDocuments = new LinkedList<>();
Iterator<SearchHit> matchingDocsListIterator = matchingDocuments.iterator();
@@ -113,19 +113,19 @@ public class StatisticalElasticSearchFac
if (matchingDocsListIterator.hasNext()) {
return matchingDocsListIterator.next();
} else {
- ElasticsearchSearcherModel elasticsearchSearcherModel = new ElasticsearchSearcherModel.ElasticsearchSearcherModelBuilder()
+ ElasticSearcherModel elasticSearcherModel = new ElasticSearcherModel.ElasticSearcherModelBuilder()
.withQuery(query)
- .withBatchSize(ElasticsearchConstants.ELASTICSEARCH_QUERY_BATCH_SIZE)
+ .withBatchSize(ElasticConstants.ELASTIC_QUERY_BATCH_SIZE)
.withFrom(from)
.build();
- SearchResponse searchResponse = searcher.search(elasticsearchSearcherModel);
+ SearchResponse searchResponse = searcher.search(elasticSearcherModel);
SearchHit[] searchHits = searchResponse.getHits().getHits();
- if (searchHits.length == 0 || searchHits.length < ElasticsearchConstants.ELASTICSEARCH_QUERY_BATCH_SIZE) {
+ if (searchHits.length == 0 || searchHits.length < ElasticConstants.ELASTIC_QUERY_BATCH_SIZE) {
return endOfData();
} else {
matchingDocuments = Arrays.asList(searchHits);
matchingDocsListIterator = matchingDocuments.iterator();
- from += ElasticsearchConstants.ELASTICSEARCH_QUERY_BATCH_SIZE;
+ from += ElasticConstants.ELASTIC_QUERY_BATCH_SIZE;
return matchingDocsListIterator.next();
}
}
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticAggregationBuilderUtil.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchAggregationBuilderUtil.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticAggregationBuilderUtil.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticAggregationBuilderUtil.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchAggregationBuilderUtil.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchAggregationBuilderUtil.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticAggregationBuilderUtil.java Fri May 22 11:00:21 2020
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.util;
+package org.apache.jackrabbit.oak.plugins.index.elastic.util;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition;
+import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.search.spi.query.FulltextIndex;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.QueryConstants;
@@ -29,12 +29,12 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-public final class ElasticsearchAggregationBuilderUtil {
+public final class ElasticAggregationBuilderUtil {
- private ElasticsearchAggregationBuilderUtil() {
+ private ElasticAggregationBuilderUtil() {
}
- public static List<TermsAggregationBuilder> getAggregators(QueryIndex.IndexPlan plan, ElasticsearchIndexDefinition indexDefinition, int numberOfFacets) {
+ public static List<TermsAggregationBuilder> getAggregators(QueryIndex.IndexPlan plan, ElasticIndexDefinition indexDefinition, int numberOfFacets) {
List<TermsAggregationBuilder> termsAggregationBuilders = new LinkedList<>();
Collection<Filter.PropertyRestriction> propertyRestrictions = plan.getFilter().getPropertyRestrictions();
for (Filter.PropertyRestriction propertyRestriction : propertyRestrictions) {
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticConstants.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchConstants.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticConstants.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticConstants.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchConstants.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchConstants.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticConstants.java Fri May 22 11:00:21 2020
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.util;
+package org.apache.jackrabbit.oak.plugins.index.elastic.util;
-public final class ElasticsearchConstants {
+public final class ElasticConstants {
/**
* Batch size for fetching results from queries.
*/
- public static final int ELASTICSEARCH_QUERY_BATCH_SIZE = 1000;
- public static final int ELASTICSEARCH_QUERY_MAX_BATCH_SIZE = 10000;
+ public static final int ELASTIC_QUERY_BATCH_SIZE = 1000;
+ public static final int ELASTIC_QUERY_MAX_BATCH_SIZE = 10000;
- private ElasticsearchConstants() {
+ private ElasticConstants() {
}
}
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticIndexDefinitionBuilder.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchIndexDefinitionBuilder.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticIndexDefinitionBuilder.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticIndexDefinitionBuilder.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchIndexDefinitionBuilder.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchIndexDefinitionBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticIndexDefinitionBuilder.java Fri May 22 11:00:21 2020
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.util;
+package org.apache.jackrabbit.oak.plugins.index.elastic.util;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
-import static org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH;
+import static org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition.TYPE_ELASTICSEARCH;
/**
* Utility class to create Elasticsearch Index Definitions along with the relevant node structure.
*/
-public class ElasticsearchIndexDefinitionBuilder extends IndexDefinitionBuilder {
+public class ElasticIndexDefinitionBuilder extends IndexDefinitionBuilder {
@Override
protected String getIndexType() {
return TYPE_ELASTICSEARCH;
Modified: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/SearchSourceBuilderUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/SearchSourceBuilderUtil.java?rev=1878026&r1=1878025&r2=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/SearchSourceBuilderUtil.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/SearchSourceBuilderUtil.java Fri May 22 11:00:21 2020
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.util;
+package org.apache.jackrabbit.oak.plugins.index.elastic.util;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchSearcherModel;
+import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticSearcherModel;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilder;
public class SearchSourceBuilderUtil {
- public static SearchSourceBuilder createSearchSourceBuilder(ElasticsearchSearcherModel elasticsearchSearcherModel) {
+ public static SearchSourceBuilder createSearchSourceBuilder(ElasticSearcherModel elasticSearcherModel) {
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder()
- .query(elasticsearchSearcherModel.getQueryBuilder())
- .fetchSource(elasticsearchSearcherModel.getStoredField(), null)
- .size(elasticsearchSearcherModel.getBatchSize())
- .from(elasticsearchSearcherModel.getFrom());
+ .query(elasticSearcherModel.getQueryBuilder())
+ .fetchSource(elasticSearcherModel.getStoredField(), null)
+ .size(elasticSearcherModel.getBatchSize())
+ .from(elasticSearcherModel.getFrom());
- for (AggregationBuilder aggregationBuilder : elasticsearchSearcherModel.getAggregationBuilders()) {
+ for (AggregationBuilder aggregationBuilder : elasticSearcherModel.getAggregationBuilders()) {
searchSourceBuilder.aggregation(aggregationBuilder);
}
return searchSourceBuilder;
Modified: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java?rev=1878026&r1=1878025&r2=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.util;
+package org.apache.jackrabbit.oak.plugins.index.elastic.util;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.commons.PathUtils;
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticAbstractQueryTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchAbstractQueryTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticAbstractQueryTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticAbstractQueryTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchAbstractQueryTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchAbstractQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticAbstractQueryTest.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.InitialContent;
@@ -25,9 +25,9 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.TrackingCorruptIndexHandler;
import org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.util.ElasticsearchIndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
@@ -52,11 +52,11 @@ import java.util.concurrent.TimeUnit;
import static com.google.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider.compose;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
-import static org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition.BULK_FLUSH_INTERVAL_MS_DEFAULT;
+import static org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition.BULK_FLUSH_INTERVAL_MS_DEFAULT;
-public abstract class ElasticsearchAbstractQueryTest extends AbstractQueryTest {
+public abstract class ElasticAbstractQueryTest extends AbstractQueryTest {
- protected static final Logger LOG = LoggerFactory.getLogger(ElasticsearchAbstractQueryTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ElasticAbstractQueryTest.class);
// Set this connection string as
// <scheme>://<hostname>:<port>?key_id=<>,key_secret=<>
@@ -64,7 +64,7 @@ public abstract class ElasticsearchAbstr
// needs authentication
// Do not set this if docker is running and you want to run the tests on docker instead.
private static final String elasticConnectionString = System.getProperty("elasticConnectionString");
- private ElasticsearchConnection esConnection;
+ private ElasticConnection esConnection;
// This is instantiated during repo creation but not hooked up to the async indexing lane
// This can be used by the extending classes to trigger the async index update as per need (not having to wait for async indexing cycle)
@@ -74,19 +74,19 @@ public abstract class ElasticsearchAbstr
protected int DEFAULT_ASYNC_INDEXING_TIME_IN_SECONDS = 5;
@ClassRule
- public static ElasticsearchConnectionRule elasticRule = new ElasticsearchConnectionRule(elasticConnectionString);
+ public static ElasticConnectionRule elasticRule = new ElasticConnectionRule(elasticConnectionString);
/*
Close the ES connection after every test method execution
*/
@After
public void cleanup() throws IOException {
- elasticRule.closeElasticSearchConnection();
+ elasticRule.closeElasticConnection();
}
// Override this in extending test class to provide different ExtractedTextCache if needed
- protected ElasticsearchIndexEditorProvider getElasticIndexEditorProvider(ElasticsearchConnection esConnection) {
- return new ElasticsearchIndexEditorProvider(esConnection,
+ protected ElasticIndexEditorProvider getElasticIndexEditorProvider(ElasticConnection esConnection) {
+ return new ElasticIndexEditorProvider(esConnection,
new ExtractedTextCache(10 * FileUtils.ONE_MB, 100));
}
@@ -135,10 +135,10 @@ public abstract class ElasticsearchAbstr
@Override
protected ContentRepository createRepository() {
- esConnection = elasticRule.useDocker() ? elasticRule.getElasticSearchConnectionForDocker() :
- elasticRule.getElasticsearchConnectionFromString();
- ElasticsearchIndexEditorProvider editorProvider = getElasticIndexEditorProvider(esConnection);
- ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(esConnection);
+ esConnection = elasticRule.useDocker() ? elasticRule.getElasticConnectionForDocker() :
+ elasticRule.getElasticConnectionFromString();
+ ElasticIndexEditorProvider editorProvider = getElasticIndexEditorProvider(esConnection);
+ ElasticIndexProvider indexProvider = new ElasticIndexProvider(esConnection);
nodeStore = getNodeStore();
@@ -166,11 +166,11 @@ public abstract class ElasticsearchAbstr
}
protected static void assertEventually(Runnable r) {
- ElasticsearchTestUtils.assertEventually(r, BULK_FLUSH_INTERVAL_MS_DEFAULT * 5);
+ ElasticTestUtils.assertEventually(r, BULK_FLUSH_INTERVAL_MS_DEFAULT * 5);
}
protected IndexDefinitionBuilder createIndex(String... propNames) {
- IndexDefinitionBuilder builder = new ElasticsearchIndexDefinitionBuilder();
+ IndexDefinitionBuilder builder = new ElasticIndexDefinitionBuilder();
if (!useAsyncIndexing()) {
builder = builder.noAsync();
}
@@ -202,7 +202,7 @@ public abstract class ElasticsearchAbstr
// Utility methods accessing directly Elasticsearch
protected boolean exists(Tree index) {
- ElasticsearchIndexDefinition esIdxDef = getElasticsearchIndexDefinition(index);
+ ElasticIndexDefinition esIdxDef = getElasticIndexDefinition(index);
try {
return esConnection.getClient().indices()
@@ -213,7 +213,7 @@ public abstract class ElasticsearchAbstr
}
protected long countDocuments(Tree index) {
- ElasticsearchIndexDefinition esIdxDef = getElasticsearchIndexDefinition(index);
+ ElasticIndexDefinition esIdxDef = getElasticIndexDefinition(index);
CountRequest request = new CountRequest(esIdxDef.getRemoteIndexAlias());
try {
@@ -223,8 +223,8 @@ public abstract class ElasticsearchAbstr
}
}
- private ElasticsearchIndexDefinition getElasticsearchIndexDefinition(Tree index) {
- return new ElasticsearchIndexDefinition(
+ private ElasticIndexDefinition getElasticIndexDefinition(Tree index) {
+ return new ElasticIndexDefinition(
nodeStore.getRoot(),
nodeStore.getRoot().getChildNode(INDEX_DEFINITIONS_NAME).getChildNode(index.getName()),
index.getPath(),
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionRule.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionRule.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionRule.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import com.github.dockerjava.api.DockerClient;
@@ -36,16 +36,16 @@ import static org.junit.Assume.assumeNot
/*
To be used as a @ClassRule
*/
-public class ElasticsearchConnectionRule extends ExternalResource {
+public class ElasticConnectionRule extends ExternalResource {
- private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchConnectionRule.class);
- private ElasticsearchConnection elasticSearchConnection;
- private final String elasticSearchConnectionString;
+ private static final Logger LOG = LoggerFactory.getLogger(ElasticConnectionRule.class);
+ private ElasticConnection elasticConnection;
+ private final String elasticConnectionString;
private static final String INDEX_PREFIX = "ElasticTest_";
private static boolean useDocker = false;
- public ElasticsearchConnectionRule(String elasticSearchConnectionString) {
- this.elasticSearchConnectionString = elasticSearchConnectionString;
+ public ElasticConnectionRule(String elasticConnectionString) {
+ this.elasticConnectionString = elasticConnectionString;
}
public ElasticsearchContainer elastic;
@@ -56,7 +56,7 @@ public class ElasticsearchConnectionRule
@Override
protected void before() {
if (useDocker()) {
- elasticSearchConnection = getElasticSearchConnectionForDocker();
+ elasticConnection = getElasticConnectionForDocker();
}
}
@@ -68,7 +68,7 @@ public class ElasticsearchConnectionRule
Statement s = super.apply(base, description);
// see if docker is to be used or not... initialize docker rule only if that's the case.
- if (elasticSearchConnectionString == null || getElasticsearchConnectionFromString() == null) {
+ if (elasticConnectionString == null || getElasticConnectionFromString() == null) {
checkIfDockerClientAvailable();
elastic = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:" + Version.CURRENT);
s = elastic.apply(s, description);
@@ -82,10 +82,10 @@ public class ElasticsearchConnectionRule
//TODO: See if something needs to be cleaned up at test class level ??
}
- public ElasticsearchConnection getElasticsearchConnectionFromString() {
- if (elasticSearchConnection == null) {
+ public ElasticConnection getElasticConnectionFromString() {
+ if (elasticConnection == null) {
try {
- URI uri = new URI(elasticSearchConnectionString);
+ URI uri = new URI(elasticConnectionString);
String host = uri.getHost();
String scheme = uri.getScheme();
int port = uri.getPort();
@@ -97,7 +97,7 @@ public class ElasticsearchConnectionRule
api_key = query.split(",")[0].split("=")[1];
api_secret = query.split(",")[1].split("=")[1];
}
- elasticSearchConnection = ElasticsearchConnection.newBuilder()
+ elasticConnection = ElasticConnection.newBuilder()
.withIndexPrefix(INDEX_PREFIX + System.currentTimeMillis())
.withConnectionParameters(scheme, host, port)
.withApiKeys(api_key, api_secret)
@@ -106,28 +106,28 @@ public class ElasticsearchConnectionRule
return null;
}
}
- return elasticSearchConnection;
+ return elasticConnection;
}
- public ElasticsearchConnection getElasticSearchConnectionForDocker() {
- if (elasticSearchConnection == null) {
- elasticSearchConnection = ElasticsearchConnection.newBuilder()
+ public ElasticConnection getElasticConnectionForDocker() {
+ if (elasticConnection == null) {
+ elasticConnection = ElasticConnection.newBuilder()
.withIndexPrefix(INDEX_PREFIX + System.currentTimeMillis())
- .withConnectionParameters(ElasticsearchConnection.DEFAULT_SCHEME,
+ .withConnectionParameters(ElasticConnection.DEFAULT_SCHEME,
elastic.getContainerIpAddress(),
- elastic.getMappedPort(ElasticsearchConnection.DEFAULT_PORT))
+ elastic.getMappedPort(ElasticConnection.DEFAULT_PORT))
.withApiKeys(null, null)
.build();
}
- return elasticSearchConnection;
+ return elasticConnection;
}
- public void closeElasticSearchConnection() throws IOException {
- if (elasticSearchConnection != null) {
- elasticSearchConnection.close();
+ public void closeElasticConnection() throws IOException {
+ if (elasticConnection != null) {
+ elasticConnection.close();
// Make this object null otherwise tests after the first test would
// receive an client that is closed.
- elasticSearchConnection = null;
+ elasticConnection = null;
}
}
@@ -144,7 +144,7 @@ public class ElasticsearchConnectionRule
}
private void setUseDocker(boolean useDocker) {
- this.useDocker = useDocker;
+ ElasticConnectionRule.useDocker = useDocker;
}
public boolean useDocker() {
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionTest.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import org.elasticsearch.client.RestHighLevelClient;
import org.junit.Test;
@@ -23,11 +23,11 @@ import java.io.IOException;
import static org.junit.Assert.assertEquals;
-public class ElasticsearchConnectionTest {
+public class ElasticConnectionTest {
@Test
public void uniqueClient() throws IOException {
- ElasticsearchConnection connection = ElasticsearchConnection.newBuilder()
+ ElasticConnection connection = ElasticConnection.newBuilder()
.withIndexPrefix("test")
.withDefaultConnectionParameters()
.build();
@@ -42,7 +42,7 @@ public class ElasticsearchConnectionTest
@Test(expected = IllegalStateException.class)
public void alreadyClosedConnection() throws IOException {
- ElasticsearchConnection connection = ElasticsearchConnection.newBuilder()
+ ElasticConnection connection = ElasticConnection.newBuilder()
.withIndexPrefix("test")
.withDefaultConnectionParameters()
.build();
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticContentTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchContentTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticContentTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticContentTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchContentTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchContentTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticContentTest.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
@@ -28,7 +28,7 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public class ElasticsearchContentTest extends ElasticsearchAbstractQueryTest {
+public class ElasticContentTest extends ElasticAbstractQueryTest {
@Test
public void indexWithAnalyzedProperty() throws Exception {
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFacetTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFacetTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFacetTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFacetTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFacetTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFacetTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFacetTest.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import com.github.dockerjava.api.DockerClient;
import com.google.common.collect.Maps;
@@ -25,9 +25,9 @@ import org.apache.jackrabbit.commons.jac
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.jcr.Jcr;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.util.ElasticsearchIndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
@@ -61,7 +61,7 @@ import java.util.Set;
import static org.apache.jackrabbit.commons.JcrUtils.getOrCreateByPath;
import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
-import static org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition.BULK_FLUSH_INTERVAL_MS_DEFAULT;
+import static org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition.BULK_FLUSH_INTERVAL_MS_DEFAULT;
import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.FACETS;
import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_REFRESH_DEFN;
import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_SECURE_FACETS;
@@ -74,9 +74,9 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeNotNull;
-public class ElasticsearchFacetTest {
+public class ElasticFacetTest {
- private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchFacetTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ElasticFacetTest.class);
private static final String FACET_PROP = "facets";
private Closer closer;
private Session session;
@@ -102,7 +102,7 @@ public class ElasticsearchFacetTest {
try {
client = DockerClientFactory.instance().client();
} catch (Exception e) {
- LOG.warn("Docker is not available, ElasticsearchPropertyIndexTest will be skipped");
+ LOG.warn("Docker is not available, ElasticFacetTest will be skipped");
}
assumeNotNull(client);
}
@@ -116,16 +116,16 @@ public class ElasticsearchFacetTest {
}
private void createRepository() throws RepositoryException {
- ElasticsearchConnection connection = ElasticsearchConnection.newBuilder()
+ ElasticConnection connection = ElasticConnection.newBuilder()
.withIndexPrefix("" + System.nanoTime())
.withConnectionParameters(
- ElasticsearchConnection.DEFAULT_SCHEME,
+ ElasticConnection.DEFAULT_SCHEME,
elastic.getContainerIpAddress(),
- elastic.getMappedPort(ElasticsearchConnection.DEFAULT_PORT)
+ elastic.getMappedPort(ElasticConnection.DEFAULT_PORT)
).build();
- ElasticsearchIndexEditorProvider editorProvider = new ElasticsearchIndexEditorProvider(connection,
+ ElasticIndexEditorProvider editorProvider = new ElasticIndexEditorProvider(connection,
new ExtractedTextCache(10 * FileUtils.ONE_MB, 100));
- ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(connection);
+ ElasticIndexProvider indexProvider = new ElasticIndexProvider(connection);
NodeStore nodeStore = new MemoryNodeStore(INITIAL_CONTENT);
Oak oak = new Oak(nodeStore)
@@ -155,7 +155,7 @@ public class ElasticsearchFacetTest {
}
void initialize(String nodeType) {
- indexDefinitionBuilder = new ElasticsearchIndexDefinitionBuilder();
+ indexDefinitionBuilder = new ElasticIndexDefinitionBuilder();
indexRule = indexDefinitionBuilder.indexRule(nodeType);
}
@@ -426,7 +426,7 @@ public class ElasticsearchFacetTest {
}
private static void assertEventually(Runnable r) {
- ElasticsearchTestUtils.assertEventually(r, BULK_FLUSH_INTERVAL_MS_DEFAULT * 3);
+ ElasticTestUtils.assertEventually(r, BULK_FLUSH_INTERVAL_MS_DEFAULT * 3);
}
}
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAsyncTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFullTextAsyncTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAsyncTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAsyncTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFullTextAsyncTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFullTextAsyncTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAsyncTest.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
@@ -25,7 +25,7 @@ import java.util.Arrays;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
-public class ElasticsearchFullTextAsyncTest extends ElasticsearchAbstractQueryTest {
+public class ElasticFullTextAsyncTest extends ElasticAbstractQueryTest {
@Override
protected boolean useAsyncIndexing() {
Modified: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAggregationNtFileTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAggregationNtFileTest.java?rev=1878026&r1=1878025&r2=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAggregationNtFileTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAggregationNtFileTest.java Fri May 22 11:00:21 2020
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
-import com.github.dockerjava.api.DockerClient;
import com.google.common.collect.Lists;
-import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.InitialContent;
-import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
import org.apache.jackrabbit.oak.plugins.index.search.IndexFormatVersion;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
@@ -36,23 +29,14 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.write.NodeTypeRegistry;
import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory;
-import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.spi.commit.CompositeEditorProvider;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import org.elasticsearch.Version;
import org.jetbrains.annotations.NotNull;
-import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.DockerClientFactory;
-import org.testcontainers.elasticsearch.ElasticsearchContainer;
import java.io.IOException;
import java.io.InputStream;
@@ -67,13 +51,11 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
import static org.apache.jackrabbit.JcrConstants.NT_FILE;
import static org.apache.jackrabbit.oak.api.Type.NAME;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState.binaryProperty;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeNotNull;
-public class ElasticIndexAggregationNtFileTest extends ElasticsearchAbstractQueryTest {
+public class ElasticIndexAggregationNtFileTest extends ElasticAbstractQueryTest {
private static final String NT_TEST_ASSET = "test:Asset";
@Override
@@ -134,7 +116,7 @@ public class ElasticIndexAggregationNtFi
@Override
protected void createTestIndexNode() throws Exception {
Tree index = root.getTree("/");
- Tree indexDefn = createTestIndexNode(index, ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH);
+ Tree indexDefn = createTestIndexNode(index, ElasticIndexDefinition.TYPE_ELASTICSEARCH);
indexDefn.setProperty(FulltextIndexConstants.COMPAT_MODE, IndexFormatVersion.V2.getVersion());
Tree includeNtFileContent = indexDefn.addChild(FulltextIndexConstants.AGGREGATES)
.addChild(NT_TEST_ASSET).addChild("include10");
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderServiceTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderServiceTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderServiceTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderServiceTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderServiceTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderServiceTest.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
@@ -34,14 +34,13 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import java.io.File;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexProviderService.PROP_INDEX_PREFIX;
+import static org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexProviderService.PROP_INDEX_PREFIX;
import static org.junit.Assert.assertNotNull;
-public class ElasticsearchIndexProviderServiceTest {
+public class ElasticIndexProviderServiceTest {
@Rule
public final TemporaryFolder folder = new TemporaryFolder(new File("target"));
@@ -49,7 +48,7 @@ public class ElasticsearchIndexProviderS
@Rule
public final OsgiContext context = new OsgiContext();
- private final ElasticsearchIndexProviderService service = new ElasticsearchIndexProviderService();
+ private final ElasticIndexProviderService service = new ElasticIndexProviderService();
private Whiteboard wb;
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchPropertyIndexTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchPropertyIndexTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchPropertyIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java Fri May 22 11:00:21 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
@@ -27,7 +27,7 @@ import static org.apache.jackrabbit.oak.
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
-public class ElasticsearchPropertyIndexTest extends ElasticsearchAbstractQueryTest {
+public class ElasticPropertyIndexTest extends ElasticAbstractQueryTest {
@Test
public void testBulkProcessorFlushLimit() throws Exception {
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestUtils.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchTestUtils.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestUtils.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestUtils.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchTestUtils.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchTestUtils.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestUtils.java Fri May 22 11:00:21 2020
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch;
+package org.apache.jackrabbit.oak.plugins.index.elastic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public final class ElasticsearchTestUtils {
- private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchTestUtils.class);
+public final class ElasticTestUtils {
+ private static final Logger LOG = LoggerFactory.getLogger(ElasticTestUtils.class);
public static void assertEventually(Runnable r, long timeoutMillis) {
final long start = System.currentTimeMillis();
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexHelperTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexHelperTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexHelperTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexHelperTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexHelperTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexHelperTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexHelperTest.java Fri May 22 11:00:21 2020
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.index;
+package org.apache.jackrabbit.oak.plugins.index.elastic.index;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.util.ElasticsearchIndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition;
+import org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.elasticsearch.client.indices.CreateIndexRequest;
@@ -30,21 +30,21 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class ElasticsearchIndexHelperTest {
+public class ElasticIndexHelperTest {
@Test
public void multiRulesWithSamePropertyNames() throws IOException {
- IndexDefinitionBuilder builder = new ElasticsearchIndexDefinitionBuilder();
+ IndexDefinitionBuilder builder = new ElasticIndexDefinitionBuilder();
IndexDefinitionBuilder.IndexRule indexRuleA = builder.indexRule("typeA");
indexRuleA.property("foo").type("String");
IndexDefinitionBuilder.IndexRule indexRuleB = builder.indexRule("typeB");
indexRuleB.property("foo").type("String").analyzed();
NodeState nodeState = builder.build();
- ElasticsearchIndexDefinition definition =
- new ElasticsearchIndexDefinition(nodeState, nodeState, "path", "prefix");
+ ElasticIndexDefinition definition =
+ new ElasticIndexDefinition(nodeState, nodeState, "path", "prefix");
- CreateIndexRequest request = ElasticsearchIndexHelper.createIndexRequest(definition);
+ CreateIndexRequest request = ElasticIndexHelper.createIndexRequest(definition);
ObjectMapper mapper = new ObjectMapper();
Map<String, Object> jsonMap = mapper.readValue(request.mappings().streamInput(), Map.class);
@@ -57,17 +57,17 @@ public class ElasticsearchIndexHelperTes
@Test(expected = IllegalStateException.class)
public void multiRulesWithSamePropertyNamesDifferentTypes() throws IOException {
- IndexDefinitionBuilder builder = new ElasticsearchIndexDefinitionBuilder();
+ IndexDefinitionBuilder builder = new ElasticIndexDefinitionBuilder();
IndexDefinitionBuilder.IndexRule indexRuleA = builder.indexRule("typeA");
indexRuleA.property("foo").type("String");
IndexDefinitionBuilder.IndexRule indexRuleB = builder.indexRule("typeB");
indexRuleB.property("foo").type("Boolean");
NodeState nodeState = builder.build();
- ElasticsearchIndexDefinition definition =
- new ElasticsearchIndexDefinition(nodeState, nodeState, "path", "prefix");
+ ElasticIndexDefinition definition =
+ new ElasticIndexDefinition(nodeState, nodeState, "path", "prefix");
- ElasticsearchIndexHelper.createIndexRequest(definition);
+ ElasticIndexHelper.createIndexRequest(definition);
}
}
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriterTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexWriterTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriterTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriterTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexWriterTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexWriterTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriterTest.java Fri May 22 11:00:21 2020
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.index;
+package org.apache.jackrabbit.oak.plugins.index.elastic.index;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition;
+import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection;
+import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition;
import org.elasticsearch.action.bulk.BulkProcessor;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.index.IndexRequest;
@@ -37,29 +37,29 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-public class ElasticsearchIndexWriterTest {
+public class ElasticIndexWriterTest {
@Mock
- private ElasticsearchConnection elasticsearchConnectionMock;
+ private ElasticConnection elasticConnectionMock;
@Mock
- private ElasticsearchIndexDefinition indexDefinitionMock;
+ private ElasticIndexDefinition indexDefinitionMock;
@Mock
private BulkProcessor bulkProcessorMock;
- private ElasticsearchIndexWriter indexWriter;
+ private ElasticIndexWriter indexWriter;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(indexDefinitionMock.getRemoteIndexAlias()).thenReturn("test-index");
- indexWriter = new ElasticsearchIndexWriter(elasticsearchConnectionMock, indexDefinitionMock, bulkProcessorMock);
+ indexWriter = new ElasticIndexWriter(elasticConnectionMock, indexDefinitionMock, bulkProcessorMock);
}
@Test
public void singleUpdateDocument() {
- indexWriter.updateDocument("/foo", new ElasticsearchDocument("/foo"));
+ indexWriter.updateDocument("/foo", new ElasticDocument("/foo"));
ArgumentCaptor<IndexRequest> acIndexRequest = ArgumentCaptor.forClass(IndexRequest.class);
verify(bulkProcessorMock).add(acIndexRequest.capture());
@@ -83,8 +83,8 @@ public class ElasticsearchIndexWriterTes
@Test
public void multiRequests() {
- indexWriter.updateDocument("/foo", new ElasticsearchDocument("/foo"));
- indexWriter.updateDocument("/bar", new ElasticsearchDocument("/bar"));
+ indexWriter.updateDocument("/foo", new ElasticDocument("/foo"));
+ indexWriter.updateDocument("/bar", new ElasticDocument("/bar"));
indexWriter.deleteDocuments("/foo");
indexWriter.deleteDocuments("/bar");
@@ -106,7 +106,7 @@ public class ElasticsearchIndexWriterTes
.collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
.toString();
- indexWriter.updateDocument(generatedPath, new ElasticsearchDocument(generatedPath));
+ indexWriter.updateDocument(generatedPath, new ElasticDocument(generatedPath));
ArgumentCaptor<IndexRequest> acIndexRequest = ArgumentCaptor.forClass(IndexRequest.class);
verify(bulkProcessorMock).add(acIndexRequest.capture());
Copied: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexStatisticsTest.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndexStatisticsTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexStatisticsTest.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexStatisticsTest.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndexStatisticsTest.java&r1=1878025&r2=1878026&rev=1878026&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndexStatisticsTest.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexStatisticsTest.java Fri May 22 11:00:21 2020
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.index.elasticsearch.query;
+package org.apache.jackrabbit.oak.plugins.index.elastic.query;
import com.google.common.base.Ticker;
import com.google.common.cache.LoadingCache;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection;
-import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition;
+import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection;
+import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.client.core.CountRequest;
@@ -32,7 +32,7 @@ import org.mockito.MockitoAnnotations;
import java.io.IOException;
import java.time.Duration;
-import static org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchTestUtils.assertEventually;
+import static org.apache.jackrabbit.oak.plugins.index.elastic.ElasticTestUtils.assertEventually;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -44,13 +44,13 @@ import static org.mockito.Mockito.verify
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-public class ElasticsearchIndexStatisticsTest {
+public class ElasticIndexStatisticsTest {
@Mock
- private ElasticsearchConnection elasticsearchConnectionMock;
+ private ElasticConnection elasticConnectionMock;
@Mock
- private ElasticsearchIndexDefinition indexDefinitionMock;
+ private ElasticIndexDefinition indexDefinitionMock;
@Mock
private RestHighLevelClient elasticClientMock;
@@ -59,23 +59,23 @@ public class ElasticsearchIndexStatistic
public void setUp() {
MockitoAnnotations.initMocks(this);
when(indexDefinitionMock.getRemoteIndexAlias()).thenReturn("test-index");
- when(elasticsearchConnectionMock.getClient()).thenReturn(elasticClientMock);
+ when(elasticConnectionMock.getClient()).thenReturn(elasticClientMock);
}
@Test
public void defaultIndexStatistics() {
- ElasticsearchIndexStatistics indexStatistics =
- new ElasticsearchIndexStatistics(elasticsearchConnectionMock, indexDefinitionMock);
+ ElasticIndexStatistics indexStatistics =
+ new ElasticIndexStatistics(elasticConnectionMock, indexDefinitionMock);
assertNotNull(indexStatistics);
}
@Test
public void cachedStatistics() throws Exception {
MutableTicker ticker = new MutableTicker();
- LoadingCache<ElasticsearchIndexStatistics.CountRequestDescriptor, Integer> cache =
- ElasticsearchIndexStatistics.setupCache(100, 10, 1, ticker);
- ElasticsearchIndexStatistics indexStatistics =
- new ElasticsearchIndexStatistics(elasticsearchConnectionMock, indexDefinitionMock, cache);
+ LoadingCache<ElasticIndexStatistics.CountRequestDescriptor, Integer> cache =
+ ElasticIndexStatistics.setupCache(100, 10, 1, ticker);
+ ElasticIndexStatistics indexStatistics =
+ new ElasticIndexStatistics(elasticConnectionMock, indexDefinitionMock, cache);
CountResponse countResponse = mock(CountResponse.class);
when(countResponse.getCount()).thenReturn(100L);