Skip to content

Commit 6fd0caf

Browse files
authored
Merge branch 'main' into feat/hunspell-ref-path-core
Signed-off-by: Ayush Sharma <118544643+shayush622@users.noreply.github.com>
2 parents 4630c23 + 3548ff9 commit 6fd0caf

File tree

48 files changed

+2926
-257
lines changed

Some content is hidden

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

48 files changed

+2926
-257
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2222
- Expose JVM runtime metrics via telemetry framework ([#20844](https://github.com/opensearch-project/OpenSearch/pull/20844))
2323
- Add intra segment support for single-value metric aggregations ([#20503](https://github.com/opensearch-project/OpenSearch/pull/20503))
2424
- Add ref_path support for package-based hunspell dictionary loading ([#20840](https://github.com/opensearch-project/OpenSearch/pull/20840))
25+
- Add support for enabling pluggable data formats, starting with phase-1 of decoupling shard from engine, and introducing basic abstractions ([#20675](https://github.com/opensearch-project/OpenSearch/pull/20675))
2526

2627
### Changed
2728
- Make telemetry `Tags` immutable ([#20788](https://github.com/opensearch-project/OpenSearch/pull/20788))

server/src/internalClusterTest/java/org/opensearch/index/shard/IndexShardIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
import org.opensearch.index.VersionType;
7575
import org.opensearch.index.engine.CommitStats;
7676
import org.opensearch.index.engine.Engine;
77+
import org.opensearch.index.engine.EngineBackedIndexer;
7778
import org.opensearch.index.engine.MergedSegmentWarmerFactory;
7879
import org.opensearch.index.engine.NoOpEngine;
7980
import org.opensearch.index.flush.FlushStats;
@@ -852,7 +853,7 @@ public void testNoOpEngineFactoryTakesPrecedence() {
852853
final IndexService indexService = indicesService.indexServiceSafe(indexMetadata.getIndex());
853854

854855
for (IndexShard indexShard : indexService) {
855-
assertThat(indexShard.getEngine(), instanceOf(NoOpEngine.class));
856+
assertThat(((EngineBackedIndexer) (indexShard.getIndexer())).getEngine(), instanceOf(NoOpEngine.class));
856857
}
857858
}
858859

server/src/internalClusterTest/java/org/opensearch/snapshots/SharedClusterSnapshotRestoreIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103

104104
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
105105
import static org.opensearch.cluster.routing.allocation.decider.MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY;
106-
import static org.opensearch.index.shard.IndexShardTests.getEngineFromShard;
106+
import static org.opensearch.index.shard.IndexShardTestCase.getEngine;
107107
import static org.opensearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING;
108108
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
109109
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAllSuccessful;
@@ -2052,7 +2052,7 @@ public void testSnapshottingWithMissingSequenceNumbers() {
20522052
final Index index = resolveIndex(indexName);
20532053
final IndexShard primary = internalCluster().getInstance(IndicesService.class, dataNode).getShardOrNull(new ShardId(index, 0));
20542054
// create a gap in the sequence numbers
2055-
EngineTestCase.generateNewSeqNo(getEngineFromShard(primary));
2055+
EngineTestCase.generateNewSeqNo(getEngine(primary));
20562056

20572057
for (int i = 5; i < 10; i++) {
20582058
index(indexName, "_doc", Integer.toString(i), "foo", "bar" + i);

0 commit comments

Comments
 (0)