Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b21c6dd
Control storing array source with index setting
kkrik-es Aug 30, 2024
717aacb
bypass for nested
kkrik-es Aug 30, 2024
4d27b0c
Update docs/changelog/112397.yaml
kkrik-es Aug 30, 2024
0d1ec40
add node feature
kkrik-es Aug 30, 2024
2c3c5ef
Merge remote-tracking branch 'origin/synthetic-source/store-source-ar…
kkrik-es Aug 30, 2024
99bf5a9
Merge branch 'main' into synthetic-source/store-source-array
kkrik-es Aug 30, 2024
cd14476
Merge branch 'main' into synthetic-source/store-source-array
kkrik-es Aug 31, 2024
0bac4fd
Merge branch 'elastic:main' into synthetic-source/store-source-array
kkrik-es Sep 1, 2024
cf74008
Merge branch 'main' into synthetic-source/store-source-array
kkrik-es Sep 3, 2024
d87257a
update names
kkrik-es Sep 3, 2024
8055705
Merge remote-tracking branch 'origin/synthetic-source/store-source-ar…
kkrik-es Sep 3, 2024
524e82a
add comment
kkrik-es Sep 3, 2024
40e7828
add randomized test coverage
kkrik-es Sep 3, 2024
2de740f
Merge branch 'main' into synthetic-source/store-source-array
kkrik-es Sep 4, 2024
3bb31eb
use enum in index setting
kkrik-es Sep 4, 2024
50d5dc5
revert change for using index.ALL
kkrik-es Sep 4, 2024
2c4d97b
update comment
kkrik-es Sep 4, 2024
e65959d
update randomized test
kkrik-es Sep 4, 2024
2d4ea8e
skip nested objects
kkrik-es Sep 4, 2024
6ce3d8b
remove empty line
kkrik-es Sep 4, 2024
4ce6096
rename index setting
kkrik-es Sep 4, 2024
1ef6219
rename enum
kkrik-es Sep 4, 2024
950fcfb
rename enum
kkrik-es Sep 4, 2024
4348e3f
rename enum
kkrik-es Sep 4, 2024
7d0e84a
rename enum
kkrik-es Sep 4, 2024
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
5 changes: 5 additions & 0 deletions docs/changelog/112397.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 112397
summary: Control storing array source with index setting
area: Mapping
type: enhancement
issues: []
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@

package org.elasticsearch.datastreams.logsdb.qa;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.time.DateFormatter;
import org.elasticsearch.common.time.FormatNames;
import org.elasticsearch.core.CheckedConsumer;
import org.elasticsearch.index.mapper.Mapper;
import org.elasticsearch.index.mapper.ObjectMapper;
import org.elasticsearch.logsdb.datageneration.DataGenerator;
import org.elasticsearch.logsdb.datageneration.DataGeneratorSpecification;
Expand All @@ -36,12 +38,14 @@
*/
public class StandardVersusLogsIndexModeRandomDataChallengeRestIT extends StandardVersusLogsIndexModeChallengeRestIT {
private final ObjectMapper.Subobjects subobjects;
private final boolean keepArraySource;

private final DataGenerator dataGenerator;

public StandardVersusLogsIndexModeRandomDataChallengeRestIT() {
super();
this.subobjects = randomFrom(ObjectMapper.Subobjects.values());
this.keepArraySource = randomBoolean();

var specificationBuilder = DataGeneratorSpecification.builder().withFullyDynamicMapping(randomBoolean());
if (subobjects != ObjectMapper.Subobjects.ENABLED) {
Expand Down Expand Up @@ -120,6 +124,13 @@ public void contenderMappings(XContentBuilder builder) throws IOException {
}
}

@Override
public void contenderSettings(Settings.Builder builder) {
if (keepArraySource) {
builder.put(Mapper.SYNTHETIC_SOURCE_KEEP_INDEX_SETTING.getKey(), "arrays");
}
}

@Override
protected XContentBuilder generateDocument(final Instant timestamp) throws IOException {
var document = XContentFactory.jsonBuilder();
Expand Down
Loading