incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/4] git commit: No longer used.
Date Fri, 30 Nov 2012 02:51:22 GMT
No longer used.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/a6879d2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/a6879d2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/a6879d2c

Branch: refs/heads/0.2-dev-removing-old-thrift
Commit: a6879d2cc9c84e85ca83f6699d7a148f0ea7bb86
Parents: fcc9b6b
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Nov 29 21:48:21 2012 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Nov 29 21:48:21 2012 -0500

----------------------------------------------------------------------
 .../apache/blur/lucene/search/IterablePaging.java  |  234 ---------------
 .../apache/blur/search/TestingPagingCollector.java |   84 -----
 2 files changed, 0 insertions(+), 318 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a6879d2c/src/blur-core/src/main/java/org/apache/blur/lucene/search/IterablePaging.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/lucene/search/IterablePaging.java
b/src/blur-core/src/main/java/org/apache/blur/lucene/search/IterablePaging.java
deleted file mode 100644
index 4e2cbc5..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/lucene/search/IterablePaging.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.apache.blur.lucene.search;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TopScoreDocCollector;
-
-/**
- * The {@link IterablePaging} class allows for easy paging through lucene hits.
- */
-public class IterablePaging implements Iterable<ScoreDoc> {
-
-  private static int DEFAULT_NUMBER_OF_HITS_TO_COLLECT = 1000;
-  private IndexSearcher searcher;
-  private Query query;
-  private TotalHitsRef totalHitsRef = new TotalHitsRef();
-  private ProgressRef progressRef = new ProgressRef();
-  private int skipTo;
-  private int numHitsToCollect = DEFAULT_NUMBER_OF_HITS_TO_COLLECT;
-  private int gather = -1;
-  private AtomicBoolean running;
-
-  public IterablePaging(AtomicBoolean running, IndexSearcher searcher, Query query) throws
IOException {
-    this(running, searcher, query, DEFAULT_NUMBER_OF_HITS_TO_COLLECT, null, null);
-  }
-
-  public IterablePaging(AtomicBoolean running, IndexSearcher searcher, Query query, int numHitsToCollect)
throws IOException {
-    this(running, searcher, query, numHitsToCollect, null, null);
-  }
-
-  public IterablePaging(AtomicBoolean running, IndexSearcher searcher, Query query, int numHitsToCollect,
TotalHitsRef totalHitsRef, ProgressRef progressRef) throws IOException {
-    this.running = running;
-    this.query = searcher.rewrite(query);
-    this.searcher = searcher;
-    this.numHitsToCollect = numHitsToCollect;
-    this.totalHitsRef = totalHitsRef == null ? this.totalHitsRef : totalHitsRef;
-    this.progressRef = progressRef == null ? this.progressRef : progressRef;
-  }
-
-  public static class TotalHitsRef {
-    // This is an atomic integer because more than likely if there is
-    // any status sent to the user, it will be done in another thread.
-    protected AtomicInteger totalHits = new AtomicInteger(0);
-
-    public int totalHits() {
-      return totalHits.get();
-    }
-  }
-
-  public static class ProgressRef {
-    // These are atomic integers because more than likely if there is
-    // any status sent to the user, it will be done in another thread.
-    protected AtomicInteger skipTo = new AtomicInteger(0);
-    protected AtomicInteger currentHitPosition = new AtomicInteger(0);
-    protected AtomicInteger searchesPerformed = new AtomicInteger(0);
-    protected AtomicLong queryTime = new AtomicLong(0);
-
-    public int skipTo() {
-      return skipTo.get();
-    }
-
-    public int currentHitPosition() {
-      return currentHitPosition.get();
-    }
-
-    public int searchesPerformed() {
-      return searchesPerformed.get();
-    }
-
-    public long queryTime() {
-      return queryTime.get();
-    }
-  }
-
-  /**
-   * Gets the total hits of the search.
-   * 
-   * @return the total hits.
-   */
-  public int getTotalHits() {
-    return totalHitsRef.totalHits();
-  }
-
-  /**
-   * Allows for gathering of the total hits of this search.
-   * 
-   * @param ref
-   *          {@link TotalHitsRef}.
-   * @return this.
-   */
-  public IterablePaging totalHits(TotalHitsRef ref) {
-    totalHitsRef = ref;
-    return this;
-  }
-
-  /**
-   * Skips the first x number of hits.
-   * 
-   * @param skipTo
-   *          the number hits to skip.
-   * @return this.
-   */
-  public IterablePaging skipTo(int skipTo) {
-    this.skipTo = skipTo;
-    return this;
-  }
-
-  /**
-   * Only gather up to x number of hits.
-   * 
-   * @param gather
-   *          the number of hits to gather.
-   * @return this.
-   */
-  public IterablePaging gather(int gather) {
-    this.gather = gather;
-    return this;
-  }
-
-  /**
-   * Allows for gathering the progress of the paging.
-   * 
-   * @param ref
-   *          the {@link ProgressRef}.
-   * @return this.
-   */
-  public IterablePaging progress(ProgressRef ref) {
-    this.progressRef = ref;
-    return this;
-  }
-
-  /**
-   * The {@link ScoreDoc} iterator.
-   */
-  @Override
-  public Iterator<ScoreDoc> iterator() {
-    return skipHits(new PagingIterator());
-  }
-
-  class PagingIterator implements Iterator<ScoreDoc> {
-    private ScoreDoc[] scoreDocs;
-    private int counter = 0;
-    private int offset = 0;
-    private int endPosition = gather == -1 ? Integer.MAX_VALUE : skipTo + gather;
-    private ScoreDoc lastScoreDoc;
-
-    PagingIterator() {
-      search();
-    }
-
-    void search() {
-      long s = System.currentTimeMillis();
-      progressRef.searchesPerformed.incrementAndGet();
-      try {
-        TopScoreDocCollector collector = TopScoreDocCollector.create(numHitsToCollect, lastScoreDoc,
true);
-        StopExecutionCollector stopExecutionCollector = new StopExecutionCollector(collector,
running);
-        searcher.search(query, stopExecutionCollector);
-        totalHitsRef.totalHits.set(collector.getTotalHits());
-        scoreDocs = collector.topDocs().scoreDocs;
-      } catch (IOException e) {
-        e.printStackTrace();
-        throw new RuntimeException(e);
-      }
-      if (scoreDocs.length > 0) {
-        lastScoreDoc = scoreDocs[scoreDocs.length - 1];
-      } else {
-        lastScoreDoc = null;
-      }
-      long e = System.currentTimeMillis();
-      progressRef.queryTime.addAndGet(e - s);
-    }
-
-    @Override
-    public boolean hasNext() {
-      return counter < totalHitsRef.totalHits() && counter < endPosition ?
true : false;
-    }
-
-    @Override
-    public ScoreDoc next() {
-      if (isCurrentCollectorExhausted()) {
-        search();
-        offset = 0;
-      }
-      progressRef.currentHitPosition.set(counter);
-      counter++;
-      return scoreDocs[offset++];
-    }
-
-    private boolean isCurrentCollectorExhausted() {
-      return offset < scoreDocs.length ? false : true;
-    }
-
-    @Override
-    public void remove() {
-      throw new RuntimeException("read only");
-    }
-  }
-
-  private Iterator<ScoreDoc> skipHits(Iterator<ScoreDoc> iterator) {
-    progressRef.skipTo.set(skipTo);
-    for (int i = 0; i < skipTo && iterator.hasNext(); i++) {
-      // eats the hits, and moves the iterator to the desired skip to position.
-      progressRef.currentHitPosition.set(i);
-      iterator.next();
-    }
-    return iterator;
-  }
-
-  public static void setDefaultNumberOfHitsToCollect(int num) {
-    DEFAULT_NUMBER_OF_HITS_TO_COLLECT = num;
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a6879d2c/src/blur-core/src/test/java/org/apache/blur/search/TestingPagingCollector.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/search/TestingPagingCollector.java
b/src/blur-core/src/test/java/org/apache/blur/search/TestingPagingCollector.java
deleted file mode 100644
index 14ae610..0000000
--- a/src/blur-core/src/test/java/org/apache/blur/search/TestingPagingCollector.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.blur.search;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import static org.apache.blur.lucene.LuceneVersionConstant.LUCENE_VERSION;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.blur.lucene.search.IterablePaging;
-import org.apache.blur.lucene.search.IterablePaging.ProgressRef;
-import org.apache.blur.lucene.search.IterablePaging.TotalHitsRef;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.store.RAMDirectory;
-import org.junit.Test;
-
-
-/**
- * Testing the paging collector.
- * 
- * @author Aaron McCurry
- */
-public class TestingPagingCollector {
-
-  @Test
-  public void testNothingYet() {
-
-  }
-
-  public static void main(String[] args) throws Exception {
-    IndexReader reader = getReaderFlatScore(13245);
-    IndexSearcher searcher = new IndexSearcher(reader);
-
-    TotalHitsRef totalHitsRef = new TotalHitsRef();
-    ProgressRef progressRef = new ProgressRef();
-
-    TermQuery query = new TermQuery(new Term("f1", "value"));
-    IterablePaging paging = new IterablePaging(new AtomicBoolean(true), searcher, query,
100);
-
-    for (ScoreDoc sd : paging.skipTo(90).gather(20).totalHits(totalHitsRef).progress(progressRef))
{
-
-      System.out.println("time [" + progressRef.queryTime() + "] " + "total hits [" + totalHitsRef.totalHits()
+ "] " + "searches [" + progressRef.searchesPerformed() + "] "
-          + "position [" + progressRef.currentHitPosition() + "] " + "doc id [" + sd.doc
+ "] " + "score [" + sd.score + "]");
-    }
-  }
-
-  private static IndexReader getReaderFlatScore(int length) throws Exception {
-    RAMDirectory directory = new RAMDirectory();
-    IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(LUCENE_VERSION,
new KeywordAnalyzer()));
-    for (int i = 0; i < length; i++) {
-      Document document = new Document();
-      document.add(new Field("f1", "value", Store.NO, Index.ANALYZED_NO_NORMS));
-      indexWriter.addDocument(document);
-    }
-    indexWriter.close();
-    return IndexReader.open(directory);
-  }
-
-}


Mime
View raw message