You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2016/06/09 13:49:01 UTC
[1/2] lucene-solr:master: LUCENE-6662: Fixd potential resource leaks.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 274dcdb5f -> 04b0a459e
refs/heads/master 98f7ab513 -> b6c6d5e9f
LUCENE-6662: Fixd potential resource leaks.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b6c6d5e9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b6c6d5e9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b6c6d5e9
Branch: refs/heads/master
Commit: b6c6d5e9ffb2f5d8a8b06ad6269de5d17b312b5f
Parents: 98f7ab5
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Jun 9 15:48:10 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Jun 9 15:48:10 2016 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 5 +-
.../analysis/cn/smart/hhmm/WordDictionary.java | 18 ++---
.../src/java/org/egothor/stemmer/Compile.java | 43 +++++-----
.../src/java/org/egothor/stemmer/DiffIt.java | 28 +++----
.../byTask/tasks/CloseTaxonomyReaderTask.java | 10 +--
.../directory/DirectoryTaxonomyWriter.java | 22 +++---
.../jaspell/JaspellTernarySearchTrie.java | 83 ++++++++++----------
7 files changed, 106 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c6d5e9/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 26eff54..0252e85 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -7,7 +7,10 @@ http://s.apache.org/luceneversions
(No Changes)
======================= Lucene 6.2.0 =======================
-(No Changes)
+
+Bug Fixes
+
+LUCENE-6662: Fixd potential resource leaks. (Rishabh Patel via Adrien Grand)
======================= Lucene 6.1.0 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c6d5e9/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
index 9e5d416..5d28a7b 100644
--- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
+++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
@@ -148,19 +148,17 @@ class WordDictionary extends AbstractDictionary {
private void loadFromObjectInputStream(InputStream serialObjectInputStream)
throws IOException, ClassNotFoundException {
- ObjectInputStream input = new ObjectInputStream(serialObjectInputStream);
- wordIndexTable = (short[]) input.readObject();
- charIndexTable = (char[]) input.readObject();
- wordItem_charArrayTable = (char[][][]) input.readObject();
- wordItem_frequencyTable = (int[][]) input.readObject();
- // log.info("load core dict from serialization.");
- input.close();
+ try (ObjectInputStream input = new ObjectInputStream(serialObjectInputStream)) {
+ wordIndexTable = (short[]) input.readObject();
+ charIndexTable = (char[]) input.readObject();
+ wordItem_charArrayTable = (char[][][]) input.readObject();
+ wordItem_frequencyTable = (int[][]) input.readObject();
+ // log.info("load core dict from serialization.");
+ }
}
private void saveToObj(Path serialObj) {
- try {
- ObjectOutputStream output = new ObjectOutputStream(Files.newOutputStream(
- serialObj));
+ try (ObjectOutputStream output = new ObjectOutputStream(Files.newOutputStream(serialObj))) {
output.writeObject(wordIndexTable);
output.writeObject(charIndexTable);
output.writeObject(wordItem_charArrayTable);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c6d5e9/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
index b175ac9..ca874c3 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
@@ -117,33 +117,32 @@ public class Compile {
}
for (int i = 1; i < args.length; i++) {
- LineNumberReader in;
// System.out.println("[" + args[i] + "]");
Diff diff = new Diff();
allocTrie();
System.out.println(args[i]);
- in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)));
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- try {
- line = line.toLowerCase(Locale.ROOT);
- StringTokenizer st = new StringTokenizer(line);
- String stem = st.nextToken();
- if (storeorig) {
- trie.add(stem, "-a");
- }
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- if (token.equals(stem) == false) {
- trie.add(token, diff.exec(token, stem));
+ try (LineNumberReader in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)))) {
+ for (String line = in.readLine(); line != null; line = in.readLine()) {
+ try {
+ line = line.toLowerCase(Locale.ROOT);
+ StringTokenizer st = new StringTokenizer(line);
+ String stem = st.nextToken();
+ if (storeorig) {
+ trie.add(stem, "-a");
+ }
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken();
+ if (token.equals(stem) == false) {
+ trie.add(token, diff.exec(token, stem));
+ }
}
+ } catch (java.util.NoSuchElementException x) {
+ // no base token (stem) on a line
}
- } catch (java.util.NoSuchElementException x) {
- // no base token (stem) on a line
}
}
- in.close();
Optimizer o = new Optimizer();
Optimizer2 o2 = new Optimizer2();
@@ -180,11 +179,11 @@ public class Compile {
trie.printInfo(System.out, prefix + " ");
}
- DataOutputStream os = new DataOutputStream(new BufferedOutputStream(
- Files.newOutputStream(Paths.get(args[i] + ".out"))));
- os.writeUTF(args[0]);
- trie.store(os);
- os.close();
+ try (DataOutputStream os = new DataOutputStream(new BufferedOutputStream(
+ Files.newOutputStream(Paths.get(args[i] + ".out"))))) {
+ os.writeUTF(args[0]);
+ trie.store(os);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c6d5e9/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
index 963cb10..88ea55e 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
@@ -98,25 +98,25 @@ public class DiffIt {
int nop = get(3, args[0]);
for (int i = 1; i < args.length; i++) {
- LineNumberReader in;
// System.out.println("[" + args[i] + "]");
Diff diff = new Diff(ins, del, rep, nop);
String charset = System.getProperty("egothor.stemmer.charset", "UTF-8");
- in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)));
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- try {
- line = line.toLowerCase(Locale.ROOT);
- StringTokenizer st = new StringTokenizer(line);
- String stem = st.nextToken();
- System.out.println(stem + " -a");
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- if (token.equals(stem) == false) {
- System.out.println(stem + " " + diff.exec(token, stem));
+ try (LineNumberReader in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)))) {
+ for (String line = in.readLine(); line != null; line = in.readLine()) {
+ try {
+ line = line.toLowerCase(Locale.ROOT);
+ StringTokenizer st = new StringTokenizer(line);
+ String stem = st.nextToken();
+ System.out.println(stem + " -a");
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken();
+ if (token.equals(stem) == false) {
+ System.out.println(stem + " " + diff.exec(token, stem));
+ }
}
+ } catch (java.util.NoSuchElementException x) {
+ // no base token (stem) on a line
}
- } catch (java.util.NoSuchElementException x) {
- // no base token (stem) on a line
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c6d5e9/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
----------------------------------------------------------------------
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
index 7decc38..438a67c 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
@@ -34,12 +34,12 @@ public class CloseTaxonomyReaderTask extends PerfTask {
@Override
public int doLogic() throws IOException {
- TaxonomyReader taxoReader = getRunData().getTaxonomyReader();
- getRunData().setTaxonomyReader(null);
- if (taxoReader.getRefCount() != 1) {
- System.out.println("WARNING: CloseTaxonomyReader: reference count is currently " + taxoReader.getRefCount());
+ try (TaxonomyReader taxoReader = getRunData().getTaxonomyReader()) {
+ getRunData().setTaxonomyReader(null);
+ if (taxoReader.getRefCount() != 1) {
+ System.out.println("WARNING: CloseTaxonomyReader: reference count is currently " + taxoReader.getRefCount());
+ }
}
- taxoReader.close();
return 1;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c6d5e9/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
----------------------------------------------------------------------
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
index 97acb49..8e0841e 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
@@ -902,18 +902,18 @@ public class DirectoryTaxonomyWriter implements TaxonomyWriter {
return map;
}
addDone(); // in case this wasn't previously called
- DataInputStream in = new DataInputStream(new BufferedInputStream(
- Files.newInputStream(tmpfile)));
- map = new int[in.readInt()];
- // NOTE: The current code assumes here that the map is complete,
- // i.e., every ordinal gets one and exactly one value. Otherwise,
- // we may run into an EOF here, or vice versa, not read everything.
- for (int i=0; i<map.length; i++) {
- int origordinal = in.readInt();
- int newordinal = in.readInt();
- map[origordinal] = newordinal;
+ try (DataInputStream in = new DataInputStream(new BufferedInputStream(
+ Files.newInputStream(tmpfile)))) {
+ map = new int[in.readInt()];
+ // NOTE: The current code assumes here that the map is complete,
+ // i.e., every ordinal gets one and exactly one value. Otherwise,
+ // we may run into an EOF here, or vice versa, not read everything.
+ for (int i=0; i<map.length; i++) {
+ int origordinal = in.readInt();
+ int newordinal = in.readInt();
+ map[origordinal] = newordinal;
+ }
}
- in.close();
// Delete the temporary file, which is no longer needed.
Files.delete(tmpfile);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c6d5e9/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
index 4dc377d..15deaea 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
@@ -231,51 +231,54 @@ public class JaspellTernarySearchTrie implements Accountable {
in = new BufferedReader(IOUtils.getDecodingReader(new GZIPInputStream(
Files.newInputStream(file)), StandardCharsets.UTF_8));
else in = Files.newBufferedReader(file, StandardCharsets.UTF_8);
- String word;
- int pos;
- Float occur, one = new Float(1);
- while ((word = in.readLine()) != null) {
- pos = word.indexOf("\t");
- occur = one;
- if (pos != -1) {
- occur = Float.parseFloat(word.substring(pos + 1).trim());
- word = word.substring(0, pos);
- }
- String key = word.toLowerCase(locale);
- if (rootNode == null) {
- rootNode = new TSTNode(key.charAt(0), null);
- }
- TSTNode node = null;
- if (key.length() > 0 && rootNode != null) {
- TSTNode currentNode = rootNode;
- int charIndex = 0;
- while (true) {
- if (currentNode == null) break;
- int charComp = compareCharsAlphabetically(key.charAt(charIndex),
- currentNode.splitchar);
- if (charComp == 0) {
- charIndex++;
- if (charIndex == key.length()) {
- node = currentNode;
- break;
+ try {
+ String word;
+ int pos;
+ Float occur, one = new Float(1);
+ while ((word = in.readLine()) != null) {
+ pos = word.indexOf("\t");
+ occur = one;
+ if (pos != -1) {
+ occur = Float.parseFloat(word.substring(pos + 1).trim());
+ word = word.substring(0, pos);
+ }
+ String key = word.toLowerCase(locale);
+ if (rootNode == null) {
+ rootNode = new TSTNode(key.charAt(0), null);
+ }
+ TSTNode node = null;
+ if (key.length() > 0 && rootNode != null) {
+ TSTNode currentNode = rootNode;
+ int charIndex = 0;
+ while (true) {
+ if (currentNode == null) break;
+ int charComp = compareCharsAlphabetically(key.charAt(charIndex),
+ currentNode.splitchar);
+ if (charComp == 0) {
+ charIndex++;
+ if (charIndex == key.length()) {
+ node = currentNode;
+ break;
+ }
+ currentNode = currentNode.relatives[TSTNode.EQKID];
+ } else if (charComp < 0) {
+ currentNode = currentNode.relatives[TSTNode.LOKID];
+ } else {
+ currentNode = currentNode.relatives[TSTNode.HIKID];
}
- currentNode = currentNode.relatives[TSTNode.EQKID];
- } else if (charComp < 0) {
- currentNode = currentNode.relatives[TSTNode.LOKID];
- } else {
- currentNode = currentNode.relatives[TSTNode.HIKID];
}
+ Float occur2 = null;
+ if (node != null) occur2 = ((Float) (node.data));
+ if (occur2 != null) {
+ occur += occur2.floatValue();
+ }
+ currentNode = getOrCreateNode(word.trim().toLowerCase(locale));
+ currentNode.data = occur;
}
- Float occur2 = null;
- if (node != null) occur2 = ((Float) (node.data));
- if (occur2 != null) {
- occur += occur2.floatValue();
- }
- currentNode = getOrCreateNode(word.trim().toLowerCase(locale));
- currentNode.data = occur;
}
+ } finally {
+ IOUtils.close(in);
}
- in.close();
}
/**
[2/2] lucene-solr:branch_6x: LUCENE-6662: Fixd potential resource
leaks.
Posted by jp...@apache.org.
LUCENE-6662: Fixd potential resource leaks.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/04b0a459
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/04b0a459
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/04b0a459
Branch: refs/heads/branch_6x
Commit: 04b0a459ec08eb869528fd7b6cd2e3cad12c6563
Parents: 274dcdb
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Jun 9 15:48:10 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Jun 9 15:48:39 2016 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 5 +-
.../analysis/cn/smart/hhmm/WordDictionary.java | 18 ++---
.../src/java/org/egothor/stemmer/Compile.java | 43 +++++-----
.../src/java/org/egothor/stemmer/DiffIt.java | 28 +++----
.../byTask/tasks/CloseTaxonomyReaderTask.java | 10 +--
.../directory/DirectoryTaxonomyWriter.java | 22 +++---
.../jaspell/JaspellTernarySearchTrie.java | 83 ++++++++++----------
7 files changed, 106 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04b0a459/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 680577b..6b50ae7 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -4,7 +4,10 @@ For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
======================= Lucene 6.2.0 =======================
-(No Changes)
+
+Bug Fixes
+
+LUCENE-6662: Fixd potential resource leaks. (Rishabh Patel via Adrien Grand)
======================= Lucene 6.1.0 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04b0a459/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
index 9e5d416..5d28a7b 100644
--- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
+++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
@@ -148,19 +148,17 @@ class WordDictionary extends AbstractDictionary {
private void loadFromObjectInputStream(InputStream serialObjectInputStream)
throws IOException, ClassNotFoundException {
- ObjectInputStream input = new ObjectInputStream(serialObjectInputStream);
- wordIndexTable = (short[]) input.readObject();
- charIndexTable = (char[]) input.readObject();
- wordItem_charArrayTable = (char[][][]) input.readObject();
- wordItem_frequencyTable = (int[][]) input.readObject();
- // log.info("load core dict from serialization.");
- input.close();
+ try (ObjectInputStream input = new ObjectInputStream(serialObjectInputStream)) {
+ wordIndexTable = (short[]) input.readObject();
+ charIndexTable = (char[]) input.readObject();
+ wordItem_charArrayTable = (char[][][]) input.readObject();
+ wordItem_frequencyTable = (int[][]) input.readObject();
+ // log.info("load core dict from serialization.");
+ }
}
private void saveToObj(Path serialObj) {
- try {
- ObjectOutputStream output = new ObjectOutputStream(Files.newOutputStream(
- serialObj));
+ try (ObjectOutputStream output = new ObjectOutputStream(Files.newOutputStream(serialObj))) {
output.writeObject(wordIndexTable);
output.writeObject(charIndexTable);
output.writeObject(wordItem_charArrayTable);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04b0a459/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
index b175ac9..ca874c3 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
@@ -117,33 +117,32 @@ public class Compile {
}
for (int i = 1; i < args.length; i++) {
- LineNumberReader in;
// System.out.println("[" + args[i] + "]");
Diff diff = new Diff();
allocTrie();
System.out.println(args[i]);
- in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)));
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- try {
- line = line.toLowerCase(Locale.ROOT);
- StringTokenizer st = new StringTokenizer(line);
- String stem = st.nextToken();
- if (storeorig) {
- trie.add(stem, "-a");
- }
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- if (token.equals(stem) == false) {
- trie.add(token, diff.exec(token, stem));
+ try (LineNumberReader in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)))) {
+ for (String line = in.readLine(); line != null; line = in.readLine()) {
+ try {
+ line = line.toLowerCase(Locale.ROOT);
+ StringTokenizer st = new StringTokenizer(line);
+ String stem = st.nextToken();
+ if (storeorig) {
+ trie.add(stem, "-a");
+ }
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken();
+ if (token.equals(stem) == false) {
+ trie.add(token, diff.exec(token, stem));
+ }
}
+ } catch (java.util.NoSuchElementException x) {
+ // no base token (stem) on a line
}
- } catch (java.util.NoSuchElementException x) {
- // no base token (stem) on a line
}
}
- in.close();
Optimizer o = new Optimizer();
Optimizer2 o2 = new Optimizer2();
@@ -180,11 +179,11 @@ public class Compile {
trie.printInfo(System.out, prefix + " ");
}
- DataOutputStream os = new DataOutputStream(new BufferedOutputStream(
- Files.newOutputStream(Paths.get(args[i] + ".out"))));
- os.writeUTF(args[0]);
- trie.store(os);
- os.close();
+ try (DataOutputStream os = new DataOutputStream(new BufferedOutputStream(
+ Files.newOutputStream(Paths.get(args[i] + ".out"))))) {
+ os.writeUTF(args[0]);
+ trie.store(os);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04b0a459/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
index 963cb10..88ea55e 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
@@ -98,25 +98,25 @@ public class DiffIt {
int nop = get(3, args[0]);
for (int i = 1; i < args.length; i++) {
- LineNumberReader in;
// System.out.println("[" + args[i] + "]");
Diff diff = new Diff(ins, del, rep, nop);
String charset = System.getProperty("egothor.stemmer.charset", "UTF-8");
- in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)));
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- try {
- line = line.toLowerCase(Locale.ROOT);
- StringTokenizer st = new StringTokenizer(line);
- String stem = st.nextToken();
- System.out.println(stem + " -a");
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- if (token.equals(stem) == false) {
- System.out.println(stem + " " + diff.exec(token, stem));
+ try (LineNumberReader in = new LineNumberReader(Files.newBufferedReader(Paths.get(args[i]), Charset.forName(charset)))) {
+ for (String line = in.readLine(); line != null; line = in.readLine()) {
+ try {
+ line = line.toLowerCase(Locale.ROOT);
+ StringTokenizer st = new StringTokenizer(line);
+ String stem = st.nextToken();
+ System.out.println(stem + " -a");
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken();
+ if (token.equals(stem) == false) {
+ System.out.println(stem + " " + diff.exec(token, stem));
+ }
}
+ } catch (java.util.NoSuchElementException x) {
+ // no base token (stem) on a line
}
- } catch (java.util.NoSuchElementException x) {
- // no base token (stem) on a line
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04b0a459/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
----------------------------------------------------------------------
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
index 7decc38..438a67c 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java
@@ -34,12 +34,12 @@ public class CloseTaxonomyReaderTask extends PerfTask {
@Override
public int doLogic() throws IOException {
- TaxonomyReader taxoReader = getRunData().getTaxonomyReader();
- getRunData().setTaxonomyReader(null);
- if (taxoReader.getRefCount() != 1) {
- System.out.println("WARNING: CloseTaxonomyReader: reference count is currently " + taxoReader.getRefCount());
+ try (TaxonomyReader taxoReader = getRunData().getTaxonomyReader()) {
+ getRunData().setTaxonomyReader(null);
+ if (taxoReader.getRefCount() != 1) {
+ System.out.println("WARNING: CloseTaxonomyReader: reference count is currently " + taxoReader.getRefCount());
+ }
}
- taxoReader.close();
return 1;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04b0a459/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
----------------------------------------------------------------------
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
index 74d77e2..3899a12 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
@@ -902,18 +902,18 @@ public class DirectoryTaxonomyWriter implements TaxonomyWriter {
return map;
}
addDone(); // in case this wasn't previously called
- DataInputStream in = new DataInputStream(new BufferedInputStream(
- Files.newInputStream(tmpfile)));
- map = new int[in.readInt()];
- // NOTE: The current code assumes here that the map is complete,
- // i.e., every ordinal gets one and exactly one value. Otherwise,
- // we may run into an EOF here, or vice versa, not read everything.
- for (int i=0; i<map.length; i++) {
- int origordinal = in.readInt();
- int newordinal = in.readInt();
- map[origordinal] = newordinal;
+ try (DataInputStream in = new DataInputStream(new BufferedInputStream(
+ Files.newInputStream(tmpfile)))) {
+ map = new int[in.readInt()];
+ // NOTE: The current code assumes here that the map is complete,
+ // i.e., every ordinal gets one and exactly one value. Otherwise,
+ // we may run into an EOF here, or vice versa, not read everything.
+ for (int i=0; i<map.length; i++) {
+ int origordinal = in.readInt();
+ int newordinal = in.readInt();
+ map[origordinal] = newordinal;
+ }
}
- in.close();
// Delete the temporary file, which is no longer needed.
Files.delete(tmpfile);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04b0a459/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
index 4dc377d..15deaea 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
@@ -231,51 +231,54 @@ public class JaspellTernarySearchTrie implements Accountable {
in = new BufferedReader(IOUtils.getDecodingReader(new GZIPInputStream(
Files.newInputStream(file)), StandardCharsets.UTF_8));
else in = Files.newBufferedReader(file, StandardCharsets.UTF_8);
- String word;
- int pos;
- Float occur, one = new Float(1);
- while ((word = in.readLine()) != null) {
- pos = word.indexOf("\t");
- occur = one;
- if (pos != -1) {
- occur = Float.parseFloat(word.substring(pos + 1).trim());
- word = word.substring(0, pos);
- }
- String key = word.toLowerCase(locale);
- if (rootNode == null) {
- rootNode = new TSTNode(key.charAt(0), null);
- }
- TSTNode node = null;
- if (key.length() > 0 && rootNode != null) {
- TSTNode currentNode = rootNode;
- int charIndex = 0;
- while (true) {
- if (currentNode == null) break;
- int charComp = compareCharsAlphabetically(key.charAt(charIndex),
- currentNode.splitchar);
- if (charComp == 0) {
- charIndex++;
- if (charIndex == key.length()) {
- node = currentNode;
- break;
+ try {
+ String word;
+ int pos;
+ Float occur, one = new Float(1);
+ while ((word = in.readLine()) != null) {
+ pos = word.indexOf("\t");
+ occur = one;
+ if (pos != -1) {
+ occur = Float.parseFloat(word.substring(pos + 1).trim());
+ word = word.substring(0, pos);
+ }
+ String key = word.toLowerCase(locale);
+ if (rootNode == null) {
+ rootNode = new TSTNode(key.charAt(0), null);
+ }
+ TSTNode node = null;
+ if (key.length() > 0 && rootNode != null) {
+ TSTNode currentNode = rootNode;
+ int charIndex = 0;
+ while (true) {
+ if (currentNode == null) break;
+ int charComp = compareCharsAlphabetically(key.charAt(charIndex),
+ currentNode.splitchar);
+ if (charComp == 0) {
+ charIndex++;
+ if (charIndex == key.length()) {
+ node = currentNode;
+ break;
+ }
+ currentNode = currentNode.relatives[TSTNode.EQKID];
+ } else if (charComp < 0) {
+ currentNode = currentNode.relatives[TSTNode.LOKID];
+ } else {
+ currentNode = currentNode.relatives[TSTNode.HIKID];
}
- currentNode = currentNode.relatives[TSTNode.EQKID];
- } else if (charComp < 0) {
- currentNode = currentNode.relatives[TSTNode.LOKID];
- } else {
- currentNode = currentNode.relatives[TSTNode.HIKID];
}
+ Float occur2 = null;
+ if (node != null) occur2 = ((Float) (node.data));
+ if (occur2 != null) {
+ occur += occur2.floatValue();
+ }
+ currentNode = getOrCreateNode(word.trim().toLowerCase(locale));
+ currentNode.data = occur;
}
- Float occur2 = null;
- if (node != null) occur2 = ((Float) (node.data));
- if (occur2 != null) {
- occur += occur2.floatValue();
- }
- currentNode = getOrCreateNode(word.trim().toLowerCase(locale));
- currentNode.data = occur;
}
+ } finally {
+ IOUtils.close(in);
}
- in.close();
}
/**