Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 3999 invoked from network); 9 Nov 2009 04:03:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Nov 2009 04:03:05 -0000 Received: (qmail 69604 invoked by uid 500); 9 Nov 2009 04:03:04 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 69438 invoked by uid 500); 9 Nov 2009 04:03:04 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 69418 invoked by uid 99); 9 Nov 2009 04:03:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Nov 2009 04:03:04 +0000 X-ASF-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,OBSCURED_EMAIL,URIBL_BLACK X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Nov 2009 04:02:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 70FB723889EB; Mon, 9 Nov 2009 04:02:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833968 [7/10] - in /lucene/java/branches/flex_1458: ./ contrib/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/ contrib/analyzers/common/src/java/org/apache/... Date: Mon, 09 Nov 2009 04:02:02 -0000 To: java-commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091109040213.70FB723889EB@eris.apache.org> Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java Mon Nov 9 04:01:50 2009 @@ -26,6 +26,7 @@ super(queries, inf, opName); } + @Override public Query makeLuceneQueryFieldNoBoost(String fieldName, BasicQueryFactory qf) { return SrndBooleanQuery.makeBooleanQuery( /* subqueries can be individually boosted */ makeLuceneSubQueriesField(fieldName, qf), BooleanClause.Occur.MUST); Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java Mon Nov 9 04:01:50 2009 @@ -56,6 +56,7 @@ return luceneSubQueries; } + @Override public String toString() { StringBuilder r = new StringBuilder(); if (isOperatorInfix()) { @@ -103,6 +104,7 @@ } + @Override public boolean isFieldsSubQueryAcceptable() { /* at least one subquery should be acceptable */ Iterator sqi = getSubQueriesIterator(); Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java Mon Nov 9 04:01:50 2009 @@ -71,13 +71,16 @@ sncf.addSpanNearQuery(snq); } + @Override public Query makeLuceneQueryFieldNoBoost(final String fieldName, final BasicQueryFactory qf) { return new Query () { + @Override public String toString(String fn) { return getClass().toString() + " " + fieldName + " (" + fn + "?)"; } + @Override public Query rewrite(IndexReader reader) throws IOException { return getSpanNearQuery(reader, fieldName, getBoost(), qf); } Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java Mon Nov 9 04:01:50 2009 @@ -41,6 +41,7 @@ this.fieldOp = fieldOp; } + @Override public boolean isFieldsSubQueryAcceptable() { return false; } @@ -65,6 +66,7 @@ } } + @Override public Query makeLuceneQueryFieldNoBoost(String fieldName, BasicQueryFactory qf) { return makeLuceneQueryNoBoost(qf); /* use this.fieldNames instead of fieldName */ } @@ -74,6 +76,7 @@ public char getFieldOperator() { return fieldOp;} + @Override public String toString() { StringBuilder r = new StringBuilder(); r.append("("); Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java Mon Nov 9 04:01:50 2009 @@ -24,6 +24,7 @@ public class NotQuery extends ComposedQuery { public NotQuery(List queries, String opName) { super(queries, true /* infix */, opName); } + @Override public Query makeLuceneQueryFieldNoBoost(String fieldName, BasicQueryFactory qf) { List luceneSubQueries = makeLuceneSubQueriesField(fieldName, qf); BooleanQuery bq = new BooleanQuery(); Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java Mon Nov 9 04:01:50 2009 @@ -28,6 +28,7 @@ super(queries, infix, opName); } + @Override public Query makeLuceneQueryFieldNoBoost(String fieldName, BasicQueryFactory qf) { return SrndBooleanQuery.makeBooleanQuery( /* subqueries can be individually boosted */ Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java Mon Nov 9 04:01:50 2009 @@ -47,6 +47,7 @@ protected void suffixToString(StringBuilder r) {;} /* override for prefix query */ + @Override public String toString() { StringBuilder r = new StringBuilder(); if (isQuoted()) { @@ -73,12 +74,15 @@ public String distanceSubQueryNotAllowed() {return null;} + @Override public Query makeLuceneQueryFieldNoBoost(final String fieldName, final BasicQueryFactory qf) { return new Query() { + @Override public String toString(String fn) { return getClass().toString() + " " + fieldName + " (" + fn + "?)"; } + @Override public Query rewrite(IndexReader reader) throws IOException { final List luceneSubQueries = new ArrayList(); visitMatchingTerms( reader, fieldName, Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java Mon Nov 9 04:01:50 2009 @@ -44,10 +44,13 @@ return new Term(fieldName, getPrefix()); } + @Override public String toStringUnquoted() {return getPrefix();} + @Override protected void suffixToString(StringBuilder r) {r.append(getSuffixOperator());} + @Override public void visitMatchingTerms( IndexReader reader, String fieldName, Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java Mon Nov 9 04:01:50 2009 @@ -53,10 +53,12 @@ public abstract Query makeLuceneQueryFieldNoBoost(String fieldName, BasicQueryFactory qf); + @Override public abstract String toString(); public boolean isFieldsSubQueryAcceptable() {return true;} + @Override public Object clone() { try { return super.clone(); @@ -67,12 +69,15 @@ /* An empty Lucene query */ public final static Query theEmptyLcnQuery = new BooleanQuery() { /* no changes allowed */ + @Override public void setBoost(float boost) { throw new UnsupportedOperationException(); } + @Override public void add(BooleanClause clause) { throw new UnsupportedOperationException(); } + @Override public void add(Query query, BooleanClause.Occur occur) { throw new UnsupportedOperationException(); } Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java Mon Nov 9 04:01:50 2009 @@ -38,8 +38,10 @@ return new Term(fieldName, getTermText()); } + @Override public String toStringUnquoted() {return getTermText();} + @Override public void visitMatchingTerms( IndexReader reader, String fieldName, Modified: lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java Mon Nov 9 04:01:50 2009 @@ -48,6 +48,7 @@ public String getTruncated() {return truncated;} + @Override public String toStringUnquoted() {return getTruncated();} @@ -80,6 +81,7 @@ pattern = Pattern.compile(re.toString()); } + @Override public void visitMatchingTerms( IndexReader reader, String fieldName, Modified: lucene/java/branches/flex_1458/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java (original) +++ lucene/java/branches/flex_1458/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java Mon Nov 9 04:01:50 2009 @@ -67,18 +67,22 @@ encountered = new boolean[expectedDocNrs.length]; } + @Override public void setScorer(Scorer scorer) throws IOException { this.scorer = scorer; } + @Override public boolean acceptsDocsOutOfOrder() { return true; } + @Override public void setNextReader(IndexReader reader, int docBase) throws IOException { this.docBase = docBase; } + @Override public void collect(int docNr) throws IOException { float score = scorer.score(); docNr += docBase; Modified: lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java Mon Nov 9 04:01:50 2009 @@ -183,12 +183,16 @@ final static class CountingCollector extends Collector { public int numHits = 0; + @Override public void setScorer(Scorer scorer) throws IOException {} + @Override public void collect(int doc) throws IOException { numHits++; } + @Override public void setNextReader(IndexReader reader, int docBase) {} + @Override public boolean acceptsDocsOutOfOrder() { return true; } Modified: lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java Mon Nov 9 04:01:50 2009 @@ -310,14 +310,17 @@ return (tableModel == null) ? 0 : tableModel.getColumnCount(); } + @Override public String getColumnName(int column) { return tableModel.getColumnName(column); } + @Override public Class getColumnClass(int column) { return tableModel.getColumnClass(column); } + @Override public boolean isCellEditable(int row, int column) { return tableModel.isCellEditable(getModelRow(row), column); } @@ -326,6 +329,7 @@ return tableModel.getValueAt(getModelRow(row), column); } + @Override public void setValueAt(Object aValue, int row, int column) { tableModel.setValueAt(aValue, getModelRow(row), column); } Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/BaseTableModel.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/BaseTableModel.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/BaseTableModel.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/BaseTableModel.java Mon Nov 9 04:01:50 2009 @@ -60,10 +60,12 @@ fireTableDataChanged(); } + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } + @Override public Class getColumnClass(int columnIndex) { return String.class; } @@ -89,10 +91,12 @@ } } + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { //no op } + @Override public String getColumnName(int columnIndex) { return columnNames.get(columnIndex).toString(); } Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/RestaurantInfo.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/RestaurantInfo.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/RestaurantInfo.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/RestaurantInfo.java Mon Nov 9 04:01:50 2009 @@ -93,6 +93,7 @@ this.type = type; } + @Override public String toString() { return getName() + " - " + getPhone(); } Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java Mon Nov 9 04:01:50 2009 @@ -30,6 +30,7 @@ private ListSearcher listSearcher; private List list; + @Override protected void setUp() throws Exception { list = new ArrayList(); list.add(DataStore.canolis); Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java Mon Nov 9 04:01:50 2009 @@ -29,6 +29,7 @@ private TableSearcher tableSearcher; private List list; + @Override protected void setUp() throws Exception { list = new ArrayList(); list.add(DataStore.canolis); Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java Mon Nov 9 04:01:50 2009 @@ -26,6 +26,7 @@ private ListModel baseListModel; private ListSearcher listSearcher; + @Override protected void setUp() throws Exception { baseListModel = new BaseListModel(DataStore.getRestaurants()); listSearcher = new ListSearcher(baseListModel); Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java Mon Nov 9 04:01:50 2009 @@ -25,6 +25,7 @@ private TableModel baseTableModel; private TableSearcher tableSearcher; + @Override protected void setUp() throws Exception { baseTableModel = new BaseTableModel(DataStore.getRestaurants()); tableSearcher = new TableSearcher(baseTableModel); Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java Mon Nov 9 04:01:50 2009 @@ -25,6 +25,7 @@ RestaurantInfo infoToAdd1, infoToAdd2; + @Override protected void setUp() throws Exception { baseListModel = new BaseListModel(DataStore.getRestaurants()); listSearcher = new ListSearcher(baseListModel); Modified: lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java (original) +++ lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java Mon Nov 9 04:01:50 2009 @@ -25,6 +25,7 @@ RestaurantInfo infoToAdd1, infoToAdd2; + @Override protected void setUp() throws Exception { baseTableModel = new BaseTableModel(DataStore.getRestaurants()); tableSearcher = new TableSearcher(baseTableModel); Modified: lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java (original) +++ lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java Mon Nov 9 04:01:50 2009 @@ -93,8 +93,6 @@ EXTERNAL_LINK_URL }; - /** @deprecated Please use {@link #TOKEN_TYPES} instead */ - public static final String [] tokenImage = TOKEN_TYPES; /** * Only output tokens */ @@ -193,6 +191,7 @@ * * @see org.apache.lucene.analysis.TokenStream#next() */ + @Override public final boolean incrementToken() throws IOException { if (tokens != null && tokens.hasNext()){ AttributeSource.State state = (AttributeSource.State) tokens.next(); @@ -309,11 +308,13 @@ * * @see org.apache.lucene.analysis.TokenStream#reset() */ + @Override public void reset() throws IOException { super.reset(); scanner.yyreset(input); } + @Override public void reset(Reader reader) throws IOException { super.reset(reader); reset(); Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java (original) +++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java Mon Nov 9 04:01:50 2009 @@ -72,6 +72,7 @@ throw new IllegalArgumentException("logStream must not be null"); return new Analyzer() { + @Override public TokenStream tokenStream(final String fieldName, Reader reader) { return new TokenFilter(child.tokenStream(fieldName, reader)) { private int position = -1; @@ -80,6 +81,7 @@ private OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); private TypeAttribute typeAtt = addAttribute(TypeAttribute.class); + @Override public boolean incrementToken() throws IOException { boolean hasNext = input.incrementToken(); log.println(toString(hasNext)); @@ -124,10 +126,12 @@ return child; // no need to wrap return new Analyzer() { + @Override public TokenStream tokenStream(String fieldName, Reader reader) { return new TokenFilter(child.tokenStream(fieldName, reader)) { private int todo = maxTokens; + @Override public boolean incrementToken() throws IOException { return --todo >= 0 ? input.incrementToken() : false; } @@ -163,6 +167,7 @@ throw new IllegalArgumentException("child analyzer must not be null"); return new Analyzer() { + @Override public TokenStream tokenStream(String fieldName, Reader reader) { return new PorterStemFilter( child.tokenStream(fieldName, reader)); @@ -201,6 +206,7 @@ return child; // no need to wrap return new Analyzer() { + @Override public TokenStream tokenStream(String fieldName, Reader reader) { return new SynonymTokenFilter( child.tokenStream(fieldName, reader), synonyms, maxSynonyms); @@ -240,12 +246,14 @@ private final HashMap> cache = new HashMap>(); + @Override public TokenStream tokenStream(String fieldName, Reader reader) { final ArrayList tokens = cache.get(fieldName); if (tokens == null) { // not yet cached final ArrayList tokens2 = new ArrayList(); TokenStream tokenStream = new TokenFilter(child.tokenStream(fieldName, reader)) { + @Override public boolean incrementToken() throws IOException { boolean hasNext = input.incrementToken(); if (hasNext) tokens2.add(captureState()); @@ -260,6 +268,7 @@ private Iterator iter = tokens.iterator(); + @Override public boolean incrementToken() { if (!iter.hasNext()) return false; restoreState(iter.next()); @@ -356,6 +365,7 @@ public MutableInteger(int value) { this.value = value; } public int intValue() { return value; } public void setValue(int value) { this.value = value; } + @Override public String toString() { return String.valueOf(value); } }; Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (original) +++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java Mon Nov 9 04:01:50 2009 @@ -52,12 +52,16 @@ final static class CountingCollector extends Collector { public int numHits = 0; + @Override public void setScorer(Scorer scorer) throws IOException {} + @Override public void collect(int doc) throws IOException { numHits++; } + @Override public void setNextReader(IndexReader reader, int docBase) {} + @Override public boolean acceptsDocsOutOfOrder() { return true; } Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java (original) +++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java Mon Nov 9 04:01:50 2009 @@ -121,6 +121,7 @@ * * @return a String representation */ + @Override public String toString() { StringBuilder buf = new StringBuilder(); Iterator iter = new TreeMap(table).keySet().iterator(); Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java (original) +++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java Mon Nov 9 04:01:50 2009 @@ -78,6 +78,7 @@ } /** Returns the next token in the stream, or null at EOS. */ + @Override public final boolean incrementToken() throws IOException { while (todo > 0 && index < stack.length) { // pop from stack if (createToken(stack[index++], current)) { @@ -140,6 +141,7 @@ } } + @Override public void reset() throws IOException { super.reset(); stack = null; Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java (original) +++ lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java Mon Nov 9 04:01:50 2009 @@ -93,6 +93,7 @@ this.maxSynonyms = maxSynonyms; } + @Override public TokenStream tokenStream(String fieldName, Reader reader) { TokenStream ts = new WhitespaceTokenizer(reader); ts = new LowerCaseFilter(ts); @@ -105,6 +106,7 @@ TokenStream result; }; + @Override public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException { SavedStreams streams = (SavedStreams) getPreviousTokenStream(); Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java (original) +++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java Mon Nov 9 04:01:50 2009 @@ -53,6 +53,7 @@ private IndexSearcher searcher; private Analyzer analyzer=new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT); + @Override public void init(ServletConfig config) throws ServletException { super.init(config); try { @@ -74,6 +75,7 @@ } } + @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { //Take all completed form fields and add to a Properties object Properties completedFormFields=new Properties(); Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java (original) +++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java Mon Nov 9 04:01:50 2009 @@ -119,6 +119,7 @@ protected int maxsize; + @Override protected boolean removeEldestEntry(Entry eldest) { return size() > maxsize; Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (original) +++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java Mon Nov 9 04:01:50 2009 @@ -51,6 +51,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); @@ -86,6 +87,7 @@ + @Override protected void tearDown() throws Exception { reader.close(); searcher.close(); Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java (original) +++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java Mon Nov 9 04:01:50 2009 @@ -135,6 +135,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); @@ -156,6 +157,7 @@ } + @Override protected void tearDown() throws Exception { searcher.close(); } Modified: lucene/java/branches/flex_1458/docs/contributions.html URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/contributions.html?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/docs/contributions.html (original) +++ lucene/java/branches/flex_1458/docs/contributions.html Mon Nov 9 04:01:50 2009 @@ -312,6 +312,9 @@
  • JavaCC
    • +
  • +LuSQL - Index databases with Lucene +
    • @@ -710,6 +713,35 @@ + +

    LuSQL - Index databases with Lucene

    + + + + + + + + + + + + + + + + +
    + URL + + + http://lab.cisti-icist.nrc-cnrc.gc.ca/cistilabswiki/index.php/LuSql + +
    + author + + Glen Newton +
    Modified: lucene/java/branches/flex_1458/docs/contributions.pdf URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/contributions.pdf?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/docs/contributions.pdf (original) +++ lucene/java/branches/flex_1458/docs/contributions.pdf Mon Nov 9 04:01:50 2009 @@ -5,10 +5,10 @@ /Producer (FOP 0.20.5) >> endobj 5 0 obj -<< /Length 1056 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 1107 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -Gb!#\?#SFN'Rf.G=IM(_6bW7FJ]C)YW!;G$;B,S9K(a!70]UL4,j"m't3U:1DiicU'kHrT??Un0WGQk:G1@sE2XB(gl2[%9)m+S*cW8/f2N1>`Z-TirmBG%WN'([*78Lgc>*Z_dX(l*TF9CUKtMsO9;*Y]BLi4X0oKi47-(g`L6om^t3S(n"%)T()?S7+^]6pprV4"A(oP\8%(NQ?''2PA$sfhO&k,V0X%;_n^e`8:Yau"s(`[;7CIaBs'c]Mcoi'K\8s__l4j;D6Sqcgq,O"9\H#O?VF>C'=b(]KnT3psW4!_>lPQ48eZMr!cTubVa&BjeFqs2J16bm;X=D7E[.ilI-rq:[WA"o'"^TTeHM^Wdj=p;c>61MK=2,KR!0,gQ@/e,;jQQjAF!FMK@X3U`15J3f>h0n]D/T.L 0Y!kM"GHDG5TPWMa>j6P5,ZE'2Y*Xu:QH&YRGV+q]UR4+FD3_*m;9c>?rYm-)VNq~> +Gb!#\>u03/'RfGRYV^&D%s[VGP!7;L,Z#(Aj8iu]_$r#-$Sb:P55+;T-Z+7c6'H&9P!1^G:McZ`PC%42N-\ik(nr!s.%9fkq\AifFOMJU1EV2Q[a4+XAq#Q147oY)E%g6U[>4Hi&=VMQj*@^]d,&uU,Ft*F17abgcAFdW*CV>f5(X'Bk?F?BKERL#f98m-WH'\SbgSmkbn'n"r1tQaJple56UYs`ls_m"P;CSMM/A@)7H'Es?=@KNdM/la5MR34i3eY'I%RUt#4jhHMI@VB^8@k2KYdc[CAdJe)X>4@HBZ4k0$"c9rH"@mZiF"=BMLa,=?&A_n2GkM0tW(@,@PLqc%mDrU_P]^raC2gl;">/OUaSVBks@U2Y1/iM5e*>7U?6mFg%d;gT;p-f2*:Jt!+oWUN;eU[`Zbt,(li/Y]cV/u2M0tERUQ(Zt?sC8UVP7X]#46+:i[;2r;e<9#PY_Ma^Su_;3E&j-P(n%)3eVbNA$*TO0D!:^(BpacLIu0^pgI;r^4gO,j_tGbI,4udhB>2/Cid2jK'uSp3rOgUD?W*M52\EN-q/W;!>Rl)@EQLrg*W.J0W_GaJi &.l?R_pP/BpLc28Y32?Qki.-X9PirK3?qi0ll20X+\[aFi8t$`U_..3E)V*UHBWFJ]&*b&pl@/d6T&(R~> endstream endobj 6 0 obj @@ -38,6 +38,7 @@ 34 0 R 36 0 R 38 0 R +40 0 R ] endobj 8 0 obj @@ -201,208 +202,226 @@ >> endobj 40 0 obj +<< /Type /Annot +/Subtype /Link +/Rect [ 108.0 254.966 308.456 242.966 ] +/C [ 0 0 0 ] +/Border [ 0 0 0 ] +/A 41 0 R +/H /I +>> +endobj +42 0 obj << /Length 2281 /Filter [ /ASCII85Decode /FlateDecode ] >> stream Gatm>=`<=Y&:XAW&5ZaF?pfjJW2%/&gJ,9rp?L3t$Zu9=aL%d5'"sN?Du/cm?-t?gCar#.,bd+?c@#P%L-t.cC@UV)nSM\Z5O`N)eUJTulbCXRI*7[WC\m"Vf@D.MO_qYQ;84,P?_:b]0QeqgXc(/:MjLK`ns*kH>%"a@f[b5>hOqTfeZ(Z0M7_=gZi5E*d8T@i1p;2qC!Ym)iJ4>^5M#+*CF3r+?[%]3#PkOW:E(uUZq6[>8NWn8+i27igA+ch;@GAL_CZj!Bi:2R+obkhR>:$GkC"*8*%4?aLe:.L!)C2_%+eRT)?t2k#HA#sPU4Y2)hl@X)(56'\5gOW#m=^7V<_Q;_)n0/?YpmIcIX>&dV@%Yc[`n^%gudb:)%)n0MS6^.Gon@Gb!h6+g\CH"L,KP_mP$QL^itZ4NPAbebj6u=u2h7h13,h%CEn#B3(h*0aK9][hP"0)0"i.3_4!D"u?USc#^hU/%Y@U=H6G3.+dDm1)_*ho0F4^7(@j2)>pStrN97?Sb=f?ukmi\6i7c9>*12\]:r9FOi_lP0ZK$U@n@Ed2-5T[]]jhkE;9XU+n=>H/E"/")/_lq14GW/']&$?Kfr2ZGGFb62%bu@T%`;ZX??Y0Ebf:_b9&;drb65WaHd=agLkjb/,p05l]&2./^.heO$(A;I,t(p1Q3=)U*M_\AI[;0l]-^Oo$.r(/Id_ku.et-=]UTDRRhdCI3baMhK>Ho!$rPr[6Bole0[ha0>u`-jVhZ.*5[X(R>TMt+3YM&u3]:GT]&"`;I4;;tWmPBMa$lTJ-,aMV%1kOo4JIGXO-8CZb54IV:L1n0cq(2%hS+JESgpsV.C9;%nm_kU?XX>s4kR[?"pZ!EeT2]f@1]f-s7,4L(rfMYb$:UZFH.P&gN,hsA'7VT"a>G12m8#+`+?LVEOe1O%S2iiYq(r ugL[CP\\&M;'3*GX2P\t$_Yu7H!cUoMTru%S\Sol@M#6*o7%HFB@k-tfGj)E>eIE1``03r&EdVd]5j-2@E`4!it)GVSU`XoJFYm.Q/^5I'7i,R]W,m.l25+u6%'1id$[>YCB&Y(l.#=DZ^lnQl?+Vb1i44#CYRb:h.dcRJ]r@\!LRhN9aD%tX[cP(oWSJu+G5UQT_;f"S2q8;!hRVIpr8V\fgg:e$^A'Y"$tUNl@G+. slLhicu,ch:kF'b:cZj([DVKDl;M?7DBr6>E.o]"c[j,T1A0P)Uc)W;o/kVMZk3,XrYGpq-.N#.)EIJ2YeLs%JZa'k9R=VJ9^GPR+uW]u+"g*$Sr7P%?sED65(dtZ;qHbK7mJ\Za.qUV&m3nO6Z_#9QHC,4OB](J.L?=+AXs4b&TPlT/,r26bHT#2]B<$)d`bYmO2PHHC+MqsXl[W+=CpQ[EpN/2>__e@TZd0p"=bntnef\Um"WdNXpdg2n[s(9XgR^ie[jsm@sq&8mDrr\p1c3X~> endstream endobj -41 0 obj +43 0 obj << /Type /Page /Parent 1 0 R /MediaBox [ 0 0 612 792 ] /Resources 3 0 R -/Contents 40 0 R +/Contents 42 0 R >> endobj -42 0 obj +44 0 obj << /Length 2201 /Filter [ /ASCII85Decode /FlateDecode ] >> stream Gau0F9lo&I&A@sBnC1#>L57L3oMdoO48#Bi2c43Ke+Q%"OMk*B<0E.+r;&$;a96!D>Y&`f[KUtYfR8/E(+]6-HL^%fink+^/E,omM_l\f&4I1Y(UA=7aV%&[AO3;Iqhs>aY)Pe>Ou*Jjd/4TB2Etc?-:(H\K>YJ%petS/OJ:Wa_J@8q*@<^b5WSaW]!r%#a?oYtK?dJ9P!VF_:%7_YgY;5!l?`@+AFf6Z5dp:']m_6<>Y]+R%^TuU.un12!d1bAVP5XD1s8!$g48njY(-`#8g9F=80ESSVZsbL=0H^kKO%maNShm"1[`oWKrH'.aMBJJTkdXbC)87Wg3q'.fkQYMot8%_ftY1$`=K:i7EW7iC;0S"K'+Pm9R'dH(bHin\;W_dA\-K5@HmP/"!PEA+RnjmCq!81h-YH*M_D*3Ea9YaIMk_o;fRukb=FHDpseBO"]:IMO@TYGV%r`BYD^Z.l,SCaWn.nPl)'$`_l+oZqdWP>uM&SWo4u0J;cWlrZu2F6inb9IK5AbcZ:m#'_B.?NaUq@R#TIrPH3<"EQ[#+o9\tY*5cGCj)TAaT;os.;dHD>A*Ne46*J,7?Y.3h?Yi]4c*KIsYCLJXc0AeB0;,d$JtAe2N@tNDNrg<4N#/.C_(MSZ!q^Hq!]'HsBYAqqO%'hWomT0:Hk;"qOa1#a?J*C4XBl\%!$7p.(Y.>E'1!]'ION>E1\iLSsbh@H:Lqfm"uL0?d.aq9RPe?T[4?&]YP[:SO 'nH/Os"&kubOfe/_f("*XQ7L>Hi[?U,WSTq@>']Xf;C5+/r7)l3DT.`UFu'H>sQF/'^;N[6t(\0IP7@!5+)2bB5["`#?s3?Q(pN[GcYDhWh22\BM\F`ocNOXA(cu0>qG"iRQ!ZcAsnEA)pmF_X8X(U`asa$IkQ>lDrnMIGO4n;-G8!l!8F.ME/o"OaN`O(lMgj^@Ljuc3Kis>8q46a=,ai8$2Edb3\!QAlm?^T"_51^Tu5;i\p[s*lcj$kd5G91h&.V):1Q(r.jmk\cL.CBs@X)<38$I"^L(2IX'EK[!7CFCo/saJZIHn$gok-._X%??()dR>_W%Krd"i\/biB+Rdorb>h^-Z[_h,%G,1*b+@*5p+@,c[S"6pSO)iR.Gr<1ZR;*)/l\A`IRqZcCa2]E+dde4M"!I]%:'Nfdl_><4\g2B%UD?>rWLJX*0)`cAqodWb2n8T++34JIXJAb,?Qtka+hX'+^fQIB#W5O]!#jS.Pb(h3\-LMr9cJ,9jX-sS>`0Eo(fGNnu\VT,VSeqHtdC0QODG7d-7a]r]h#[OUoQ06:.,U:*"D+a]WrCHI5&,b@g"p>5nMcTa>liV[NVp0(O_28`\"X>k0ns0.ul665D''RHWIj`>oB4Sf/>"A)PV;h7<&nHu)=^1&8U($OW'"_?sqkRSB]E^D(H5PP9@nj-6L8*4)'H=8\REHF8TZ'0'5f2MjDDKpph+CgHII*.r#?K)+F&"rH>H>^`WAj2U)&W@ \dZOsbuk"i\AJ"!M3qQ%GJEl3K^L_g+4K.Kr5rds!6I>=2cEQ!2%Zn>VoCOdOngNq[/g:]"PXX[>";01.fpE(5&-AM~> endstream endobj -43 0 obj +45 0 obj << /Type /Page /Parent 1 0 R /MediaBox [ 0 0 612 792 ] /Resources 3 0 R -/Contents 42 0 R +/Contents 44 0 R >> endobj -44 0 obj -<< /Length 707 /Filter [ /ASCII85Decode /FlateDecode ] +46 0 obj +<< /Length 1002 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -GatUpbANe7'Sc?E`ECn&%s)T?\uLe93\\Fr/@u&L#IUVCTi/&)LJ=e1YQ#Qf#@C<$UcnqTe34LpD"Ap(bjYfB+Aro(r8-JEC"iF>Nh.BGrB'YekC&PN`.[OBI8C_WPc0D)Rk[i-4)<*`nmd?mSjiK-!.:WL`4qmK^p7J0^3fk]-qI@?[*pGD86L'nJGOmP*a`g3,.Tf?_U[u?e7qUIc8DDN5(';Hc^PIn^fbD3Q=KAF2]lZ2`IW-:[:%:n +GatU3966Rf%)2<`p6ZgNp*Ccn24ckX9\O1npXJhc0sPF5DudrG^TVm,=AiTq@ZQ(Go^,9.IZh\eF6h<1HEmZXdI5NS3H4+?%UCrXcP)uU#k"oJ@LMMA\nD'`4Q#1VQ$4fJGt7:LN+FO5qTIVdenfokg]BGb@g@AC183p^r5%BXB:Q\fePNB`(R!#bfoIou)U@#(?OSGXP[s"LpBm.g7cO#cQRW^R,Bj`_Ot0/FSp_N;LrrFRe6'Xf6nVh>(/#"I@-d'NK,"/BQ!>C=/I7.W0TC,=Vo%8s'XTr8<%$`bNKhd7nBAk2L0XTCRr.oC$g_gI9K!F=/dlUCEihE6O3KPLH>;&*:O[H^a\/0_dK]!enK:qA"s;jIA$%g\CT:\:@SHW4W6*o]%\NBflOj4m!X`./C"4W7J)tVZhJ);e_Qk4OPP752gVLHeKM?4;n(.ST[5pQD)CPOp$V81\fFQ"a3Vj_qU5q@5nPZ"4NcEXI9`kuQ,4r+?L7aV+=LU3W<8fg92`c?AJ[*E/%#ROlOd8[*)J`HfY=*^+A-U,*mar-&_2XSP+BK8DmFEm[s3M*s0K%!:Y>cI!Gm>kKQ1>:PIS7kP(f*]0!G[+%.*6og#W&*GAPju#h[Un$WRWM$J1b#_TYq+fjaZE\/c^cuS0"BP5@brE)/4D3S6h3cnMG_Rhgr?U;_5cgR2Bk5I1?)3C)GMM$r=*_-H(&1Vohs7\q_sF7lb_kX&k+mFS3-+OhXFAO%">5H?2@CaK?T^NV7VCa(NBH[CpRg\e_WdecD!GDStdU =h#.?N7cg]~> endstream endobj -45 0 obj +47 0 obj << /Type /Page /Parent 1 0 R /MediaBox [ 0 0 612 792 ] /Resources 3 0 R -/Contents 44 0 R +/Contents 46 0 R >> endobj -47 0 obj +49 0 obj << /Title (\376\377\0\61\0\40\0\117\0\166\0\145\0\162\0\166\0\151\0\145\0\167) - /Parent 46 0 R - /Next 48 0 R + /Parent 48 0 R + /Next 50 0 R /A 9 0 R >> endobj -48 0 obj +50 0 obj << /Title (\376\377\0\62\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\124\0\157\0\157\0\154\0\163) - /Parent 46 0 R - /First 49 0 R - /Last 50 0 R - /Prev 47 0 R - /Next 51 0 R + /Parent 48 0 R + /First 51 0 R + /Last 52 0 R + /Prev 49 0 R + /Next 53 0 R /Count -2 /A 11 0 R >> endobj -49 0 obj +51 0 obj << /Title (\376\377\0\62\0\56\0\61\0\40\0\114\0\165\0\153\0\145) - /Parent 48 0 R - /Next 50 0 R + /Parent 50 0 R + /Next 52 0 R /A 13 0 R >> endobj -50 0 obj +52 0 obj << /Title (\376\377\0\62\0\56\0\62\0\40\0\114\0\111\0\115\0\117\0\40\0\50\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\111\0\156\0\144\0\145\0\170\0\40\0\115\0\157\0\156\0\151\0\164\0\157\0\162\0\51) - /Parent 48 0 R - /Prev 49 0 R + /Parent 50 0 R + /Prev 51 0 R /A 15 0 R >> endobj -51 0 obj +53 0 obj << /Title (\376\377\0\63\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\104\0\157\0\143\0\165\0\155\0\145\0\156\0\164\0\40\0\103\0\157\0\156\0\166\0\145\0\162\0\164\0\145\0\162\0\163) - /Parent 46 0 R - /First 52 0 R - /Last 57 0 R - /Prev 48 0 R - /Next 58 0 R + /Parent 48 0 R + /First 54 0 R + /Last 59 0 R + /Prev 50 0 R + /Next 60 0 R /Count -6 /A 17 0 R >> endobj -52 0 obj +54 0 obj << /Title (\376\377\0\63\0\56\0\61\0\40\0\130\0\115\0\114\0\40\0\104\0\157\0\143\0\165\0\155\0\145\0\156\0\164\0\40\0\43\0\61) - /Parent 51 0 R - /Next 53 0 R + /Parent 53 0 R + /Next 55 0 R /A 19 0 R >> endobj -53 0 obj +55 0 obj << /Title (\376\377\0\63\0\56\0\62\0\40\0\130\0\115\0\114\0\40\0\104\0\157\0\143\0\165\0\155\0\145\0\156\0\164\0\40\0\43\0\62) - /Parent 51 0 R - /Prev 52 0 R - /Next 54 0 R + /Parent 53 0 R + /Prev 54 0 R + /Next 56 0 R /A 21 0 R >> endobj -54 0 obj +56 0 obj << /Title (\376\377\0\63\0\56\0\63\0\40\0\120\0\104\0\106\0\40\0\102\0\157\0\170) - /Parent 51 0 R - /Prev 53 0 R - /Next 55 0 R + /Parent 53 0 R + /Prev 55 0 R + /Next 57 0 R /A 23 0 R >> endobj -55 0 obj +57 0 obj << /Title (\376\377\0\63\0\56\0\64\0\40\0\130\0\120\0\104\0\106\0\40\0\55\0\40\0\120\0\104\0\106\0\40\0\104\0\157\0\143\0\165\0\155\0\145\0\156\0\164\0\40\0\103\0\157\0\156\0\166\0\145\0\162\0\163\0\151\0\157\0\156) - /Parent 51 0 R - /Prev 54 0 R - /Next 56 0 R + /Parent 53 0 R + /Prev 56 0 R + /Next 58 0 R /A 25 0 R >> endobj -56 0 obj +58 0 obj << /Title (\376\377\0\63\0\56\0\65\0\40\0\120\0\104\0\106\0\124\0\145\0\170\0\164\0\123\0\164\0\162\0\145\0\141\0\155\0\40\0\55\0\55\0\40\0\120\0\104\0\106\0\40\0\164\0\145\0\170\0\164\0\40\0\141\0\156\0\144\0\40\0\155\0\145\0\164\0\141\0\144\0\141\0\164\0\141\0\40\0\145\0\170\0\164\0\162\0\141\0\143\0\164\0\151\0\157\0\156) - /Parent 51 0 R - /Prev 55 0 R - /Next 57 0 R + /Parent 53 0 R + /Prev 57 0 R + /Next 59 0 R /A 27 0 R >> endobj -57 0 obj +59 0 obj << /Title (\376\377\0\63\0\56\0\66\0\40\0\120\0\112\0\40\0\103\0\154\0\141\0\163\0\163\0\151\0\143\0\40\0\46\0\40\0\120\0\112\0\40\0\120\0\162\0\157\0\146\0\145\0\163\0\163\0\151\0\157\0\156\0\141\0\154\0\40\0\55\0\40\0\120\0\104\0\106\0\40\0\104\0\157\0\143\0\165\0\155\0\145\0\156\0\164\0\40\0\103\0\157\0\156\0\166\0\145\0\162\0\163\0\151\0\157\0\156) - /Parent 51 0 R - /Prev 56 0 R + /Parent 53 0 R + /Prev 58 0 R /A 29 0 R >> endobj -58 0 obj +60 0 obj << /Title (\376\377\0\64\0\40\0\115\0\151\0\163\0\143\0\145\0\154\0\154\0\141\0\156\0\145\0\157\0\165\0\163) - /Parent 46 0 R - /First 59 0 R - /Last 62 0 R - /Prev 51 0 R - /Count -4 + /Parent 48 0 R + /First 61 0 R + /Last 65 0 R + /Prev 53 0 R + /Count -5 /A 31 0 R >> endobj -59 0 obj +61 0 obj << /Title (\376\377\0\64\0\56\0\61\0\40\0\101\0\162\0\141\0\142\0\151\0\143\0\40\0\101\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\40\0\146\0\157\0\162\0\40\0\112\0\141\0\166\0\141) - /Parent 58 0 R - /Next 60 0 R + /Parent 60 0 R + /Next 62 0 R /A 33 0 R >> endobj -60 0 obj +62 0 obj << /Title (\376\377\0\64\0\56\0\62\0\40\0\120\0\150\0\157\0\156\0\145\0\164\0\151\0\170) - /Parent 58 0 R - /Prev 59 0 R - /Next 61 0 R + /Parent 60 0 R + /Prev 61 0 R + /Next 63 0 R /A 35 0 R >> endobj -61 0 obj +63 0 obj << /Title (\376\377\0\64\0\56\0\63\0\40\0\145\0\152\0\111\0\156\0\144\0\145\0\170\0\40\0\55\0\40\0\112\0\102\0\157\0\163\0\163\0\40\0\115\0\102\0\145\0\141\0\156\0\40\0\146\0\157\0\162\0\40\0\114\0\165\0\143\0\145\0\156\0\145) - /Parent 58 0 R - /Prev 60 0 R - /Next 62 0 R + /Parent 60 0 R + /Prev 62 0 R + /Next 64 0 R /A 37 0 R >> endobj -62 0 obj +64 0 obj << /Title (\376\377\0\64\0\56\0\64\0\40\0\112\0\141\0\166\0\141\0\103\0\103) - /Parent 58 0 R - /Prev 61 0 R + /Parent 60 0 R + /Prev 63 0 R + /Next 65 0 R /A 39 0 R >> endobj -63 0 obj +65 0 obj +<< + /Title (\376\377\0\64\0\56\0\65\0\40\0\114\0\165\0\123\0\121\0\114\0\40\0\55\0\40\0\111\0\156\0\144\0\145\0\170\0\40\0\144\0\141\0\164\0\141\0\142\0\141\0\163\0\145\0\163\0\40\0\167\0\151\0\164\0\150\0\40\0\114\0\165\0\143\0\145\0\156\0\145) + /Parent 60 0 R + /Prev 64 0 R + /A 41 0 R +>> endobj +66 0 obj << /Type /Font /Subtype /Type1 /Name /F3 /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding >> endobj -64 0 obj +67 0 obj << /Type /Font /Subtype /Type1 /Name /F5 /BaseFont /Times-Roman /Encoding /WinAnsiEncoding >> endobj -65 0 obj +68 0 obj << /Type /Font /Subtype /Type1 /Name /F1 /BaseFont /Helvetica /Encoding /WinAnsiEncoding >> endobj -66 0 obj +69 0 obj << /Type /Font /Subtype /Type1 /Name /F2 /BaseFont /Helvetica-Oblique /Encoding /WinAnsiEncoding >> endobj -67 0 obj +70 0 obj << /Type /Font /Subtype /Type1 /Name /F7 @@ -412,197 +431,206 @@ 1 0 obj << /Type /Pages /Count 4 -/Kids [6 0 R 41 0 R 43 0 R 45 0 R ] >> +/Kids [6 0 R 43 0 R 45 0 R 47 0 R ] >> endobj 2 0 obj << /Type /Catalog /Pages 1 0 R - /Outlines 46 0 R + /Outlines 48 0 R /PageMode /UseOutlines >> endobj 3 0 obj << -/Font << /F3 63 0 R /F5 64 0 R /F1 65 0 R /F2 66 0 R /F7 67 0 R >> +/Font << /F3 66 0 R /F5 67 0 R /F1 68 0 R /F2 69 0 R /F7 70 0 R >> /ProcSet [ /PDF /ImageC /Text ] >> endobj 9 0 obj << /S /GoTo -/D [41 0 R /XYZ 85.0 659.0 null] +/D [43 0 R /XYZ 85.0 659.0 null] >> endobj 11 0 obj << /S /GoTo -/D [41 0 R /XYZ 85.0 532.666 null] +/D [43 0 R /XYZ 85.0 532.666 null] >> endobj 13 0 obj << /S /GoTo -/D [41 0 R /XYZ 85.0 480.332 null] +/D [43 0 R /XYZ 85.0 480.332 null] >> endobj 15 0 obj << /S /GoTo -/D [41 0 R /XYZ 85.0 409.779 null] +/D [43 0 R /XYZ 85.0 409.779 null] >> endobj 17 0 obj << /S /GoTo -/D [41 0 R /XYZ 85.0 339.226 null] +/D [43 0 R /XYZ 85.0 339.226 null] >> endobj 19 0 obj << /S /GoTo -/D [41 0 R /XYZ 85.0 260.492 null] +/D [43 0 R /XYZ 85.0 260.492 null] >> endobj 21 0 obj << /S /GoTo -/D [41 0 R /XYZ 85.0 189.939 null] +/D [43 0 R /XYZ 85.0 189.939 null] >> endobj 23 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 659.0 null] +/D [45 0 R /XYZ 85.0 659.0 null] >> endobj 25 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 588.447 null] +/D [45 0 R /XYZ 85.0 588.447 null] >> endobj 27 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 517.894 null] +/D [45 0 R /XYZ 85.0 517.894 null] >> endobj 29 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 447.341 null] +/D [45 0 R /XYZ 85.0 447.341 null] >> endobj 31 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 376.788 null] +/D [45 0 R /XYZ 85.0 376.788 null] >> endobj 33 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 337.654 null] +/D [45 0 R /XYZ 85.0 337.654 null] >> endobj 35 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 267.101 null] +/D [45 0 R /XYZ 85.0 267.101 null] >> endobj 37 0 obj << /S /GoTo -/D [43 0 R /XYZ 85.0 196.548 null] +/D [45 0 R /XYZ 85.0 196.548 null] >> endobj 39 0 obj << /S /GoTo -/D [45 0 R /XYZ 85.0 659.0 null] +/D [47 0 R /XYZ 85.0 659.0 null] >> endobj -46 0 obj +41 0 obj << - /First 47 0 R - /Last 58 0 R +/S /GoTo +/D [47 0 R /XYZ 85.0 588.447 null] +>> +endobj +48 0 obj +<< + /First 49 0 R + /Last 60 0 R >> endobj xref -0 68 +0 71 0000000000 65535 f -0000013756 00000 n -0000013835 00000 n -0000013927 00000 n +0000014567 00000 n +0000014646 00000 n +0000014738 00000 n 0000000015 00000 n 0000000071 00000 n -0000001219 00000 n -0000001339 00000 n -0000001469 00000 n -0000014050 00000 n -0000001604 00000 n -0000014113 00000 n -0000001741 00000 n -0000014179 00000 n -0000001877 00000 n -0000014245 00000 n -0000002014 00000 n -0000014311 00000 n -0000002151 00000 n -0000014377 00000 n -0000002288 00000 n -0000014443 00000 n -0000002425 00000 n -0000014509 00000 n -0000002562 00000 n -0000014573 00000 n -0000002697 00000 n -0000014639 00000 n -0000002834 00000 n -0000014705 00000 n -0000002970 00000 n -0000014771 00000 n -0000003107 00000 n -0000014837 00000 n -0000003244 00000 n -0000014903 00000 n -0000003381 00000 n -0000014969 00000 n -0000003518 00000 n -0000015035 00000 n -0000003655 00000 n -0000006029 00000 n -0000006137 00000 n -0000008431 00000 n -0000008539 00000 n -0000009338 00000 n -0000015099 00000 n -0000009446 00000 n -0000009585 00000 n -0000009802 00000 n -0000009928 00000 n -0000010187 00000 n -0000010487 00000 n -0000010675 00000 n -0000010877 00000 n -0000011034 00000 n -0000011325 00000 n -0000011727 00000 n -0000012143 00000 n -0000012353 00000 n -0000012596 00000 n -0000012760 00000 n -0000013062 00000 n -0000013200 00000 n -0000013313 00000 n -0000013423 00000 n -0000013531 00000 n -0000013647 00000 n +0000001270 00000 n +0000001390 00000 n +0000001527 00000 n +0000014861 00000 n +0000001662 00000 n +0000014924 00000 n +0000001799 00000 n +0000014990 00000 n +0000001935 00000 n +0000015056 00000 n +0000002072 00000 n +0000015122 00000 n +0000002209 00000 n +0000015188 00000 n +0000002346 00000 n +0000015254 00000 n +0000002483 00000 n +0000015320 00000 n +0000002620 00000 n +0000015384 00000 n +0000002755 00000 n +0000015450 00000 n +0000002892 00000 n +0000015516 00000 n +0000003028 00000 n +0000015582 00000 n +0000003165 00000 n +0000015648 00000 n +0000003302 00000 n +0000015714 00000 n +0000003439 00000 n +0000015780 00000 n +0000003576 00000 n +0000015846 00000 n +0000003713 00000 n +0000015910 00000 n +0000003850 00000 n +0000006224 00000 n +0000006332 00000 n +0000008626 00000 n +0000008734 00000 n +0000009829 00000 n +0000015976 00000 n +0000009937 00000 n +0000010076 00000 n +0000010293 00000 n +0000010419 00000 n +0000010678 00000 n +0000010978 00000 n +0000011166 00000 n +0000011368 00000 n +0000011525 00000 n +0000011816 00000 n +0000012218 00000 n +0000012634 00000 n +0000012844 00000 n +0000013087 00000 n +0000013251 00000 n +0000013553 00000 n +0000013705 00000 n +0000014011 00000 n +0000014124 00000 n +0000014234 00000 n +0000014342 00000 n +0000014458 00000 n trailer << -/Size 68 +/Size 71 /Root 2 0 R /Info 4 0 R >> startxref -15150 +16027 %%EOF Modified: lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/SearchFiles.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/SearchFiles.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/SearchFiles.java (original) +++ lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/SearchFiles.java Mon Nov 9 04:01:50 2009 @@ -56,6 +56,7 @@ this.field = field; } + @Override public byte[] norms(String field) throws IOException { return in.norms(this.field); } @@ -176,19 +177,23 @@ private int docBase; // simply print docId and score of every matching document + @Override public void collect(int doc) throws IOException { System.out.println("doc=" + doc + docBase + " score=" + scorer.score()); } + @Override public boolean acceptsDocsOutOfOrder() { return true; } + @Override public void setNextReader(IndexReader reader, int docBase) throws IOException { this.docBase = docBase; } + @Override public void setScorer(Scorer scorer) throws IOException { this.scorer = scorer; } Modified: lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/html/ParserThread.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/html/ParserThread.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/html/ParserThread.java (original) +++ lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/html/ParserThread.java Mon Nov 9 04:01:50 2009 @@ -26,6 +26,7 @@ parser = p; } + @Override public void run() { // convert pipeOut to pipeIn try { try { // parse document to pipeOut Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/StopFilter.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/StopFilter.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/StopFilter.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/StopFilter.java Mon Nov 9 04:01:50 2009 @@ -159,11 +159,7 @@ * or later, it returns true. */ public static boolean getEnablePositionIncrementsVersionDefault(Version matchVersion) { - if (matchVersion.onOrAfter(Version.LUCENE_29)) { - return true; - } else { - return false; - } + return matchVersion.onOrAfter(Version.LUCENE_29); } /** Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocumentsWriter.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocumentsWriter.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocumentsWriter.java Mon Nov 9 04:01:50 2009 @@ -29,6 +29,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.index.codecs.Codec; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.Scorer; @@ -39,8 +40,6 @@ import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Constants; -import org.apache.lucene.index.codecs.Codec; - /** * This class accepts multiple added documents and directly * writes a single segment file. It does this more @@ -539,6 +538,13 @@ return true; } + synchronized boolean anyChanges() { + return numDocsInRAM != 0 || + deletesInRAM.numTerms != 0 || + deletesInRAM.docIDs.size() != 0 || + deletesInRAM.queries.size() != 0; + } + synchronized private void initFlushState(boolean onlyDocStore) { initSegmentName(onlyDocStore); flushState = new SegmentWriteState(this, directory, segment, docFieldProcessor.fieldInfos, Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriter.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriter.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriter.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriter.java Mon Nov 9 04:01:50 2009 @@ -4868,4 +4868,18 @@ boolean testPoint(String name) { return true; } + + synchronized boolean nrtIsCurrent(SegmentInfos infos) { + if (!infos.equals(segmentInfos)) { + // if any structural changes (new segments), we are + // stale + return false; + } else { + return !docWriter.anyChanges(); + } + } + + synchronized boolean isClosed() { + return closed; + } } Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfo.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfo.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfo.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfo.java Mon Nov 9 04:01:50 2009 @@ -167,12 +167,10 @@ codec = src.codec; } - // must be Map void setDiagnostics(Map diagnostics) { this.diagnostics = diagnostics; } - // returns Map public Map getDiagnostics() { return diagnostics; } @@ -647,6 +645,7 @@ // flex postings addIfExists(files, name + "." + exts[i]); } + // nocommit -- only does ifExists on prx for standard codec codec.files(dir, this, files); } @@ -723,7 +722,7 @@ } return files; } - + /* Called whenever any change is made that affects which * files this segment has. */ private void clearFiles() { @@ -760,13 +759,13 @@ * has the same dir and same name. */ @Override public boolean equals(Object obj) { - SegmentInfo other; - try { - other = (SegmentInfo) obj; - } catch (ClassCastException cce) { + if (this == obj) return true; + if (obj instanceof SegmentInfo) { + final SegmentInfo other = (SegmentInfo) obj; + return other.dir == dir && other.name.equals(name); + } else { return false; } - return other.dir == dir && other.name.equals(name); } @Override Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfos.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfos.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfos.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfos.java Mon Nov 9 04:01:50 2009 @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.PrintStream; import java.util.Vector; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -659,14 +660,7 @@ if (gen == -1) { // Neither approach found a generation - String s; - if (files != null) { - s = ""; - for(int i=0;i= UnicodeUtil.UNI_SUR_HIGH_START && ch <= UnicodeUtil.UNI_SUR_HIGH_END) - // Unpaired + } else if (ch >= UnicodeUtil.UNI_SUR_HIGH_START && (ch <= UnicodeUtil.UNI_SUR_HIGH_END || + ch == 0xffff)) { + // Unpaired or 0xffff ch = tokenText[downto] = UnicodeUtil.UNI_REPLACEMENT_CHAR; + } code = (code*31) + ch; } Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java Mon Nov 9 04:01:50 2009 @@ -125,8 +125,8 @@ @Override public void files(Directory dir, SegmentInfo segmentInfo, Collection files) { SepDocsReader.files(segmentInfo, files); - StandardTermsDictReader.files(segmentInfo, files); - SimpleStandardTermsIndexReader.files(segmentInfo, files); + StandardTermsDictReader.files(dir, segmentInfo, files); + SimpleStandardTermsIndexReader.files(dir, segmentInfo, files); } @Override Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java Mon Nov 9 04:01:50 2009 @@ -139,10 +139,10 @@ } @Override - public void files(Directory dir, SegmentInfo segmentInfo, Collection files) { - StandardDocsReader.files(segmentInfo, files); - StandardTermsDictReader.files(segmentInfo, files); - SimpleStandardTermsIndexReader.files(segmentInfo, files); + public void files(Directory dir, SegmentInfo segmentInfo, Collection files) throws IOException { + StandardDocsReader.files(dir, segmentInfo, files); + StandardTermsDictReader.files(dir, segmentInfo, files); + SimpleStandardTermsIndexReader.files(dir, segmentInfo, files); } @Override Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java Mon Nov 9 04:01:50 2009 @@ -24,13 +24,12 @@ import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.codecs.Codec; -import org.apache.lucene.index.codecs.DocsConsumer; -import org.apache.lucene.index.codecs.standard.StandardDocsConsumer; -import org.apache.lucene.index.codecs.standard.StandardDocsProducer; import org.apache.lucene.index.codecs.FieldsConsumer; import org.apache.lucene.index.codecs.FieldsProducer; import org.apache.lucene.index.codecs.standard.SimpleStandardTermsIndexReader; import org.apache.lucene.index.codecs.standard.SimpleStandardTermsIndexWriter; +import org.apache.lucene.index.codecs.standard.StandardDocsConsumer; +import org.apache.lucene.index.codecs.standard.StandardDocsProducer; import org.apache.lucene.index.codecs.standard.StandardTermsDictReader; import org.apache.lucene.index.codecs.standard.StandardTermsDictWriter; import org.apache.lucene.index.codecs.standard.StandardTermsIndexReader; @@ -122,8 +121,8 @@ @Override public void files(Directory dir, SegmentInfo segmentInfo, Collection files) { SepDocsReader.files(segmentInfo, files); - StandardTermsDictReader.files(segmentInfo, files); - SimpleStandardTermsIndexReader.files(segmentInfo, files); + StandardTermsDictReader.files(dir, segmentInfo, files); + SimpleStandardTermsIndexReader.files(dir, segmentInfo, files); } @Override Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java Mon Nov 9 04:01:50 2009 @@ -485,7 +485,7 @@ return fields.get(fieldInfo); } - public static void files(SegmentInfo info, Collection files) { + public static void files(Directory dir, SegmentInfo info, Collection files) { files.add(IndexFileNames.segmentFileName(info.name, StandardCodec.TERMS_INDEX_EXTENSION)); } Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java Mon Nov 9 04:01:50 2009 @@ -24,7 +24,6 @@ import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.codecs.Codec; -import org.apache.lucene.index.codecs.DocsConsumer; import org.apache.lucene.index.codecs.FieldsConsumer; import org.apache.lucene.index.codecs.FieldsProducer; import org.apache.lucene.store.Directory; @@ -119,10 +118,10 @@ static final String TERMS_INDEX_EXTENSION = "tii"; @Override - public void files(Directory dir, SegmentInfo segmentInfo, Collection files) { - StandardDocsReader.files(segmentInfo, files); - StandardTermsDictReader.files(segmentInfo, files); - SimpleStandardTermsIndexReader.files(segmentInfo, files); + public void files(Directory dir, SegmentInfo segmentInfo, Collection files) throws IOException { + StandardDocsReader.files(dir, segmentInfo, files); + StandardTermsDictReader.files(dir, segmentInfo, files); + SimpleStandardTermsIndexReader.files(dir, segmentInfo, files); } @Override Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java Mon Nov 9 04:01:50 2009 @@ -70,9 +70,9 @@ } } - public static void files(SegmentInfo segmentInfo, Collection files) { + public static void files(Directory dir, SegmentInfo segmentInfo, Collection files) throws IOException { files.add(IndexFileNames.segmentFileName(segmentInfo.name, StandardCodec.FREQ_EXTENSION)); - StandardPositionsReader.files(segmentInfo, files); + StandardPositionsReader.files(dir, segmentInfo, files); } @Override Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java Mon Nov 9 04:01:50 2009 @@ -25,7 +25,6 @@ import org.apache.lucene.index.PositionsEnum; import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.codecs.Codec; -import org.apache.lucene.index.codecs.standard.StandardPositionsProducer; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; @@ -48,9 +47,11 @@ Codec.checkHeader(termsIn, StandardPositionsWriter.CODEC, StandardPositionsWriter.VERSION_START); } - public static void files(SegmentInfo segmentInfo, Collection files) { + public static void files(Directory dir, SegmentInfo segmentInfo, Collection files) throws IOException { if (segmentInfo.getHasProx()) { - files.add(IndexFileNames.segmentFileName(segmentInfo.name, StandardCodec.PROX_EXTENSION)); + String file = IndexFileNames.segmentFileName(segmentInfo.name, StandardCodec.PROX_EXTENSION); + if (dir.fileExists(file)) + files.add(IndexFileNames.segmentFileName(segmentInfo.name, StandardCodec.PROX_EXTENSION)); } } Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java Mon Nov 9 04:01:50 2009 @@ -137,7 +137,7 @@ } } - public static void files(SegmentInfo segmentInfo, Collection files) { + public static void files(Directory dir, SegmentInfo segmentInfo, Collection files) { files.add(IndexFileNames.segmentFileName(segmentInfo.name, StandardCodec.TERMS_EXTENSION)); } Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/messages/MessageImpl.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/messages/MessageImpl.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/messages/MessageImpl.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/messages/MessageImpl.java Mon Nov 9 04:01:50 2009 @@ -60,13 +60,13 @@ @Override public String toString() { Object[] args = getArguments(); - String argsString = ""; + StringBuilder sb = new StringBuilder(getKey()); if (args != null) { for (int i = 0; i < args.length; i++) { - argsString += args[i] + (i < args.length ? "" : ", "); + sb.append(i == 0 ? " " : ", ").append(args[i]); } } - return getKey() + " " + argsString; + return sb.toString(); } } Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingSpanFilter.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingSpanFilter.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingSpanFilter.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingSpanFilter.java Mon Nov 9 04:01:50 2009 @@ -19,21 +19,23 @@ import org.apache.lucene.index.IndexReader; import java.io.IOException; - import java.util.Map; import java.util.WeakHashMap; +import java.util.concurrent.locks.ReentrantLock; /** * Wraps another SpanFilter's result and caches it. The purpose is to allow * filters to simply filter, and then wrap with this class to add caching. */ public class CachingSpanFilter extends SpanFilter { - protected SpanFilter filter; + private SpanFilter filter; /** - * A transient Filter cache. + * A transient Filter cache (package private because of test) */ - protected transient Map cache; + private transient Map cache; + + private final ReentrantLock lock = new ReentrantLock(); /** * @param filter Filter to cache results of @@ -49,18 +51,25 @@ } private SpanFilterResult getCachedResult(IndexReader reader) throws IOException { - SpanFilterResult result = null; - if (cache == null) { - cache = new WeakHashMap(); - } - - synchronized (cache) { // check cache - result = cache.get(reader); - if (result == null) { - result = filter.bitSpans(reader); - cache.put(reader, result); + lock.lock(); + try { + if (cache == null) { + cache = new WeakHashMap(); } + final SpanFilterResult cached = cache.get(reader); + if (cached != null) return cached; + } finally { + lock.unlock(); + } + + final SpanFilterResult result = filter.bitSpans(reader); + lock.lock(); + try { + cache.put(reader, result); + } finally { + lock.unlock(); } + return result; } Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingWrapperFilter.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=833968&r1=833967&r2=833968&view=diff ============================================================================== --- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original) +++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingWrapperFilter.java Mon Nov 9 04:01:50 2009 @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Map; import java.util.WeakHashMap; +import java.util.concurrent.locks.ReentrantLock; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.OpenBitSetDISI; @@ -29,12 +30,14 @@ * filters to simply filter, and then wrap with this class to add caching. */ public class CachingWrapperFilter extends Filter { - protected Filter filter; + Filter filter; /** - * A transient Filter cache. + * A transient Filter cache (package private because of test) */ - protected transient Map cache; + transient Map cache; + + private final ReentrantLock lock = new ReentrantLock(); /** * @param filter Filter to cache results of @@ -63,27 +66,28 @@ @Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - if (cache == null) { - cache = new WeakHashMap(); - } - - DocIdSet cached = null; - synchronized (cache) { // check cache - cached = cache.get(reader); - } + lock.lock(); + try { + if (cache == null) { + cache = new WeakHashMap(); + } - if (cached != null) { - return cached; + final DocIdSet cached = cache.get(reader); + if (cached != null) return cached; + } finally { + lock.unlock(); } final DocIdSet docIdSet = docIdSetToCache(filter.getDocIdSet(reader), reader); - if (docIdSet != null) { - synchronized (cache) { // update cache + lock.lock(); + try { cache.put(reader, docIdSet); + } finally { + lock.unlock(); } } - + return docIdSet; }