You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2023/11/07 10:11:33 UTC

(lucene) branch main updated: remove FST's BytesReader#reversed() (#12777)

This is an automated email from the ASF dual-hosted git repository.

mikemccand pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new 32310280708 remove FST's BytesReader#reversed() (#12777)
32310280708 is described below

commit 3231028070885cec85c65052db2176e7f6fef545
Author: Dzung Bui <du...@gmail.com>
AuthorDate: Tue Nov 7 19:11:27 2023 +0900

    remove FST's BytesReader#reversed() (#12777)
---
 .../lucene/util/fst/ByteBlockPoolReverseBytesReader.java       |  5 -----
 .../core/src/java/org/apache/lucene/util/fst/BytesStore.java   | 10 ----------
 lucene/core/src/java/org/apache/lucene/util/fst/FST.java       |  3 ---
 .../java/org/apache/lucene/util/fst/ForwardBytesReader.java    |  5 -----
 .../java/org/apache/lucene/util/fst/ReverseBytesReader.java    |  5 -----
 .../org/apache/lucene/util/fst/ReverseRandomAccessReader.java  |  5 -----
 .../src/test/org/apache/lucene/util/fst/TestBitTableUtil.java  |  5 -----
 .../src/test/org/apache/lucene/util/fst/TestBytesStore.java    |  2 --
 8 files changed, 40 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/ByteBlockPoolReverseBytesReader.java b/lucene/core/src/java/org/apache/lucene/util/fst/ByteBlockPoolReverseBytesReader.java
index 41ca21d3144..a6e5ed9fbf4 100644
--- a/lucene/core/src/java/org/apache/lucene/util/fst/ByteBlockPoolReverseBytesReader.java
+++ b/lucene/core/src/java/org/apache/lucene/util/fst/ByteBlockPoolReverseBytesReader.java
@@ -58,11 +58,6 @@ final class ByteBlockPoolReverseBytesReader extends FST.BytesReader {
     this.pos = pos - posDelta;
   }
 
-  @Override
-  public boolean reversed() {
-    return true;
-  }
-
   public void setPosDelta(long posDelta) {
     this.posDelta = posDelta;
   }
diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java b/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
index a03b9b0f12d..900822966a4 100644
--- a/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
+++ b/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
@@ -434,11 +434,6 @@ class BytesStore extends DataOutput implements FSTReader {
         nextRead = (int) (pos & blockMask);
         assert getPosition() == pos;
       }
-
-      @Override
-      public boolean reversed() {
-        return false;
-      }
     };
   }
 
@@ -492,11 +487,6 @@ class BytesStore extends DataOutput implements FSTReader {
         nextRead = (int) (pos & blockMask);
         assert getPosition() == pos : "pos=" + pos + " getPos()=" + getPosition();
       }
-
-      @Override
-      public boolean reversed() {
-        return true;
-      }
     };
   }
 
diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/FST.java b/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
index fb6a42c8fd8..eedf6ad5e4a 100644
--- a/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
+++ b/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
@@ -1135,9 +1135,6 @@ public final class FST<T> implements Accountable {
 
     /** Set current read position. */
     public abstract void setPosition(long pos);
-
-    /** Returns true if this reader uses reversed bytes under-the-hood. */
-    public abstract boolean reversed();
   }
 
   /**
diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java b/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java
index 25fec9d0cd9..8a431c12665 100644
--- a/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java
+++ b/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java
@@ -53,9 +53,4 @@ final class ForwardBytesReader extends FST.BytesReader {
   public void setPosition(long pos) {
     this.pos = (int) pos;
   }
-
-  @Override
-  public boolean reversed() {
-    return false;
-  }
 }
diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java b/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java
index 25609b48bc7..b9d0c3d6711 100644
--- a/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java
+++ b/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java
@@ -51,9 +51,4 @@ final class ReverseBytesReader extends FST.BytesReader {
   public void setPosition(long pos) {
     this.pos = (int) pos;
   }
-
-  @Override
-  public boolean reversed() {
-    return true;
-  }
 }
diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/ReverseRandomAccessReader.java b/lucene/core/src/java/org/apache/lucene/util/fst/ReverseRandomAccessReader.java
index d78780b371d..f10536b904f 100644
--- a/lucene/core/src/java/org/apache/lucene/util/fst/ReverseRandomAccessReader.java
+++ b/lucene/core/src/java/org/apache/lucene/util/fst/ReverseRandomAccessReader.java
@@ -55,9 +55,4 @@ final class ReverseRandomAccessReader extends FST.BytesReader {
   public void setPosition(long pos) {
     this.pos = pos;
   }
-
-  @Override
-  public boolean reversed() {
-    return true;
-  }
 }
diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java
index 00280c2bc51..1e74f5822bc 100644
--- a/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java
+++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java
@@ -154,11 +154,6 @@ public class TestBitTableUtil extends LuceneTestCase {
       position = (int) pos;
     }
 
-    @Override
-    public boolean reversed() {
-      return false;
-    }
-
     @Override
     public byte readByte() {
       return bits[position++];
diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java
index 001e2b092cb..6190b903c7d 100644
--- a/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java
+++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java
@@ -272,7 +272,6 @@ public class TestBytesStore extends LuceneTestCase {
       }
       // reversed
       FST.BytesReader r = bytes.getReverseBytesReader();
-      assertTrue(r.reversed());
       r.setPosition(totalLength - 1);
       r.readBytes(actual, 0, actual.length);
       int start = 0;
@@ -290,7 +289,6 @@ public class TestBytesStore extends LuceneTestCase {
         System.out.println("    bulk: forward");
       }
       FST.BytesReader r = bytes.getForwardReader();
-      assertFalse(r.reversed());
       r.readBytes(actual, 0, actual.length);
     }