Remove double write of field to binary entry

Author: parkertimmins

server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesConsumer.java

@@ -69,7 +69,6 @@ final class ES819TSDBDocValuesConsumer extends XDocValuesConsumer {
     private final int skipIndexIntervalSize;
     final boolean enableOptimizedMerge;
     private final BinaryDVCompressionMode binaryDVCompressionMode;
-    private final SegmentWriteState state;
 
     ES819TSDBDocValuesConsumer(
         SegmentWriteState state,
@@ -83,7 +82,6 @@ final class ES819TSDBDocValuesConsumer extends XDocValuesConsumer {
     ) throws IOException {
         this.termsDictBuffer = new byte[1 << 14];
         this.binaryDVCompressionMode = binaryDVCompressionMode;
-        this.state = state;
         this.dir = state.directory;
         this.context = state.context;
         boolean success = false;
@@ -290,9 +288,6 @@ public void addBinaryField(FieldInfo field, DocValuesProducer valuesProducer) th
     }
 
     public void doAddUncompressedBinary(FieldInfo field, DocValuesProducer valuesProducer) throws IOException {
-        meta.writeInt(field.number);
-        meta.writeByte(ES819TSDBDocValuesFormat.BINARY);
-
         if (valuesProducer instanceof TsdbDocValuesProducer tsdbValuesProducer && tsdbValuesProducer.mergeStats.supported()) {
             final int numDocsWithField = tsdbValuesProducer.mergeStats.sumNumDocsWithField();
             final int minLength = tsdbValuesProducer.mergeStats.minLength();
@@ -530,6 +525,8 @@ public void doAddCompressedBinaryFSST(FieldInfo field, DocValuesProducer valuesP
                 sampler.processLine(v.bytes, v.offset, v.length);
             }
 
+            assert maxLength >= minLength : "maxLength [" + maxLength + "] < minLength [" + minLength + "]";
+
             // Build encoder from sample
             FSST.SymbolTable symbolTable = FSST.SymbolTable.buildSymbolTable(sampler.getSample());
 
@@ -539,7 +536,6 @@ public void doAddCompressedBinaryFSST(FieldInfo field, DocValuesProducer valuesP
                 if (numDocsWithField > 0 && numDocsWithField < maxDoc) {
                     disiAccumulator = new DISIAccumulator(dir, context, data, IndexedDISI.DEFAULT_DENSE_RANK_POWER);
                 }
-                assert maxLength >= minLength;
                 offsetsAccumulator = new OffsetsAccumulator(dir, context, data, numDocsWithField);
                 CompressedOffsetWriter offsetWriter = new CompressedOffsetWriter(offsetsAccumulator);
 

server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java

@@ -1566,13 +1566,14 @@ static class BinaryEntry {
         long addressesLength;
         DirectMonotonicReader.Meta addressesMeta;
 
+        // Compression
+        final BinaryDVCompressionMode compression;
+
         // FSST
         int minCompressedLength;
         int maxCompressedLength;
         FSST.Decoder decoder;
 
-        // Compression
-        final BinaryDVCompressionMode compression;
 
         private BinaryEntry(BinaryDVCompressionMode compression) {
             this.compression = compression;