Skip to content

Commit 7f08b3b

Browse files
romseygeekromseygeek
committed
Move runtime fields classes into common packages (#70965)
Runtime fields currently live in their own java package. This is really a leftover from when they were in their own module; now that they are in core they should instead live in the common packages for classes of their kind. This commit makes the following moves: org.elasticsearch.runtimefields.mapper => org.elasticsearch.index.mapper org.elasticsearch.runtimefields.fielddata => org.elasticsearch.index.fielddata org.elasticsearch.runtimefields.query => org.elasticsearch.search.runtime The XFieldScript fields are moved out of the `mapper` package into org.elasticsearch.scripts, and the `PARSE_FROM_SOURCE` default scripts are moved from these Script classes directly into the field type classes that use them.
1 parent 3c27dc1 commit 7f08b3b

File tree

133 files changed

+493
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+493
-560
lines changed

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
import org.elasticsearch.repositories.RepositoriesService;
3838
import org.elasticsearch.rest.RestController;
3939
import org.elasticsearch.rest.RestHandler;
40-
import org.elasticsearch.runtimefields.mapper.BooleanFieldScript;
41-
import org.elasticsearch.runtimefields.mapper.DateFieldScript;
42-
import org.elasticsearch.runtimefields.mapper.DoubleFieldScript;
43-
import org.elasticsearch.runtimefields.mapper.GeoPointFieldScript;
44-
import org.elasticsearch.runtimefields.mapper.IpFieldScript;
45-
import org.elasticsearch.runtimefields.mapper.LongFieldScript;
46-
import org.elasticsearch.runtimefields.mapper.StringFieldScript;
40+
import org.elasticsearch.script.BooleanFieldScript;
41+
import org.elasticsearch.script.DateFieldScript;
42+
import org.elasticsearch.script.DoubleFieldScript;
43+
import org.elasticsearch.script.GeoPointFieldScript;
44+
import org.elasticsearch.script.IpFieldScript;
45+
import org.elasticsearch.script.LongFieldScript;
46+
import org.elasticsearch.script.StringFieldScript;
4747
import org.elasticsearch.script.IngestScript;
4848
import org.elasticsearch.script.ScoreScript;
4949
import org.elasticsearch.script.ScriptContext;
@@ -118,7 +118,7 @@ public final class PainlessPlugin extends Plugin implements ScriptPlugin, Extens
118118
private static List<Whitelist> getRuntimeFieldWhitelist(String fieldType) {
119119
List<Whitelist> scriptField = new ArrayList<>(Whitelist.BASE_WHITELISTS);
120120
Whitelist whitelist = WhitelistLoader.loadFromResourceFiles(Whitelist.class,
121-
"org.elasticsearch.runtimefields." + fieldType + ".txt");
121+
"org.elasticsearch.script." + fieldType + ".txt");
122122
scriptField.add(whitelist);
123123
return scriptField;
124124
}

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.runtimefields.boolean.txt renamed to ‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.boolean.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
# The whitelist for boolean-valued runtime fields
1010

1111
# These two whitelists are required for painless to find the classes
12-
class org.elasticsearch.runtimefields.mapper.BooleanFieldScript @no_import {
12+
class org.elasticsearch.script.BooleanFieldScript @no_import {
1313
}
14-
class org.elasticsearch.runtimefields.mapper.BooleanFieldScript$Factory @no_import {
14+
class org.elasticsearch.script.BooleanFieldScript$Factory @no_import {
1515
}
1616

1717
static_import {
1818
# The `emit` callback to collect values for the field
19-
void emit(org.elasticsearch.runtimefields.mapper.BooleanFieldScript, boolean) bound_to org.elasticsearch.runtimefields.mapper.BooleanFieldScript$Emit
19+
void emit(org.elasticsearch.script.BooleanFieldScript, boolean) bound_to org.elasticsearch.script.BooleanFieldScript$Emit
2020
}
2121

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.runtimefields.date.txt renamed to ‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.date.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
# The whitelist for date-valued runtime fields
1010

1111
# These two whitelists are required for painless to find the classes
12-
class org.elasticsearch.runtimefields.mapper.DateFieldScript @no_import {
12+
class org.elasticsearch.script.DateFieldScript @no_import {
1313
}
14-
class org.elasticsearch.runtimefields.mapper.DateFieldScript$Factory @no_import {
14+
class org.elasticsearch.script.DateFieldScript$Factory @no_import {
1515
}
1616

1717
static_import {
1818
# The `emit` callback to collect values for the field
19-
void emit(org.elasticsearch.runtimefields.mapper.DateFieldScript, long) bound_to org.elasticsearch.runtimefields.mapper.DateFieldScript$Emit
19+
void emit(org.elasticsearch.script.DateFieldScript, long) bound_to org.elasticsearch.script.DateFieldScript$Emit
2020
# Parse a value from the source to millis since epoch
21-
long parse(org.elasticsearch.runtimefields.mapper.DateFieldScript, def) bound_to org.elasticsearch.runtimefields.mapper.DateFieldScript$Parse
21+
long parse(org.elasticsearch.script.DateFieldScript, def) bound_to org.elasticsearch.script.DateFieldScript$Parse
2222
}
2323

2424

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.runtimefields.double.txt renamed to ‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.double.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
# The whitelist for double-valued runtime fields
1010

1111
# These two whitelists are required for painless to find the classes
12-
class org.elasticsearch.runtimefields.mapper.DoubleFieldScript @no_import {
12+
class org.elasticsearch.script.DoubleFieldScript @no_import {
1313
}
14-
class org.elasticsearch.runtimefields.mapper.DoubleFieldScript$Factory @no_import {
14+
class org.elasticsearch.script.DoubleFieldScript$Factory @no_import {
1515
}
1616

1717
static_import {
1818
# The `emit` callback to collect values for the field
19-
void emit(org.elasticsearch.runtimefields.mapper.DoubleFieldScript, double) bound_to org.elasticsearch.runtimefields.mapper.DoubleFieldScript$Emit
19+
void emit(org.elasticsearch.script.DoubleFieldScript, double) bound_to org.elasticsearch.script.DoubleFieldScript$Emit
2020
}
2121

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.runtimefields.ip.txt renamed to ‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.geopoint.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
# The whitelist for ip-valued runtime fields
1010

1111
# These two whitelists are required for painless to find the classes
12-
class org.elasticsearch.runtimefields.mapper.IpFieldScript @no_import {
12+
class org.elasticsearch.script.GeoPointFieldScript @no_import {
1313
}
14-
class org.elasticsearch.runtimefields.mapper.IpFieldScript$Factory @no_import {
14+
class org.elasticsearch.script.GeoPointFieldScript$Factory @no_import {
1515
}
1616

1717
static_import {
1818
# The `emit` callback to collect values for the field
19-
void emit(org.elasticsearch.runtimefields.mapper.IpFieldScript, String) bound_to org.elasticsearch.runtimefields.mapper.IpFieldScript$Emit
19+
void emit(org.elasticsearch.script.GeoPointFieldScript, double, double) bound_to org.elasticsearch.script.GeoPointFieldScript$Emit
2020
}

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.runtimefields.geopoint.txt renamed to ‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.ip.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
# The whitelist for ip-valued runtime fields
1010

1111
# These two whitelists are required for painless to find the classes
12-
class org.elasticsearch.runtimefields.mapper.GeoPointFieldScript @no_import {
12+
class org.elasticsearch.script.IpFieldScript @no_import {
1313
}
14-
class org.elasticsearch.runtimefields.mapper.GeoPointFieldScript$Factory @no_import {
14+
class org.elasticsearch.script.IpFieldScript$Factory @no_import {
1515
}
1616

1717
static_import {
1818
# The `emit` callback to collect values for the field
19-
void emit(org.elasticsearch.runtimefields.mapper.GeoPointFieldScript, double, double) bound_to org.elasticsearch.runtimefields.mapper.GeoPointFieldScript$Emit
19+
void emit(org.elasticsearch.script.IpFieldScript, String) bound_to org.elasticsearch.script.IpFieldScript$Emit
2020
}

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.runtimefields.long.txt renamed to ‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.long.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
# The whitelist for long-valued runtime fields
1010

1111
# These two whitelists are required for painless to find the classes
12-
class org.elasticsearch.runtimefields.mapper.LongFieldScript @no_import {
12+
class org.elasticsearch.script.LongFieldScript @no_import {
1313
}
14-
class org.elasticsearch.runtimefields.mapper.LongFieldScript$Factory @no_import {
14+
class org.elasticsearch.script.LongFieldScript$Factory @no_import {
1515
}
1616

1717
static_import {
1818
# The `emit` callback to collect values for the field
19-
void emit(org.elasticsearch.runtimefields.mapper.LongFieldScript, long) bound_to org.elasticsearch.runtimefields.mapper.LongFieldScript$Emit
19+
void emit(org.elasticsearch.script.LongFieldScript, long) bound_to org.elasticsearch.script.LongFieldScript$Emit
2020
}

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.runtimefields.string.txt renamed to ‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.string.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
# The whitelist for string-valued runtime fields
1010

1111
# These two whitelists are required for painless to find the classes
12-
class org.elasticsearch.runtimefields.mapper.StringFieldScript @no_import {
12+
class org.elasticsearch.script.StringFieldScript @no_import {
1313
}
14-
class org.elasticsearch.runtimefields.mapper.StringFieldScript$Factory @no_import {
14+
class org.elasticsearch.script.StringFieldScript$Factory @no_import {
1515
}
1616

1717
static_import {
1818
# The `emit` callback to collect values for the field
19-
void emit(org.elasticsearch.runtimefields.mapper.StringFieldScript, String) bound_to org.elasticsearch.runtimefields.mapper.StringFieldScript$Emit
19+
void emit(org.elasticsearch.script.StringFieldScript, String) bound_to org.elasticsearch.script.StringFieldScript$Emit
2020
}

‎modules/runtime-fields-common/src/main/java/org/elasticsearch/runtimefields/RuntimeFieldsPainlessExtension.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import org.elasticsearch.painless.spi.WhitelistInstanceBinding;
1414
import org.elasticsearch.painless.spi.WhitelistLoader;
1515
import org.elasticsearch.painless.spi.annotation.CompileTimeOnlyAnnotation;
16-
import org.elasticsearch.runtimefields.mapper.AbstractFieldScript;
17-
import org.elasticsearch.runtimefields.mapper.BooleanFieldScript;
18-
import org.elasticsearch.runtimefields.mapper.DateFieldScript;
19-
import org.elasticsearch.runtimefields.mapper.DoubleFieldScript;
20-
import org.elasticsearch.runtimefields.mapper.GeoPointFieldScript;
21-
import org.elasticsearch.runtimefields.mapper.IpFieldScript;
22-
import org.elasticsearch.runtimefields.mapper.LongFieldScript;
23-
import org.elasticsearch.runtimefields.mapper.StringFieldScript;
16+
import org.elasticsearch.script.AbstractFieldScript;
17+
import org.elasticsearch.script.BooleanFieldScript;
18+
import org.elasticsearch.script.DateFieldScript;
19+
import org.elasticsearch.script.DoubleFieldScript;
20+
import org.elasticsearch.script.GeoPointFieldScript;
21+
import org.elasticsearch.script.IpFieldScript;
22+
import org.elasticsearch.script.LongFieldScript;
23+
import org.elasticsearch.script.StringFieldScript;
2424
import org.elasticsearch.script.ScriptContext;
2525

2626
import java.util.List;

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/BinaryScriptFieldData.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/BinaryScriptFieldData.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.index.LeafReaderContext;
1212
import org.apache.lucene.search.SortField;
1313
import org.elasticsearch.ExceptionsHelper;
1414
import org.elasticsearch.common.util.BigArrays;
15-
import org.elasticsearch.index.fielddata.IndexFieldData;
16-
import org.elasticsearch.index.fielddata.LeafFieldData;
1715
import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
1816
import org.elasticsearch.search.DocValueFormat;
1917
import org.elasticsearch.search.MultiValueMode;

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/BooleanScriptDocValues.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/BooleanScriptDocValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

11-
import org.elasticsearch.index.fielddata.AbstractSortedNumericDocValues;
12-
import org.elasticsearch.runtimefields.mapper.BooleanFieldScript;
11+
import org.elasticsearch.script.BooleanFieldScript;
1312

1413
public final class BooleanScriptDocValues extends AbstractSortedNumericDocValues {
1514
private final BooleanFieldScript script;

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/BooleanScriptFieldData.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/BooleanScriptFieldData.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.index.LeafReaderContext;
1212
import org.apache.lucene.index.SortedNumericDocValues;
1313
import org.elasticsearch.ExceptionsHelper;
14-
import org.elasticsearch.index.fielddata.IndexFieldData;
15-
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
16-
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
1714
import org.elasticsearch.index.fielddata.plain.LeafLongFieldData;
1815
import org.elasticsearch.indices.breaker.CircuitBreakerService;
19-
import org.elasticsearch.runtimefields.mapper.BooleanFieldScript;
16+
import org.elasticsearch.script.BooleanFieldScript;
2017
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
2118
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
2219

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/DateScriptFieldData.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/DateScriptFieldData.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.index.LeafReaderContext;
1212
import org.apache.lucene.index.SortedNumericDocValues;
1313
import org.elasticsearch.ExceptionsHelper;
14-
import org.elasticsearch.index.fielddata.IndexFieldData;
15-
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
16-
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
1714
import org.elasticsearch.index.fielddata.plain.LeafLongFieldData;
1815
import org.elasticsearch.indices.breaker.CircuitBreakerService;
19-
import org.elasticsearch.runtimefields.mapper.DateFieldScript;
16+
import org.elasticsearch.script.DateFieldScript;
2017
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
2118
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
2219

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/DoubleScriptDocValues.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/DoubleScriptDocValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

11-
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
12-
import org.elasticsearch.runtimefields.mapper.DoubleFieldScript;
11+
import org.elasticsearch.script.DoubleFieldScript;
1312

1413
import java.util.Arrays;
1514

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/DoubleScriptFieldData.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/DoubleScriptFieldData.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.index.LeafReaderContext;
1212
import org.elasticsearch.ExceptionsHelper;
13-
import org.elasticsearch.index.fielddata.IndexFieldData;
14-
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
15-
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
16-
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
1713
import org.elasticsearch.index.fielddata.plain.LeafDoubleFieldData;
1814
import org.elasticsearch.indices.breaker.CircuitBreakerService;
19-
import org.elasticsearch.runtimefields.mapper.DoubleFieldScript;
15+
import org.elasticsearch.script.DoubleFieldScript;
2016
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
2117
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
2218

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/GeoPointScriptDocValues.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/GeoPointScriptDocValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.geo.GeoEncodingUtils;
1212
import org.elasticsearch.common.geo.GeoPoint;
13-
import org.elasticsearch.index.fielddata.MultiGeoPointValues;
14-
import org.elasticsearch.runtimefields.mapper.GeoPointFieldScript;
13+
import org.elasticsearch.script.GeoPointFieldScript;
1514

1615
import java.util.Arrays;
1716

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/GeoPointScriptFieldData.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/GeoPointScriptFieldData.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,14 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.index.LeafReaderContext;
1212
import org.apache.lucene.search.SortField;
1313
import org.elasticsearch.common.util.BigArrays;
14-
import org.elasticsearch.index.fielddata.IndexFieldData;
15-
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
16-
import org.elasticsearch.index.fielddata.IndexGeoPointFieldData;
17-
import org.elasticsearch.index.fielddata.LeafGeoPointFieldData;
18-
import org.elasticsearch.index.fielddata.MultiGeoPointValues;
1914
import org.elasticsearch.index.fielddata.plain.AbstractLeafGeoPointFieldData;
2015
import org.elasticsearch.indices.breaker.CircuitBreakerService;
21-
import org.elasticsearch.runtimefields.mapper.GeoPointFieldScript;
16+
import org.elasticsearch.script.GeoPointFieldScript;
2217
import org.elasticsearch.search.DocValueFormat;
2318
import org.elasticsearch.search.MultiValueMode;
2419
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/IpScriptDocValues.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/IpScriptDocValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.util.BytesRef;
12-
import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
13-
import org.elasticsearch.runtimefields.mapper.IpFieldScript;
12+
import org.elasticsearch.script.IpFieldScript;
1413

1514
import java.util.Arrays;
1615

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/IpScriptFieldData.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/IpScriptFieldData.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.document.InetAddressPoint;
1212
import org.apache.lucene.index.LeafReaderContext;
1313
import org.apache.lucene.util.BytesRef;
1414
import org.elasticsearch.common.bytes.BytesArray;
1515
import org.elasticsearch.common.bytes.BytesReference;
1616
import org.elasticsearch.common.network.InetAddresses;
17-
import org.elasticsearch.index.fielddata.IndexFieldData;
18-
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
19-
import org.elasticsearch.index.fielddata.ScriptDocValues;
20-
import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
2117
import org.elasticsearch.index.mapper.IpFieldMapper;
2218
import org.elasticsearch.indices.breaker.CircuitBreakerService;
23-
import org.elasticsearch.runtimefields.mapper.IpFieldScript;
19+
import org.elasticsearch.script.IpFieldScript;
2420
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
2521
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
2622

@@ -60,7 +56,7 @@ public ScriptDocValues<String> getScriptValues() {
6056

6157
@Override
6258
public SortedBinaryDocValues getBytesValues() {
63-
return new org.elasticsearch.runtimefields.fielddata.IpScriptDocValues(script);
59+
return new org.elasticsearch.index.fielddata.IpScriptDocValues(script);
6460
}
6561
};
6662
}

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/LongScriptDocValues.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/LongScriptDocValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

11-
import org.elasticsearch.index.fielddata.AbstractSortedNumericDocValues;
12-
import org.elasticsearch.runtimefields.mapper.AbstractLongFieldScript;
11+
import org.elasticsearch.script.AbstractLongFieldScript;
1312

1413
import java.util.Arrays;
1514

‎server/src/main/java/org/elasticsearch/runtimefields/fielddata/LongScriptFieldData.java renamed to ‎server/src/main/java/org/elasticsearch/index/fielddata/LongScriptFieldData.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.runtimefields.fielddata;
9+
package org.elasticsearch.index.fielddata;
1010

1111
import org.apache.lucene.index.LeafReaderContext;
1212
import org.apache.lucene.index.SortedNumericDocValues;
1313
import org.elasticsearch.ExceptionsHelper;
14-
import org.elasticsearch.index.fielddata.IndexFieldData;
15-
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
16-
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
1714
import org.elasticsearch.index.fielddata.plain.LeafLongFieldData;
1815
import org.elasticsearch.indices.breaker.CircuitBreakerService;
19-
import org.elasticsearch.runtimefields.mapper.LongFieldScript;
16+
import org.elasticsearch.script.LongFieldScript;
2017
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
2118
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
2219

0 commit comments

Comments
 (0)