From f79712ce8294ae3d117e87a64f4355326b2919af Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Wed, 12 Aug 2009 18:53:49 +0000
Subject: [PATCH] LUCENE-1800: reusable token streams for query parser

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@803664 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                             | 2 ++
 src/java/org/apache/lucene/queryParser/QueryParser.java | 8 +++++++-
 src/java/org/apache/lucene/queryParser/QueryParser.jj   | 8 +++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 190526e166e..cdbc31b36be 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -727,6 +727,8 @@ Optimizations
     strings, the StringHelper.intern() interface was added with a
     default implementation that uses a lockless cache.
     (Earwin Burrfoot, yonik)
+
+13. LUCENE-1800: QueryParser should use reusable TokenStreams. (yonik)
     
 
 Documentation
diff --git a/src/java/org/apache/lucene/queryParser/QueryParser.java b/src/java/org/apache/lucene/queryParser/QueryParser.java
index d1ed9abb6b5..3d7dd5e48dc 100644
--- a/src/java/org/apache/lucene/queryParser/QueryParser.java
+++ b/src/java/org/apache/lucene/queryParser/QueryParser.java
@@ -537,7 +537,13 @@ public class QueryParser implements QueryParserConstants {
     // Use the analyzer to get all the tokens, and then build a TermQuery,
     // PhraseQuery, or nothing based on the term count
 
-    TokenStream source = analyzer.tokenStream(field, new StringReader(queryText));
+    TokenStream source;
+    try {
+      source = analyzer.reusableTokenStream(field, new StringReader(queryText));
+      source.reset();
+    } catch (IOException e) {
+      source = analyzer.tokenStream(field, new StringReader(queryText));
+    }
     CachingTokenFilter buffer = new CachingTokenFilter(source);
     TermAttribute termAtt = null;
     PositionIncrementAttribute posIncrAtt = null;
diff --git a/src/java/org/apache/lucene/queryParser/QueryParser.jj b/src/java/org/apache/lucene/queryParser/QueryParser.jj
index 0c99696103a..309f28b893c 100644
--- a/src/java/org/apache/lucene/queryParser/QueryParser.jj
+++ b/src/java/org/apache/lucene/queryParser/QueryParser.jj
@@ -562,7 +562,13 @@ public class QueryParser {
     // Use the analyzer to get all the tokens, and then build a TermQuery,
     // PhraseQuery, or nothing based on the term count
 
-    TokenStream source = analyzer.tokenStream(field, new StringReader(queryText));
+    TokenStream source;
+    try {
+      source = analyzer.reusableTokenStream(field, new StringReader(queryText));
+      source.reset();
+    } catch (IOException e) {
+      source = analyzer.tokenStream(field, new StringReader(queryText));
+    }
     CachingTokenFilter buffer = new CachingTokenFilter(source);
     TermAttribute termAtt = null;
     PositionIncrementAttribute posIncrAtt = null;