Skip to content

Commit b7aab20

Browse files
authored
[TEST] Move test data generation out of logsdb namespace (#119994) (#127265)
(cherry picked from commit 5e2b199) # Conflicts: # server/src/test/java/org/elasticsearch/index/mapper/blockloader/IpFieldBlockLoaderTests.java # server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java
1 parent 515cec4 commit b7aab20

File tree

87 files changed

+256
-242
lines changed

Some content is hidden

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

87 files changed

+256
-242
lines changed

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.extras;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414
import org.elasticsearch.plugins.Plugin;
1515

1616
import java.util.Collection;

server/src/test/java/org/elasticsearch/index/mapper/blockloader/BooleanFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.BlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414

1515
import java.util.List;
1616
import java.util.Map;

server/src/test/java/org/elasticsearch/index/mapper/blockloader/ByteFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414

1515
import java.util.Map;
1616

server/src/test/java/org/elasticsearch/index/mapper/blockloader/DateFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.BlockLoaderTestCase;
1314
import org.elasticsearch.index.mapper.DateFieldMapper;
14-
import org.elasticsearch.logsdb.datageneration.FieldType;
1515

1616
import java.time.Instant;
1717
import java.time.ZoneId;

server/src/test/java/org/elasticsearch/index/mapper/blockloader/DoubleFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414

1515
import java.util.Map;
1616

server/src/test/java/org/elasticsearch/index/mapper/blockloader/FloatFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414

1515
import java.util.Map;
1616

server/src/test/java/org/elasticsearch/index/mapper/blockloader/HalfFloatFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package org.elasticsearch.index.mapper.blockloader;
1111

1212
import org.apache.lucene.sandbox.document.HalfFloatPoint;
13+
import org.elasticsearch.datageneration.FieldType;
1314
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
14-
import org.elasticsearch.logsdb.datageneration.FieldType;
1515

1616
import java.util.Map;
1717

server/src/test/java/org/elasticsearch/index/mapper/blockloader/IntegerFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414

1515
import java.util.Map;
1616

server/src/test/java/org/elasticsearch/index/mapper/blockloader/IpFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.apache.lucene.document.InetAddressPoint;
1313
import org.apache.lucene.util.BytesRef;
1414
import org.elasticsearch.common.network.InetAddresses;
15+
import org.elasticsearch.datageneration.FieldType;
1516
import org.elasticsearch.index.mapper.BlockLoaderTestCase;
16-
import org.elasticsearch.logsdb.datageneration.FieldType;
1717

1818
import java.util.List;
1919
import java.util.Map;

server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package org.elasticsearch.index.mapper.blockloader;
1111

1212
import org.apache.lucene.util.BytesRef;
13+
import org.elasticsearch.datageneration.FieldType;
1314
import org.elasticsearch.index.mapper.BlockLoaderTestCase;
14-
import org.elasticsearch.logsdb.datageneration.FieldType;
1515

1616
import java.util.List;
1717
import java.util.Map;

server/src/test/java/org/elasticsearch/index/mapper/blockloader/LongFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414

1515
import java.util.Map;
1616

server/src/test/java/org/elasticsearch/index/mapper/blockloader/ShortFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
package org.elasticsearch.index.mapper.blockloader;
1111

12+
import org.elasticsearch.datageneration.FieldType;
1213
import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase;
13-
import org.elasticsearch.logsdb.datageneration.FieldType;
1414

1515
import java.util.Map;
1616

server/src/test/java/org/elasticsearch/index/mapper/blockloader/TextFieldBlockLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package org.elasticsearch.index.mapper.blockloader;
1111

1212
import org.apache.lucene.util.BytesRef;
13+
import org.elasticsearch.datageneration.FieldType;
1314
import org.elasticsearch.index.mapper.BlockLoaderTestCase;
14-
import org.elasticsearch.logsdb.datageneration.FieldType;
1515

1616
import java.util.ArrayList;
1717
import java.util.HashSet;
+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

12-
import org.elasticsearch.logsdb.datageneration.datasource.DataSource;
13-
import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler;
14-
import org.elasticsearch.logsdb.datageneration.fields.PredefinedField;
12+
import org.elasticsearch.datageneration.datasource.DataSource;
13+
import org.elasticsearch.datageneration.datasource.DataSourceHandler;
14+
import org.elasticsearch.datageneration.fields.PredefinedField;
1515

1616
import java.util.ArrayList;
1717
import java.util.Collection;

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/DocumentGenerator.java renamed to test/framework/src/main/java/org/elasticsearch/datageneration/DocumentGenerator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

12-
import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest;
13-
import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse;
12+
import org.elasticsearch.datageneration.datasource.DataSourceRequest;
13+
import org.elasticsearch.datageneration.datasource.DataSourceResponse;
1414

1515
import java.util.ArrayList;
1616
import java.util.Map;

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldDataGenerator.java renamed to test/framework/src/main/java/org/elasticsearch/datageneration/FieldDataGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

1212
import java.util.Map;
1313

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldType.java renamed to test/framework/src/main/java/org/elasticsearch/datageneration/FieldType.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

12-
import org.elasticsearch.logsdb.datageneration.datasource.DataSource;
13-
import org.elasticsearch.logsdb.datageneration.fields.leaf.BooleanFieldDataGenerator;
14-
import org.elasticsearch.logsdb.datageneration.fields.leaf.ByteFieldDataGenerator;
15-
import org.elasticsearch.logsdb.datageneration.fields.leaf.ConstantKeywordFieldDataGenerator;
16-
import org.elasticsearch.logsdb.datageneration.fields.leaf.CountedKeywordFieldDataGenerator;
17-
import org.elasticsearch.logsdb.datageneration.fields.leaf.DateFieldDataGenerator;
18-
import org.elasticsearch.logsdb.datageneration.fields.leaf.DoubleFieldDataGenerator;
19-
import org.elasticsearch.logsdb.datageneration.fields.leaf.FloatFieldDataGenerator;
20-
import org.elasticsearch.logsdb.datageneration.fields.leaf.GeoPointFieldDataGenerator;
21-
import org.elasticsearch.logsdb.datageneration.fields.leaf.HalfFloatFieldDataGenerator;
22-
import org.elasticsearch.logsdb.datageneration.fields.leaf.IntegerFieldDataGenerator;
23-
import org.elasticsearch.logsdb.datageneration.fields.leaf.IpFieldDataGenerator;
24-
import org.elasticsearch.logsdb.datageneration.fields.leaf.KeywordFieldDataGenerator;
25-
import org.elasticsearch.logsdb.datageneration.fields.leaf.LongFieldDataGenerator;
26-
import org.elasticsearch.logsdb.datageneration.fields.leaf.ScaledFloatFieldDataGenerator;
27-
import org.elasticsearch.logsdb.datageneration.fields.leaf.ShortFieldDataGenerator;
28-
import org.elasticsearch.logsdb.datageneration.fields.leaf.TextFieldDataGenerator;
29-
import org.elasticsearch.logsdb.datageneration.fields.leaf.UnsignedLongFieldDataGenerator;
30-
import org.elasticsearch.logsdb.datageneration.fields.leaf.WildcardFieldDataGenerator;
12+
import org.elasticsearch.datageneration.datasource.DataSource;
13+
import org.elasticsearch.datageneration.fields.leaf.BooleanFieldDataGenerator;
14+
import org.elasticsearch.datageneration.fields.leaf.ByteFieldDataGenerator;
15+
import org.elasticsearch.datageneration.fields.leaf.ConstantKeywordFieldDataGenerator;
16+
import org.elasticsearch.datageneration.fields.leaf.CountedKeywordFieldDataGenerator;
17+
import org.elasticsearch.datageneration.fields.leaf.DateFieldDataGenerator;
18+
import org.elasticsearch.datageneration.fields.leaf.DoubleFieldDataGenerator;
19+
import org.elasticsearch.datageneration.fields.leaf.FloatFieldDataGenerator;
20+
import org.elasticsearch.datageneration.fields.leaf.GeoPointFieldDataGenerator;
21+
import org.elasticsearch.datageneration.fields.leaf.HalfFloatFieldDataGenerator;
22+
import org.elasticsearch.datageneration.fields.leaf.IntegerFieldDataGenerator;
23+
import org.elasticsearch.datageneration.fields.leaf.IpFieldDataGenerator;
24+
import org.elasticsearch.datageneration.fields.leaf.KeywordFieldDataGenerator;
25+
import org.elasticsearch.datageneration.fields.leaf.LongFieldDataGenerator;
26+
import org.elasticsearch.datageneration.fields.leaf.ScaledFloatFieldDataGenerator;
27+
import org.elasticsearch.datageneration.fields.leaf.ShortFieldDataGenerator;
28+
import org.elasticsearch.datageneration.fields.leaf.TextFieldDataGenerator;
29+
import org.elasticsearch.datageneration.fields.leaf.UnsignedLongFieldDataGenerator;
30+
import org.elasticsearch.datageneration.fields.leaf.WildcardFieldDataGenerator;
3131

3232
/**
3333
* Lists all leaf field types that are supported for data generation by default.

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Mapping.java renamed to test/framework/src/main/java/org/elasticsearch/datageneration/Mapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

1212
import java.util.Map;
1313

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/MappingGenerator.java renamed to test/framework/src/main/java/org/elasticsearch/datageneration/MappingGenerator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

12+
import org.elasticsearch.datageneration.datasource.DataSourceRequest;
13+
import org.elasticsearch.datageneration.datasource.DataSourceResponse;
14+
import org.elasticsearch.datageneration.fields.DynamicMapping;
1215
import org.elasticsearch.index.mapper.ObjectMapper;
13-
import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest;
14-
import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse;
15-
import org.elasticsearch.logsdb.datageneration.fields.DynamicMapping;
1616

1717
import java.util.HashSet;
1818
import java.util.Map;

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Template.java renamed to test/framework/src/main/java/org/elasticsearch/datageneration/Template.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

1212
import java.util.Map;
1313

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/TemplateGenerator.java renamed to test/framework/src/main/java/org/elasticsearch/datageneration/TemplateGenerator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration;
10+
package org.elasticsearch.datageneration;
1111

12-
import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest;
13-
import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse;
12+
import org.elasticsearch.datageneration.datasource.DataSourceRequest;
13+
import org.elasticsearch.datageneration.datasource.DataSourceResponse;
1414

1515
import java.util.HashMap;
1616
import java.util.HashSet;
+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

1212
import java.util.ArrayList;
1313
import java.util.Collection;
+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

1212
public interface DataSourceHandler {
1313
default DataSourceResponse.FieldDataGenerator handle(DataSourceRequest.FieldDataGenerator request) {
+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

1212
import org.elasticsearch.core.Tuple;
13+
import org.elasticsearch.datageneration.DataGeneratorSpecification;
14+
import org.elasticsearch.datageneration.fields.DynamicMapping;
1315
import org.elasticsearch.index.mapper.ObjectMapper;
14-
import org.elasticsearch.logsdb.datageneration.DataGeneratorSpecification;
15-
import org.elasticsearch.logsdb.datageneration.fields.DynamicMapping;
1616

1717
import java.util.List;
1818
import java.util.Set;
+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

1212
import org.elasticsearch.geometry.Geometry;
1313

@@ -19,7 +19,7 @@
1919
import java.util.function.Supplier;
2020

2121
public interface DataSourceResponse {
22-
record FieldDataGenerator(org.elasticsearch.logsdb.datageneration.FieldDataGenerator generator) implements DataSourceResponse {}
22+
record FieldDataGenerator(org.elasticsearch.datageneration.FieldDataGenerator generator) implements DataSourceResponse {}
2323

2424
record LongGenerator(Supplier<Long> generator) implements DataSourceResponse {}
2525

Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

12-
import org.elasticsearch.logsdb.datageneration.FieldType;
12+
import org.elasticsearch.datageneration.FieldType;
1313

1414
public class DefaultFieldDataGeneratorHandler implements DataSourceHandler {
1515
public DataSourceResponse.FieldDataGenerator handle(DataSourceRequest.FieldDataGenerator request) {
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

1212
import org.elasticsearch.common.network.NetworkAddress;
13+
import org.elasticsearch.datageneration.FieldType;
1314
import org.elasticsearch.geo.GeometryTestUtils;
1415
import org.elasticsearch.geometry.utils.WellKnownText;
1516
import org.elasticsearch.index.mapper.Mapper;
1617
import org.elasticsearch.index.mapper.ObjectMapper;
17-
import org.elasticsearch.logsdb.datageneration.FieldType;
1818
import org.elasticsearch.test.ESTestCase;
1919

2020
import java.time.Instant;
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

12-
import org.elasticsearch.logsdb.datageneration.FieldType;
12+
import org.elasticsearch.datageneration.FieldType;
1313
import org.elasticsearch.test.ESTestCase;
1414

1515
import java.util.Optional;
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

1212
import org.elasticsearch.test.ESTestCase;
1313
import org.elasticsearch.test.geo.RandomGeoGenerator;
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.datasource;
10+
package org.elasticsearch.datageneration.datasource;
1111

1212
import org.elasticsearch.core.Tuple;
1313
import org.elasticsearch.test.ESTestCase;
+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.logsdb.datageneration.fields;
10+
package org.elasticsearch.datageneration.fields;
1111

1212
public enum DynamicMapping {
1313
SUPPORTED,

0 commit comments

Comments
 (0)