Clean up Freezeable

Author: dungba88

lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java

@@ -27,7 +27,7 @@
 // let you read while writing which FST needs
 
 // TODO: Separate the scratch writer and reader functionality
-class BytesStore extends DataOutput implements FSTReader, Freezeable {
+class BytesStore extends DataOutput implements FSTReader {
 
   private static final long BASE_RAM_BYTES_USED =
       RamUsageEstimator.shallowSizeOfInstance(BytesStore.class)
@@ -41,7 +41,6 @@ class BytesStore extends DataOutput implements FSTReader, Freezeable {
 
   private byte[] current;
   private int nextWrite;
-  private boolean frozen;
 
   public BytesStore(int blockBits) {
     this.blockBits = blockBits;
@@ -52,15 +51,13 @@ public BytesStore(int blockBits) {
 
   /** Absolute write byte; you must ensure dest is < max position written so far. */
   public void writeByte(long dest, byte b) {
-    assert frozen == false;
     int blockIndex = (int) (dest >> blockBits);
     byte[] block = blocks.get(blockIndex);
     block[(int) (dest & blockMask)] = b;
   }
 
   @Override
   public void writeByte(byte b) {
-    assert frozen == false;
     if (nextWrite == blockSize) {
       current = new byte[blockSize];
       blocks.add(current);
@@ -71,7 +68,6 @@ public void writeByte(byte b) {
 
   @Override
   public void writeBytes(byte[] b, int offset, int len) {
-    assert frozen == false;
     while (len > 0) {
       int chunk = blockSize - nextWrite;
       if (len <= chunk) {
@@ -102,7 +98,6 @@ int getBlockBits() {
    * so you must only call it on already written parts.
    */
   void writeBytes(long dest, byte[] b, int offset, int len) {
-    assert frozen == false;
     // System.out.println("  BS.writeBytes dest=" + dest + " offset=" + offset + " len=" + len);
     assert dest + len <= getPosition() : "dest=" + dest + " pos=" + getPosition() + " len=" + len;
 
@@ -162,7 +157,6 @@ void writeBytes(long dest, byte[] b, int offset, int len) {
 
   @Override
   public void copyBytes(DataInput input, long numBytes) throws IOException {
-    assert frozen == false;
     assert numBytes >= 0 : "numBytes=" + numBytes;
     assert input != null;
     long len = numBytes;
@@ -187,7 +181,6 @@ public void copyBytes(DataInput input, long numBytes) throws IOException {
    * bytes, so must only call it on already written parts.
    */
   public void copyBytes(long src, long dest, int len) {
-    assert frozen == false;
     // System.out.println("BS.copyBytes src=" + src + " dest=" + dest + " len=" + len);
     assert src < dest;
 
@@ -246,7 +239,6 @@ public void copyBytes(long src, long dest, int len) {
 
   /** Copies bytes from this store to a target byte array. */
   public void copyBytes(long src, byte[] dest, int offset, int len) {
-    assert frozen == false;
     int blockIndex = (int) (src >> blockBits);
     int upto = (int) (src & blockMask);
     byte[] block = blocks.get(blockIndex);
@@ -268,7 +260,6 @@ public void copyBytes(long src, byte[] dest, int offset, int len) {
 
   /** Writes an int at the absolute position without changing the current pointer. */
   public void writeInt(long pos, int value) {
-    assert frozen == false;
     int blockIndex = (int) (pos >> blockBits);
     int upto = (int) (pos & blockMask);
     byte[] block = blocks.get(blockIndex);
@@ -286,7 +277,6 @@ public void writeInt(long pos, int value) {
 
   /** Reverse from srcPos, inclusive, to destPos, inclusive. */
   public void reverse(long srcPos, long destPos) {
-    assert frozen == false;
     assert srcPos < destPos;
     assert destPos < getPosition();
     // System.out.println("reverse src=" + srcPos + " dest=" + destPos);
@@ -325,7 +315,6 @@ public void reverse(long srcPos, long destPos) {
   }
 
   public void skipBytes(int len) {
-    assert frozen == false;
     while (len > 0) {
       int chunk = blockSize - nextWrite;
       if (len <= chunk) {
@@ -351,7 +340,6 @@ public long size() {
 
   /** Similar to {@link #truncate(long)} with newLen=0 but keep the first block to reduce GC. */
   public void reset() {
-    assert frozen == false;
     if (blocks.isEmpty()) {
       return;
     }
@@ -365,7 +353,6 @@ public void reset() {
    * this!
    */
   public void truncate(long newLen) {
-    assert frozen == false;
     assert newLen <= getPosition();
     assert newLen >= 0;
     int blockIndex = (int) (newLen >> blockBits);
@@ -383,17 +370,6 @@ public void truncate(long newLen) {
     assert newLen == getPosition();
   }
 
-  @Override
-  public void freeze() {
-    this.frozen = true;
-    if (current != null) {
-      byte[] lastBuffer = new byte[nextWrite];
-      System.arraycopy(current, 0, lastBuffer, 0, nextWrite);
-      blocks.set(blocks.size() - 1, lastBuffer);
-      current = null;
-    }
-  }
-
   /** Writes all of our bytes to the target {@link FSTDataOutputWriter}. */
   public void writeTo(FSTDataOutputWriter out) throws IOException {
     reverse(0, getPosition() - 1);
@@ -409,9 +385,12 @@ public void writeTo(FSTDataOutputWriter out) throws IOException {
   /** Writes all of our bytes to the target {@link DataOutput}. */
   @Override
   public void writeTo(DataOutput out) throws IOException {
-    assert frozen;
     for (byte[] block : blocks) {
-      out.writeBytes(block, 0, block.length);
+      if (block == current) { // last block
+        out.writeBytes(block, 0, nextWrite);
+      } else {
+        out.writeBytes(block, 0, block.length);
+      }
     }
   }