Skip to content
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

Use Set instead of LongSet in long script field #85417

Merged
merged 2 commits into from
Mar 30, 2022
Merged

Use Set instead of LongSet in long script field #85417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29982b3
Use Set instead of LongSet in long script field
rjernst Mar 28, 2022
198d2ae
change back to primitive
rjernst Mar 29, 2022
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
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/common/Numbers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ public static long toLongExact(Number n) {
/** Return the long that {@code stringValue} stores or throws an exception if the
* stored value cannot be converted to a long that stores the exact same
* value and {@code coerce} is false. */
public static long toLong(String stringValue, boolean coerce) {
public static Long toLong(String stringValue, boolean coerce) {
try {
return Long.parseLong(stringValue);
return Long.valueOf(stringValue);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'd keep the return type on this one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved this to return the boxed type so that we do not rely on the JIT to inline+elide this boxing. Otherwise we would parse into a primitive long, then need to box when actually inserting into the set. I don't feel strongly about this, though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it more, and I changed back to primitive.

} catch (NumberFormatException e) {
// we will try again with BigDecimal
}
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/java/org/elasticsearch/index/mapper/DateScriptFieldType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

package org.elasticsearch.index.mapper;

import com.carrotsearch.hppc.LongHashSet;
import com.carrotsearch.hppc.LongSet;

import org.apache.lucene.search.Query;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.common.time.DateFormatter;
Expand Down Expand Up @@ -38,9 +35,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;

Expand Down Expand Up @@ -233,7 +232,7 @@ public Query termsQuery(Collection<?> values, SearchExecutionContext context) {
return Queries.newMatchAllQuery();
}
return DateFieldType.handleNow(context, now -> {
LongSet terms = new LongHashSet(values.size());
Set<Long> terms = new HashSet<>(values.size());
for (Object value : values) {
terms.add(DateFieldType.parseToLong(value, false, null, this.dateMathParser, now, DateFieldMapper.Resolution.MILLISECONDS));
}
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/java/org/elasticsearch/index/mapper/LongScriptFieldType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

package org.elasticsearch.index.mapper;

import com.carrotsearch.hppc.LongHashSet;
import com.carrotsearch.hppc.LongSet;

import org.apache.lucene.search.Query;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.common.time.DateMathParser;
Expand All @@ -30,7 +27,9 @@

import java.time.ZoneId;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;

Expand Down Expand Up @@ -137,7 +136,7 @@ public Query termsQuery(Collection<?> values, SearchExecutionContext context) {
if (values.isEmpty()) {
return Queries.newMatchAllQuery();
}
LongSet terms = new LongHashSet(values.size());
Set<Long> terms = new HashSet<>(values.size());
for (Object value : values) {
if (NumberType.hasDecimalPart(value)) {
continue;
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ public static double objectToDouble(Object value) {
* Converts an Object to a {@code long} by checking it against known
* types and checking its range.
*/
public static long objectToLong(Object value, boolean coerce) {
public static Long objectToLong(Object value, boolean coerce) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd probably keep the return type on this one too.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed back to primitive.

if (value instanceof Long) {
return (Long) value;
}
Expand Down
9 changes: 4 additions & 5 deletions server/src/main/java/org/elasticsearch/search/runtime/LongScriptFieldTermsQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,22 @@

package org.elasticsearch.search.runtime;

import com.carrotsearch.hppc.LongSet;

import org.apache.lucene.index.LeafReaderContext;
import org.elasticsearch.script.AbstractLongFieldScript;
import org.elasticsearch.script.Script;

import java.util.Objects;
import java.util.Set;
import java.util.function.Function;

public class LongScriptFieldTermsQuery extends AbstractLongScriptFieldQuery {
private final LongSet terms;
private final Set<Long> terms;

public LongScriptFieldTermsQuery(
Script script,
Function<LeafReaderContext, AbstractLongFieldScript> leafFactory,
String fieldName,
LongSet terms
Set<Long> terms
) {
super(script, leafFactory, fieldName);
this.terms = terms;
Expand Down Expand Up @@ -62,7 +61,7 @@ public boolean equals(Object obj) {
return terms.equals(other.terms);
}

LongSet terms() {
Set<Long> terms() {
return terms;
}
}
17 changes: 9 additions & 8 deletions server/src/test/java/org/elasticsearch/common/NumbersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@
import java.math.BigInteger;
import java.util.concurrent.atomic.AtomicInteger;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;

public class NumbersTests extends ESTestCase {

@Timeout(millis = 10000)
public void testToLong() {
assertEquals(3L, Numbers.toLong("3", false));
assertEquals(3L, Numbers.toLong("3.1", true));
assertEquals(9223372036854775807L, Numbers.toLong("9223372036854775807.00", false));
assertEquals(-9223372036854775808L, Numbers.toLong("-9223372036854775808.00", false));
assertEquals(9223372036854775807L, Numbers.toLong("9223372036854775807.00", true));
assertEquals(-9223372036854775808L, Numbers.toLong("-9223372036854775808.00", true));
assertEquals(9223372036854775807L, Numbers.toLong("9223372036854775807.99", true));
assertEquals(-9223372036854775808L, Numbers.toLong("-9223372036854775808.99", true));
assertThat(Numbers.toLong("3", false), equalTo(3L));
assertThat(Numbers.toLong("3.1", true), equalTo(3L));
assertThat(Numbers.toLong("9223372036854775807.00", false), equalTo(9223372036854775807L));
assertThat(Numbers.toLong("-9223372036854775808.00", false), equalTo(-9223372036854775808L));
assertThat(Numbers.toLong("9223372036854775807.00", true), equalTo(9223372036854775807L));
assertThat(Numbers.toLong("-9223372036854775808.00", true), equalTo(-9223372036854775808L));
assertThat(Numbers.toLong("9223372036854775807.99", true), equalTo(9223372036854775807L));
assertThat(Numbers.toLong("-9223372036854775808.99", true), equalTo(-9223372036854775808L));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


assertEquals(
"Value [9223372036854775808] is out of range for a long",
Expand Down
14 changes: 7 additions & 7 deletions server/src/test/java/org/elasticsearch/search/runtime/LongScriptFieldTermsQueryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@

package org.elasticsearch.search.runtime;

import com.carrotsearch.hppc.LongHashSet;
import com.carrotsearch.hppc.LongSet;

import org.elasticsearch.script.Script;

import java.util.HashSet;
import java.util.Set;

import static org.hamcrest.Matchers.equalTo;

public class LongScriptFieldTermsQueryTests extends AbstractLongScriptFieldQueryTestCase<LongScriptFieldTermsQuery> {
@Override
protected LongScriptFieldTermsQuery createTestInstance() {
LongSet terms = new LongHashSet();
Set<Long> terms = new HashSet<>();
int count = between(1, 100);
while (terms.size() < count) {
terms.add(randomLong());
Expand All @@ -35,12 +35,12 @@ protected LongScriptFieldTermsQuery copy(LongScriptFieldTermsQuery orig) {
protected LongScriptFieldTermsQuery mutate(LongScriptFieldTermsQuery orig) {
Script script = orig.script();
String fieldName = orig.fieldName();
LongSet terms = orig.terms();
Set<Long> terms = orig.terms();
switch (randomInt(2)) {
case 0 -> script = randomValueOtherThan(script, this::randomScript);
case 1 -> fieldName += "modified";
case 2 -> {
terms = new LongHashSet(terms);
terms = new HashSet<>(terms);
while (false == terms.add(randomLong())) {
// Random long was already in the set
}
Expand All @@ -52,7 +52,7 @@ protected LongScriptFieldTermsQuery mutate(LongScriptFieldTermsQuery orig) {

@Override
public void testMatches() {
LongScriptFieldTermsQuery query = new LongScriptFieldTermsQuery(randomScript(), leafFactory, "test", LongHashSet.from(1, 2, 3));
LongScriptFieldTermsQuery query = new LongScriptFieldTermsQuery(randomScript(), leafFactory, "test", Set.of(1L, 2L, 3L));
assertTrue(query.matches(new long[] { 1 }, 1));
assertTrue(query.matches(new long[] { 2 }, 1));
assertTrue(query.matches(new long[] { 3 }, 1));
Expand Down