Skip to content

Commit ceca86c

Browse files
committed
Main branch changes compatibility
1 parent 3af66cd commit ceca86c

6 files changed

Lines changed: 5 additions & 11 deletions

File tree

sandbox/plugins/parquet-data-format/licenses/jackson-annotations-2.20.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b1bc1868bf02dc0bd6c7836257a036a331005309

sandbox/plugins/parquet-data-format/licenses/jackson-databind-2.20.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
71ab8ff75b4fd74afdee0004173fdd15de1d6a28

sandbox/plugins/parquet-data-format/src/main/java/org/opensearch/parquet/ParquetDataFormatPlugin.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.opensearch.index.IndexSettings;
2121
import org.opensearch.index.engine.dataformat.DataFormat;
2222
import org.opensearch.index.engine.dataformat.DataFormatPlugin;
23-
import org.opensearch.index.engine.dataformat.DocumentInput;
2423
import org.opensearch.index.engine.dataformat.IndexingExecutionEngine;
2524
import org.opensearch.index.mapper.MapperService;
2625
import org.opensearch.index.shard.ShardPath;
@@ -89,13 +88,8 @@ public DataFormat getDataFormat() {
8988
}
9089

9190
@Override
92-
@SuppressWarnings("unchecked")
93-
public <T extends DataFormat, P extends DocumentInput<?>> IndexingExecutionEngine<T, P> indexingEngine(
94-
MapperService mapperService,
95-
ShardPath shardPath,
96-
IndexSettings indexSettings
97-
) {
98-
return (IndexingExecutionEngine<T, P>) new ParquetIndexingEngine(
91+
public IndexingExecutionEngine<?, ?> indexingEngine(MapperService mapperService, ShardPath shardPath, IndexSettings indexSettings) {
92+
return new ParquetIndexingEngine(
9993
settings,
10094
dataFormat,
10195
shardPath,

sandbox/plugins/parquet-data-format/src/main/java/org/opensearch/parquet/engine/ParquetDataFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* capabilities. Registered with OpenSearch's data format framework via
2323
* {@link org.opensearch.parquet.ParquetDataFormatPlugin#getDataFormat()}.
2424
*/
25-
public class ParquetDataFormat implements DataFormat {
25+
public class ParquetDataFormat extends DataFormat {
2626

2727
/** Creates a new ParquetDataFormat. */
2828
public ParquetDataFormat() {}

0 commit comments

Comments
 (0)