Skip to content

Commit 3ba827b

Browse files
moschemosche
committed
remove more obsolete code
1 parent d396e3b commit 3ba827b

File tree

10 files changed

+32
-38
lines changed

10 files changed

+32
-38
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ public TestDocumentSizeReporter(String indexName) {
152152

153153
@Override
154154
public void onIndexingCompleted(ParsedDocument parsedDocument) {
155-
long delta = parsedDocument.getNormalizedSize().ingestedBytes();
156-
if (delta > 0) {
155+
long delta = parsedDocument.getNormalizedSize();
156+
if (delta > XContentMeteringParserDecorator.UNKNOWN_SIZE) {
157157
COUNTER.addAndGet(delta);
158158
}
159159
assertThat(indexName, equalTo(TEST_INDEX_NAME));
@@ -181,8 +181,8 @@ public Token nextToken() throws IOException {
181181
}
182182

183183
@Override
184-
public ParsedDocument.DocumentSize meteredDocumentSize() {
185-
return new ParsedDocument.DocumentSize(counter, counter);
184+
public long meteredDocumentSize() {
185+
return counter;
186186
}
187187
}
188188
}

‎server/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.common.bytes.BytesArray;
1616
import org.elasticsearch.common.bytes.BytesReference;
1717
import org.elasticsearch.index.mapper.MapperService.MergeReason;
18+
import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
1819
import org.elasticsearch.xcontent.XContentType;
1920

2021
import java.util.Collections;
@@ -24,6 +25,7 @@
2425
* The result of parsing a document.
2526
*/
2627
public class ParsedDocument {
28+
2729
private final Field version;
2830

2931
private final String id;
@@ -33,7 +35,7 @@ public class ParsedDocument {
3335

3436
private final List<LuceneDocument> documents;
3537

36-
private final DocumentSize normalizedSize;
38+
private final long normalizedSize;
3739

3840
private BytesReference source;
3941
private XContentType xContentType;
@@ -61,7 +63,7 @@ public static ParsedDocument noopTombstone(String reason) {
6163
new BytesArray("{}"),
6264
XContentType.JSON,
6365
null,
64-
DocumentSize.UNKNOWN
66+
XContentMeteringParserDecorator.UNKNOWN_SIZE
6567
);
6668
}
6769

@@ -86,7 +88,7 @@ public static ParsedDocument deleteTombstone(String id) {
8688
new BytesArray("{}"),
8789
XContentType.JSON,
8890
null,
89-
DocumentSize.UNKNOWN
91+
XContentMeteringParserDecorator.UNKNOWN_SIZE
9092
);
9193
}
9294

@@ -99,7 +101,7 @@ public ParsedDocument(
99101
BytesReference source,
100102
XContentType xContentType,
101103
Mapping dynamicMappingsUpdate,
102-
DocumentSize normalizedSize
104+
long normalizedSize
103105
) {
104106
this.version = version;
105107
this.seqID = seqID;
@@ -178,16 +180,7 @@ public String documentDescription() {
178180
return "id";
179181
}
180182

181-
public DocumentSize getNormalizedSize() {
183+
public long getNormalizedSize() {
182184
return normalizedSize;
183185
}
184-
185-
/**
186-
* Normalized ingested and stored size of a document.
187-
* @param ingestedBytes ingest size of the document
188-
* @param storedBytes stored retained size of the document
189-
*/
190-
public record DocumentSize(long ingestedBytes, long storedBytes) {
191-
public static final DocumentSize UNKNOWN = new DocumentSize(-1, -1);
192-
}
193186
}

‎server/src/main/java/org/elasticsearch/plugins/internal/DocumentParsingProvider.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.plugins.internal;
1111

1212
import org.elasticsearch.action.DocWriteRequest;
13+
import org.elasticsearch.action.index.IndexRequest;
1314
import org.elasticsearch.index.mapper.MapperService;
1415

1516
/**
@@ -40,7 +41,7 @@ default DocumentSizeAccumulator createDocumentSizeAccumulator() {
4041
/**
4142
* @return an observer
4243
*/
43-
default <T> XContentMeteringParserDecorator newMeteringParserDecorator(DocWriteRequest<T> request) {
44+
default <T> XContentMeteringParserDecorator newMeteringParserDecorator(IndexRequest request) {
4445
return XContentMeteringParserDecorator.NOOP;
4546
}
4647
}

‎server/src/main/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecorator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
package org.elasticsearch.plugins.internal;
1111

12-
import org.elasticsearch.index.mapper.ParsedDocument.DocumentSize;
1312
import org.elasticsearch.xcontent.XContentParser;
1413

1514
public interface XContentMeteringParserDecorator extends XContentParserDecorator {
15+
long UNKNOWN_SIZE = -1;
1616
/**
1717
* a default noop implementation
1818
*/
1919
XContentMeteringParserDecorator NOOP = new XContentMeteringParserDecorator() {
2020
@Override
21-
public DocumentSize meteredDocumentSize() {
22-
return DocumentSize.UNKNOWN;
21+
public long meteredDocumentSize() {
22+
return UNKNOWN_SIZE;
2323
}
2424

2525
@Override
@@ -28,5 +28,5 @@ public XContentParser decorate(XContentParser xContentParser) {
2828
}
2929
};
3030

31-
DocumentSize meteredDocumentSize();
31+
long meteredDocumentSize();
3232
}

‎server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import org.elasticsearch.index.engine.Engine;
2929
import org.elasticsearch.index.engine.EngineTestCase;
3030
import org.elasticsearch.index.mapper.ParsedDocument;
31-
import org.elasticsearch.index.mapper.ParsedDocument.DocumentSize;
3231
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
3332
import org.elasticsearch.index.mapper.Uid;
3433
import org.elasticsearch.index.shard.ShardId;
34+
import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
3535
import org.elasticsearch.test.ESTestCase;
3636
import org.elasticsearch.xcontent.XContentParseException;
3737
import org.elasticsearch.xcontent.XContentType;
@@ -217,7 +217,7 @@ public void testSlowLogMessageHasJsonFields() throws IOException {
217217
source,
218218
XContentType.JSON,
219219
null,
220-
DocumentSize.UNKNOWN
220+
XContentMeteringParserDecorator.UNKNOWN_SIZE
221221
);
222222
Index index = new Index("foo", "123");
223223
// Turning off document logging doesn't log source[]
@@ -246,7 +246,7 @@ public void testSlowLogMessageHasAdditionalFields() throws IOException {
246246
source,
247247
XContentType.JSON,
248248
null,
249-
DocumentSize.UNKNOWN
249+
XContentMeteringParserDecorator.UNKNOWN_SIZE
250250
);
251251
Index index = new Index("foo", "123");
252252
// Turning off document logging doesn't log source[]
@@ -276,7 +276,7 @@ public void testEmptyRoutingField() throws IOException {
276276
source,
277277
XContentType.JSON,
278278
null,
279-
DocumentSize.UNKNOWN
279+
XContentMeteringParserDecorator.UNKNOWN_SIZE
280280
);
281281
Index index = new Index("foo", "123");
282282

@@ -295,7 +295,7 @@ public void testSlowLogParsedDocumentPrinterSourceToLog() throws IOException {
295295
source,
296296
XContentType.JSON,
297297
null,
298-
DocumentSize.UNKNOWN
298+
XContentMeteringParserDecorator.UNKNOWN_SIZE
299299
);
300300
Index index = new Index("foo", "123");
301301
// Turning off document logging doesn't log source[]
@@ -327,7 +327,7 @@ public void testSlowLogParsedDocumentPrinterSourceToLog() throws IOException {
327327
source,
328328
XContentType.JSON,
329329
null,
330-
DocumentSize.UNKNOWN
330+
XContentMeteringParserDecorator.UNKNOWN_SIZE
331331
);
332332

333333
final XContentParseException e = expectThrows(

‎server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
import org.elasticsearch.index.mapper.MapperService;
110110
import org.elasticsearch.index.mapper.MappingLookup;
111111
import org.elasticsearch.index.mapper.ParsedDocument;
112-
import org.elasticsearch.index.mapper.ParsedDocument.DocumentSize;
113112
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
114113
import org.elasticsearch.index.mapper.SourceFieldMapper;
115114
import org.elasticsearch.index.mapper.Uid;
@@ -132,6 +131,7 @@
132131
import org.elasticsearch.index.translog.TranslogOperationsUtils;
133132
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
134133
import org.elasticsearch.indices.recovery.RecoverySettings;
134+
import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
135135
import org.elasticsearch.test.IndexSettingsModule;
136136
import org.elasticsearch.test.index.IndexVersionUtils;
137137
import org.elasticsearch.threadpool.ThreadPool;
@@ -5522,7 +5522,7 @@ public void testSeqNoGenerator() throws IOException {
55225522
source,
55235523
XContentType.JSON,
55245524
null,
5525-
DocumentSize.UNKNOWN
5525+
XContentMeteringParserDecorator.UNKNOWN_SIZE
55265526
);
55275527

55285528
final Engine.Index index = new Engine.Index(

‎server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.elasticsearch.index.mapper.LuceneDocument;
4646
import org.elasticsearch.index.mapper.MapperService;
4747
import org.elasticsearch.index.mapper.ParsedDocument;
48-
import org.elasticsearch.index.mapper.ParsedDocument.DocumentSize;
4948
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
5049
import org.elasticsearch.index.mapper.Uid;
5150
import org.elasticsearch.index.seqno.RetentionLeases;
@@ -54,6 +53,7 @@
5453
import org.elasticsearch.index.translog.Translog;
5554
import org.elasticsearch.index.translog.TranslogConfig;
5655
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
56+
import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
5757
import org.elasticsearch.test.DummyShardLock;
5858
import org.elasticsearch.test.ESTestCase;
5959
import org.elasticsearch.test.IndexSettingsModule;
@@ -567,7 +567,7 @@ private Engine.IndexResult index(String id, String testFieldValue) throws IOExce
567567
source,
568568
XContentType.JSON,
569569
null,
570-
DocumentSize.UNKNOWN
570+
XContentMeteringParserDecorator.UNKNOWN_SIZE
571571
);
572572
Engine.Index index = new Engine.Index(uid, engine.config().getPrimaryTermSupplier().getAsLong(), doc);
573573
return engine.index(index);

‎server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
import org.elasticsearch.index.mapper.IdFieldMapper;
5757
import org.elasticsearch.index.mapper.LuceneDocument;
5858
import org.elasticsearch.index.mapper.ParsedDocument;
59-
import org.elasticsearch.index.mapper.ParsedDocument.DocumentSize;
6059
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
6160
import org.elasticsearch.index.mapper.Uid;
6261
import org.elasticsearch.index.seqno.LocalCheckpointTracker;
6362
import org.elasticsearch.index.seqno.LocalCheckpointTrackerTests;
6463
import org.elasticsearch.index.seqno.SequenceNumbers;
6564
import org.elasticsearch.index.shard.ShardId;
6665
import org.elasticsearch.index.translog.Translog.Location;
66+
import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
6767
import org.elasticsearch.test.ESTestCase;
6868
import org.elasticsearch.test.IndexSettingsModule;
6969
import org.elasticsearch.test.TransportVersionUtils;
@@ -3395,7 +3395,7 @@ public void testTranslogOpSerialization() throws Exception {
33953395
B_1,
33963396
XContentType.JSON,
33973397
null,
3398-
DocumentSize.UNKNOWN
3398+
XContentMeteringParserDecorator.UNKNOWN_SIZE
33993399
);
34003400

34013401
Engine.Index eIndex = new Engine.Index(

‎test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
import org.elasticsearch.index.translog.TranslogDeletionPolicy;
101101
import org.elasticsearch.indices.breaker.CircuitBreakerService;
102102
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
103+
import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
103104
import org.elasticsearch.test.DummyShardLock;
104105
import org.elasticsearch.test.ESTestCase;
105106
import org.elasticsearch.test.IndexSettingsModule;
@@ -428,7 +429,7 @@ protected static ParsedDocument testParsedDocument(
428429
source,
429430
XContentType.JSON,
430431
mappingUpdate,
431-
ParsedDocument.DocumentSize.UNKNOWN
432+
XContentMeteringParserDecorator.UNKNOWN_SIZE
432433
);
433434
}
434435

‎x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
import org.elasticsearch.indices.TestIndexNameExpressionResolver;
116116
import org.elasticsearch.license.MockLicenseState;
117117
import org.elasticsearch.license.XPackLicenseState;
118-
import org.elasticsearch.plugins.internal.DocumentParsingProvider;
119118
import org.elasticsearch.script.ScriptService;
120119
import org.elasticsearch.search.SearchPhaseResult;
121120
import org.elasticsearch.search.SearchShardTarget;
@@ -1580,7 +1579,7 @@ public void testDenialErrorMessagesForBulkIngest() throws Exception {
15801579
TransportShardBulkAction.performOnPrimary(
15811580
request,
15821581
indexShard,
1583-
new UpdateHelper(mock(ScriptService.class), DocumentParsingProvider.EMPTY_INSTANCE),
1582+
new UpdateHelper(mock(ScriptService.class)),
15841583
System::currentTimeMillis,
15851584
mappingUpdater,
15861585
waitForMappingUpdate,

0 commit comments

Comments
 (0)