-
Notifications
You must be signed in to change notification settings - Fork 25k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Scripting: Add Multi-Valued Field Methods to Expressions
Add methods to operate on multi-valued fields in the expressions language. Note that users will still not be able to access individual values within a multi-valued field. The following methods will be included: * min * max * avg * median * count * sum Additionally, changes have been made to MultiValueMode to support the new median method. closes #11105
- Loading branch information
Showing
11 changed files
with
307 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
src/main/java/org/elasticsearch/script/expression/CountMethodFunctionValues.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.script.expression; | ||
|
||
import org.apache.lucene.queries.function.ValueSource; | ||
import org.apache.lucene.queries.function.docvalues.DoubleDocValues; | ||
import org.elasticsearch.index.fielddata.AtomicNumericFieldData; | ||
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; | ||
|
||
/** | ||
* FunctionValues to get the count of the number of values in a field for a document. | ||
*/ | ||
public class CountMethodFunctionValues extends DoubleDocValues { | ||
SortedNumericDoubleValues values; | ||
|
||
CountMethodFunctionValues(ValueSource parent, AtomicNumericFieldData fieldData) { | ||
super(parent); | ||
|
||
values = fieldData.getDoubleValues(); | ||
} | ||
|
||
@Override | ||
public double doubleVal(int doc) { | ||
values.setDocument(doc); | ||
return values.count(); | ||
} | ||
} |
73 changes: 73 additions & 0 deletions
73
src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.script.expression; | ||
|
||
import org.apache.lucene.index.LeafReaderContext; | ||
import org.apache.lucene.queries.function.FunctionValues; | ||
import org.apache.lucene.queries.function.ValueSource; | ||
import org.elasticsearch.index.fielddata.AtomicFieldData; | ||
import org.elasticsearch.index.fielddata.AtomicNumericFieldData; | ||
import org.elasticsearch.index.fielddata.IndexFieldData; | ||
import org.elasticsearch.search.MultiValueMode; | ||
|
||
import java.io.IOException; | ||
import java.util.Map; | ||
import java.util.Objects; | ||
|
||
/** | ||
* A ValueSource to create FunctionValues to get the count of the number of values in a field for a document. | ||
*/ | ||
public class CountMethodValueSource extends ValueSource { | ||
protected IndexFieldData<?> fieldData; | ||
|
||
protected CountMethodValueSource(IndexFieldData<?> fieldData) { | ||
Objects.requireNonNull(fieldData); | ||
|
||
this.fieldData = fieldData; | ||
} | ||
|
||
@Override | ||
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException { | ||
AtomicFieldData leafData = fieldData.load(leaf); | ||
assert(leafData instanceof AtomicNumericFieldData); | ||
|
||
return new CountMethodFunctionValues(this, (AtomicNumericFieldData)leafData); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object o) { | ||
if (this == o) return true; | ||
if (o == null || getClass() != o.getClass()) return false; | ||
|
||
FieldDataValueSource that = (FieldDataValueSource) o; | ||
|
||
return fieldData.equals(that.fieldData); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return fieldData.hashCode(); | ||
} | ||
|
||
@Override | ||
public String description() { | ||
return "count: field(" + fieldData.getFieldNames().toString() + ")"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.