Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -748,3 +748,70 @@ setup:
- is_false: aggregations.str_terms.buckets.1.key_as_string

- match: { aggregations.str_terms.buckets.1.doc_count: 2 }

---
"Global ordinals are not loaded with the map execution hint":

- skip:
version: " - 6.6.99"
reason: bug fixed in 6.7

- do:
index:
refresh: true
index: test_1
type: test
id: 1
routing: 1
body: { "str": "abc" }

- do:
index:
refresh: true
index: test_1
type: test
id: 2
routing: 1
body: { "str": "abc" }

- do:
index:
refresh: true
index: test_1
type: test
id: 3
routing: 1
body: { "str": "bcd" }

- do:
indices.refresh: {}

- do:
search:
index: test_1
body: { "size" : 0, "aggs" : { "str_terms" : { "terms" : { "field" : "str", "execution_hint" : "map" } } } }

- length: { aggregations.str_terms.buckets: 2 }

- do:
indices.stats:
index: test_1
metric: fielddata
fielddata_fields: str

- match: { indices.test_1.total.fielddata.memory_size_in_bytes: 0}

- do:
search:
index: test_1
body: { "size" : 0, "aggs" : { "str_terms" : { "terms" : { "field" : "str", "execution_hint" : "global_ordinals" } } } }

- length: { aggregations.str_terms.buckets: 2 }

- do:
indices.stats:
index: test_1
metric: fielddata
fielddata_fields: str

- gt: { indices.test_1.total.fielddata.memory_size_in_bytes: 0}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.elasticsearch.search.aggregations.bucket.terms;

import org.apache.logging.log4j.LogManager;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.IndexSearcher;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.logging.DeprecationLogger;
Expand Down Expand Up @@ -133,7 +134,7 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource, Aggregator pare
if (valuesSource instanceof ValuesSource.Bytes.WithOrdinals == false) {
execution = ExecutionMode.MAP;
}
final long maxOrd = getMaxOrd(valuesSource, context.searcher());
final long maxOrd = getMaxOrd(context.searcher(), valuesSource, execution);
if (execution == null) {
execution = ExecutionMode.GLOBAL_ORDINALS;
}
Expand Down Expand Up @@ -205,13 +206,23 @@ static SubAggCollectionMode subAggCollectionMode(int expectedSize, long maxOrd)
}

/**
* Get the maximum global ordinal value for the provided {@link ValuesSource} or -1
* Get the maximum ordinal value for the provided {@link ValuesSource} or -1
* if the values source is not an instance of {@link ValuesSource.Bytes.WithOrdinals}.
*/
static long getMaxOrd(ValuesSource source, IndexSearcher searcher) throws IOException {
static long getMaxOrd(IndexSearcher searcher, ValuesSource source, ExecutionMode executionMode) throws IOException {
if (source instanceof ValuesSource.Bytes.WithOrdinals) {
ValuesSource.Bytes.WithOrdinals valueSourceWithOrdinals = (ValuesSource.Bytes.WithOrdinals) source;
return valueSourceWithOrdinals.globalMaxOrd(searcher);
if (executionMode == ExecutionMode.MAP) {
// global ordinals are not requested so we don't load them
// and return the biggest cardinality per segment instead.
long maxOrd = -1;
for (LeafReaderContext leaf : searcher.getIndexReader().leaves()) {
maxOrd = Math.max(maxOrd, valueSourceWithOrdinals.ordinalsValues(leaf).getValueCount());
}
return maxOrd;
} else {
return valueSourceWithOrdinals.globalMaxOrd(searcher);
}
} else {
return -1;
}
Expand Down Expand Up @@ -256,7 +267,7 @@ Aggregator create(String name,
List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException {

final long maxOrd = getMaxOrd(valuesSource, context.searcher());
final long maxOrd = getMaxOrd(context.searcher(), valuesSource, ExecutionMode.GLOBAL_ORDINALS);
assert maxOrd != -1;
final double ratio = maxOrd / ((double) context.searcher().getIndexReader().numDocs());

Expand Down