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 2021/03/22 15:00:01 UTC
[lucene] 02/02: LUCENE-9856: fix a few unused local variables
This is an automated email from the ASF dual-hosted git repository.
mikemccand pushed a commit to branch jira/LUCENE-9856-static-analysis
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 658a84b627869f80c38d027fbebf044c702b9cfc
Author: Mike McCandless <mi...@apache.org>
AuthorDate: Mon Mar 22 10:55:02 2021 -0400
LUCENE-9856: fix a few unused local variables
---
.../lucene70/Lucene70SegmentInfoFormat.java | 17 +++++++----------
.../codecs/simpletext/SimpleTextVectorWriter.java | 4 ++--
.../codecs/lucene86/Lucene86SegmentInfoFormat.java | 7 ++-----
.../codecs/lucene90/Lucene90FieldInfosFormat.java | 15 +++++++--------
.../src/java/org/apache/lucene/util/OfflineSorter.java | 2 --
.../org/apache/lucene/facet/LongValueFacetCounts.java | 6 ++----
.../org/apache/lucene/replicator/nrt/ReplicaNode.java | 2 --
.../sandbox/search/TokenStreamToTermAutomatonQuery.java | 1 -
8 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70SegmentInfoFormat.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70SegmentInfoFormat.java
index d67992d..47070fb 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70SegmentInfoFormat.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70SegmentInfoFormat.java
@@ -106,17 +106,14 @@ public class Lucene70SegmentInfoFormat extends SegmentInfoFormat {
Throwable priorE = null;
SegmentInfo si = null;
try {
- int format =
- CodecUtil.checkIndexHeader(
- input,
- Lucene70SegmentInfoFormat.CODEC_NAME,
- Lucene70SegmentInfoFormat.VERSION_START,
- Lucene70SegmentInfoFormat.VERSION_CURRENT,
- segmentID,
- "");
-
+ CodecUtil.checkIndexHeader(
+ input,
+ Lucene70SegmentInfoFormat.CODEC_NAME,
+ Lucene70SegmentInfoFormat.VERSION_START,
+ Lucene70SegmentInfoFormat.VERSION_CURRENT,
+ segmentID,
+ "");
si = parseSegmentInfo(dir, input, segment, segmentID);
-
} catch (Throwable exception) {
priorE = exception;
} finally {
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextVectorWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextVectorWriter.java
index 1699537..5494810 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextVectorWriter.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextVectorWriter.java
@@ -74,8 +74,8 @@ public class SimpleTextVectorWriter extends VectorWriter {
public void writeField(FieldInfo fieldInfo, VectorValues vectors) throws IOException {
long vectorDataOffset = vectorData.getFilePointer();
List<Integer> docIds = new ArrayList<>();
- int docV, ord = 0;
- for (docV = vectors.nextDoc(); docV != NO_MORE_DOCS; docV = vectors.nextDoc(), ord++) {
+ int docV;
+ for (docV = vectors.nextDoc(); docV != NO_MORE_DOCS; docV = vectors.nextDoc()) {
writeVectorValue(vectors);
docIds.add(docV);
}
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java
index 0f55de1..87462a8 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java
@@ -103,12 +103,9 @@ public class Lucene86SegmentInfoFormat extends SegmentInfoFormat {
Throwable priorE = null;
SegmentInfo si = null;
try {
- int format =
- CodecUtil.checkIndexHeader(
- input, CODEC_NAME, VERSION_START, VERSION_CURRENT, segmentID, "");
-
+ CodecUtil.checkIndexHeader(
+ input, CODEC_NAME, VERSION_START, VERSION_CURRENT, segmentID, "");
si = parseSegmentInfo(dir, input, segment, segmentID);
-
} catch (Throwable exception) {
priorE = exception;
} finally {
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90FieldInfosFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90FieldInfosFormat.java
index 43f4215..3a13f41 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90FieldInfosFormat.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90FieldInfosFormat.java
@@ -125,14 +125,13 @@ public final class Lucene90FieldInfosFormat extends FieldInfosFormat {
Throwable priorE = null;
FieldInfo infos[] = null;
try {
- int version =
- CodecUtil.checkIndexHeader(
- input,
- Lucene90FieldInfosFormat.CODEC_NAME,
- Lucene90FieldInfosFormat.FORMAT_START,
- Lucene90FieldInfosFormat.FORMAT_CURRENT,
- segmentInfo.getId(),
- segmentSuffix);
+ CodecUtil.checkIndexHeader(
+ input,
+ Lucene90FieldInfosFormat.CODEC_NAME,
+ Lucene90FieldInfosFormat.FORMAT_START,
+ Lucene90FieldInfosFormat.FORMAT_CURRENT,
+ segmentInfo.getId(),
+ segmentSuffix);
final int size = input.readVInt(); // read in the size
infos = new FieldInfo[size];
diff --git a/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java b/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java
index 32baa6c..049d5af 100644
--- a/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java
+++ b/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java
@@ -374,7 +374,6 @@ public class OfflineSorter {
/** Merge the most recent {@code maxTempFile} partitions into a new partition. */
void mergePartitions(Directory trackingDir, List<Future<Partition>> segments) throws IOException {
- long start = System.currentTimeMillis();
List<Future<Partition>> segmentsToMerge;
if (segments.size() > maxTempFiles) {
segmentsToMerge = segments.subList(segments.size() - maxTempFiles, segments.size());
@@ -429,7 +428,6 @@ public class OfflineSorter {
long start = System.currentTimeMillis();
SortableBytesRefArray buffer;
boolean exhausted = false;
- int count;
if (valueLength != -1) {
// fixed length case
buffer = new FixedLengthBytesRefArray(valueLength);
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/LongValueFacetCounts.java b/lucene/facet/src/java/org/apache/lucene/facet/LongValueFacetCounts.java
index 07853c8..4379ab7 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/LongValueFacetCounts.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/LongValueFacetCounts.java
@@ -218,8 +218,7 @@ public class LongValueFacetCounts extends Facets {
}
private void countAllOneSegment(NumericDocValues values) throws IOException {
- int doc;
- while ((doc = values.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
+ while (values.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
totCount++;
increment(values.longValue());
}
@@ -255,8 +254,7 @@ public class LongValueFacetCounts extends Facets {
if (singleValues != null) {
countAllOneSegment(singleValues);
} else {
- int doc;
- while ((doc = values.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
+ while (values.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
int limit = values.docValueCount();
totCount += limit;
for (int i = 0; i < limit; i++) {
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
index 29088a8..2e616a8 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
@@ -271,7 +271,6 @@ public abstract class ReplicaNode extends Node {
}
lastPrimaryGen = job.getCopyState().primaryGen;
- byte[] infosBytes = job.getCopyState().infosBytes;
SegmentInfos syncInfos =
SegmentInfos.readCommit(
@@ -437,7 +436,6 @@ public abstract class ReplicaNode extends Node {
job.finish();
// Turn byte[] back to SegmentInfos:
- byte[] infosBytes = copyState.infosBytes;
SegmentInfos infos =
SegmentInfos.readCommit(dir, toIndexInput(copyState.infosBytes), copyState.gen);
assert infos.getVersion() == copyState.version;
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TokenStreamToTermAutomatonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TokenStreamToTermAutomatonQuery.java
index 1be61b9..365b85b 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TokenStreamToTermAutomatonQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TokenStreamToTermAutomatonQuery.java
@@ -65,7 +65,6 @@ public class TokenStreamToTermAutomatonQuery {
TermAutomatonQuery query = new TermAutomatonQuery(field);
int pos = -1;
- int lastPos = 0;
int maxOffset = 0;
int maxPos = -1;
int state = -1;