You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/04/14 07:23:20 UTC
[lucene-solr] branch master updated: Avoid using a raw Arc type.
(#1429)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 3236d38 Avoid using a raw Arc type. (#1429)
3236d38 is described below
commit 3236d38c8b71a337698d46da5f94213e20b2bbae
Author: Julie Tibshirani <ju...@elastic.co>
AuthorDate: Tue Apr 14 00:23:12 2020 -0700
Avoid using a raw Arc type. (#1429)
This fixes some compiler warnings that popped up recently.
---
lucene/core/src/java/org/apache/lucene/util/fst/FST.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 dca7275..260e9da 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
@@ -334,7 +334,7 @@ public final class FST<T> implements Accountable {
static class BitTable {
/** See {@link BitTableUtil#isBitSet(int, FST.BytesReader)}. */
- static boolean isBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException {
+ static boolean isBitSet(int bitIndex, Arc<?> arc, FST.BytesReader in) throws IOException {
assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING;
in.setPosition(arc.bitTableStart);
return BitTableUtil.isBitSet(bitIndex, in);
@@ -344,28 +344,28 @@ public final class FST<T> implements Accountable {
* See {@link BitTableUtil#countBits(int, FST.BytesReader)}.
* The count of bit set is the number of arcs of a direct addressing node.
*/
- static int countBits(Arc arc, FST.BytesReader in) throws IOException {
+ static int countBits(Arc<?> arc, FST.BytesReader in) throws IOException {
assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING;
in.setPosition(arc.bitTableStart);
return BitTableUtil.countBits(getNumPresenceBytes(arc.numArcs()), in);
}
/** See {@link BitTableUtil#countBitsUpTo(int, FST.BytesReader)}. */
- static int countBitsUpTo(int bitIndex, Arc arc, FST.BytesReader in) throws IOException {
+ static int countBitsUpTo(int bitIndex, Arc<?> arc, FST.BytesReader in) throws IOException {
assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING;
in.setPosition(arc.bitTableStart);
return BitTableUtil.countBitsUpTo(bitIndex, in);
}
/** See {@link BitTableUtil#nextBitSet(int, int, FST.BytesReader)}. */
- static int nextBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException {
+ static int nextBitSet(int bitIndex, Arc<?> arc, FST.BytesReader in) throws IOException {
assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING;
in.setPosition(arc.bitTableStart);
return BitTableUtil.nextBitSet(bitIndex, getNumPresenceBytes(arc.numArcs()), in);
}
/** See {@link BitTableUtil#previousBitSet(int, FST.BytesReader)}. */
- static int previousBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException {
+ static int previousBitSet(int bitIndex, Arc<?> arc, FST.BytesReader in) throws IOException {
assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING;
in.setPosition(arc.bitTableStart);
return BitTableUtil.previousBitSet(bitIndex, in);
@@ -374,7 +374,7 @@ public final class FST<T> implements Accountable {
/**
* Asserts the bit-table of the provided {@link Arc} is valid.
*/
- static boolean assertIsValid(Arc arc, FST.BytesReader in) throws IOException {
+ static boolean assertIsValid(Arc<?> arc, FST.BytesReader in) throws IOException {
assert arc.bytesPerArc() > 0;
assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING;
// First bit must be set.