Skip to content

Remove hppc uses from histogram field mapper #84849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2022
Merged

Remove hppc uses from histogram field mapper #84849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions ...nalytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
*/
package org.elasticsearch.xpack.analytics.mapper;

import com.carrotsearch.hppc.DoubleArrayList;
import com.carrotsearch.hppc.IntArrayList;

import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.BinaryDocValues;
Expand Down Expand Up @@ -50,6 +47,7 @@
import org.elasticsearch.xpack.analytics.aggregations.support.AnalyticsValuesSourceType;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
Expand Down Expand Up @@ -283,8 +281,8 @@ public void parse(DocumentParserContext context) throws IOException {
context.path().remove();
return;
}
DoubleArrayList values = null;
IntArrayList counts = null;
ArrayList<Double> values = null;
ArrayList<Integer> counts = null;
// should be an object
ensureExpectedToken(XContentParser.Token.START_OBJECT, token, context.parser());
subParser = new XContentSubParser(context.parser());
Expand All @@ -297,7 +295,7 @@ public void parse(DocumentParserContext context) throws IOException {
token = subParser.nextToken();
// should be an array
ensureExpectedToken(XContentParser.Token.START_ARRAY, token, subParser);
values = new DoubleArrayList();
values = new ArrayList<>();
token = subParser.nextToken();
double previousVal = -Double.MAX_VALUE;
while (token != XContentParser.Token.END_ARRAY) {
Expand Down Expand Up @@ -326,7 +324,7 @@ public void parse(DocumentParserContext context) throws IOException {
token = subParser.nextToken();
// should be an array
ensureExpectedToken(XContentParser.Token.START_ARRAY, token, subParser);
counts = new IntArrayList();
counts = new ArrayList<>();
token = subParser.nextToken();
while (token != XContentParser.Token.END_ARRAY) {
// should be a number
Expand Down