lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Uwe Schindler" <...@thetaphi.de>
Subject RE: svn commit: r824015 - in /lucene/java/trunk/src/java/org/apache/lucene/util: DocIdBitSet.java OpenBitSetIterator.java SortedVIntList.java
Date Sun, 11 Oct 2009 15:32:24 GMT
Repaired test in contrib and committed. The source of the problem is still
on the TODO list.

-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de

> -----Original Message-----
> From: Uwe Schindler [mailto:uwe@thetaphi.de]
> Sent: Sunday, October 11, 2009 5:07 PM
> To: java-dev@lucene.apache.org
> Subject: RE: svn commit: r824015 - in
> /lucene/java/trunk/src/java/org/apache/lucene/util: DocIdBitSet.java
> OpenBitSetIterator.java SortedVIntList.java
> 
> Hi Michael,
> 
> this patch leads to failures in contrib/queries. We should first also
> remove
> the methods in DocIdSetIterator and make the new ones abstract. Because of
> this we get no compile errors, instead UnsupportedOperationExceptions at
> some places. When the deprecated methods are removed everywhere, we know
> exactly what is needed to be implemented different.
> 
> -----
> Uwe Schindler
> H.-H.-Meier-Allee 63, D-28213 Bremen
> http://www.thetaphi.de
> eMail: uwe@thetaphi.de
> 
> > -----Original Message-----
> > From: buschmi@apache.org [mailto:buschmi@apache.org]
> > Sent: Sunday, October 11, 2009 6:00 AM
> > To: java-commits@lucene.apache.org
> > Subject: svn commit: r824015 - in
> > /lucene/java/trunk/src/java/org/apache/lucene/util: DocIdBitSet.java
> > OpenBitSetIterator.java SortedVIntList.java
> >
> > Author: buschmi
> > Date: Sun Oct 11 04:00:02 2009
> > New Revision: 824015
> >
> > URL: http://svn.apache.org/viewvc?rev=824015&view=rev
> > Log:
> > Remove deprecated metthods in DocIdBitSet.
> >
> > Modified:
> >     lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java
> >
> >
> lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java
> >
> lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java
> >
> > Modified:
> > lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java
> > URL:
> >
> http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/
> > util/DocIdBitSet.java?rev=824015&r1=824014&r2=824015&view=diff
> >
> ==========================================================================
> > ====
> > --- lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java
> > (original)
> > +++ lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java
> Sun
> > Oct 11 04:00:02 2009
> > @@ -56,22 +56,10 @@
> >        this.docId = -1;
> >      }
> >
> > -    /** @deprecated use {@link #docID()} instead. */
> > -    public int doc() {
> > -      assert docId != -1;
> > -      return docId;
> > -    }
> > -
> >      public int docID() {
> >        return docId;
> >      }
> >
> > -    /** @deprecated use {@link #nextDoc()} instead. */
> > -    public boolean next() {
> > -      // (docId + 1) on next line requires -1 initial value for docNr:
> > -      return nextDoc() != NO_MORE_DOCS;
> > -    }
> > -
> >      public int nextDoc() {
> >        // (docId + 1) on next line requires -1 initial value for docNr:
> >        int d = bitSet.nextSetBit(docId + 1);
> > @@ -80,11 +68,6 @@
> >        return docId;
> >      }
> >
> > -    /** @deprecated use {@link #advance(int)} instead. */
> > -    public boolean skipTo(int skipDocNr) {
> > -      return advance(skipDocNr) != NO_MORE_DOCS;
> > -    }
> > -
> >      public int advance(int target) {
> >        int d = bitSet.nextSetBit(target);
> >        // -1 returned by BitSet.nextSetBit() when exhausted
> >
> > Modified:
> >
> lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java
> > URL:
> >
> http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/
> > util/OpenBitSetIterator.java?rev=824015&r1=824014&r2=824015&view=diff
> >
> ==========================================================================
> > ====
> > ---
> >
> lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java
> > (original)
> > +++
> >
> lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java
> > Sun Oct 11 04:00:02 2009
> > @@ -128,11 +128,6 @@
> >    }
> >    ******/
> >
> > -  /** @deprecated use {@link #nextDoc()} instead. */
> > -  public boolean next() {
> > -    return nextDoc() != NO_MORE_DOCS;
> > -  }
> > -
> >    public int nextDoc() {
> >      if (indexArray == 0) {
> >        if (word != 0) {
> > @@ -160,11 +155,6 @@
> >      return curDocId = (i<<6) + bitIndex;
> >    }
> >
> > -  /** @deprecated use {@link #advance(int)} instead. */
> > -  public boolean skipTo(int target) {
> > -    return advance(target) != NO_MORE_DOCS;
> > -  }
> > -
> >    public int advance(int target) {
> >      indexArray = 0;
> >      i = target >> 6;
> > @@ -195,11 +185,6 @@
> >      return curDocId = (i<<6) + bitIndex;
> >    }
> >
> > -  /** @deprecated use {@link #docID()} instead. */
> > -  public int doc() {
> > -    return curDocId;
> > -  }
> > -
> >    public int docID() {
> >      return curDocId;
> >    }
> >
> > Modified:
> > lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java
> > URL:
> >
> http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/
> > util/SortedVIntList.java?rev=824015&r1=824014&r2=824015&view=diff
> >
> ==========================================================================
> > ====
> > ---
> lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java
> > (original)
> > +++
> lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java
> > Sun Oct 11 04:00:02 2009
> > @@ -204,18 +204,10 @@
> >          }
> >        }
> >
> > -      /** @deprecated use {@link #docID()} instead. */
> > -      public int doc() {return lastInt;}
> > -
> >        public int docID() {
> >          return doc;
> >        }
> >
> > -      /** @deprecated use {@link #nextDoc()} instead. */
> > -      public boolean next() {
> > -        return nextDoc() != NO_MORE_DOCS;
> > -      }
> > -
> >        public int nextDoc() {
> >          if (bytePos >= lastBytePos) {
> >            doc = NO_MORE_DOCS;
> > @@ -226,11 +218,6 @@
> >          return doc;
> >        }
> >
> > -      /** @deprecated use {@link #advance(int)} instead. */
> > -      public boolean skipTo(int docNr) {
> > -        return advance(docNr) != NO_MORE_DOCS;
> > -      }
> > -
> >        public int advance(int target) {
> >          while (bytePos < lastBytePos) {
> >            advance();
> >
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: java-dev-help@lucene.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org


Mime
View raw message