No need to apologize! Yes I used "svn merge --reintegrate" (got help from Robert on stuck merge props).
Thanks for reminding me to remove the branch ... I just did. I just missed those compilation warnings before committing the first time. Mike McCandless http://blog.mikemccandless.com On Tue, Aug 21, 2012 at 8:28 AM, Uwe Schindler <[email protected]> wrote: > Hi, > > Sorry for interfering with you. I was expecting you will merge before > reintegrating. Did you do not do merge --reintegrate? > Don't forget to nuke branch, it cannot be used anymore once reintegrated! > > Uwe > > ----- > Uwe Schindler > H.-H.-Meier-Allee 63, D-28213 Bremen > http://www.thetaphi.de > eMail: [email protected] > >> -----Original Message----- >> From: [email protected] [mailto:[email protected]] >> Sent: Tuesday, August 21, 2012 2:25 PM >> To: [email protected] >> Subject: svn commit: r1375499 - >> /lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/block/Bloc >> kPostingsReader.java >> >> Author: mikemccand >> Date: Tue Aug 21 12:25:13 2012 >> New Revision: 1375499 >> >> URL: http://svn.apache.org/viewvc?rev=1375499&view=rev >> Log: >> remove unnecessary casts (covariant IndexInput.clone) >> >> Modified: >> >> lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/block/Block >> PostingsReader.java >> >> Modified: >> lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/block/Block >> PostingsReader.java >> URL: >> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apac >> he/lucene/codecs/block/BlockPostingsReader.java?rev=1375499&r1=1375498& >> r2=1375499&view=diff >> ================================================================ >> ============== >> --- >> lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/block/Block >> PostingsReader.java (original) >> +++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/block >> +++ /BlockPostingsReader.java Tue Aug 21 12:25:13 2012 >> @@ -354,7 +354,7 @@ final class BlockPostingsReader extends >> >> public BlockDocsEnum(FieldInfo fieldInfo) throws IOException { >> this.startDocIn = BlockPostingsReader.this.docIn; >> - this.docIn = (IndexInput) startDocIn.clone(); >> + this.docIn = startDocIn.clone(); >> indexHasFreq = >> fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) >= 0; >> indexHasPos = >> fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_ >> POSITIONS) >= 0; >> indexHasOffsets = >> fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_ >> POSITIONS_AND_OFFSETS) >= 0; @@ -486,7 +486,7 @@ final class >> BlockPostingsReader extends >> >> if (skipper == null) { >> // Lazy init: first time this enum has ever been used for skipping >> - skipper = new BlockSkipReader((IndexInput) docIn.clone(), >> + skipper = new BlockSkipReader(docIn.clone(), >> BlockPostingsWriter.maxSkipLevels, >> BLOCK_SIZE, >> indexHasPos, @@ -629,8 +629,8 @@ >> final class >> BlockPostingsReader extends >> >> public BlockDocsAndPositionsEnum(FieldInfo fieldInfo) throws >> IOException { >> this.startDocIn = BlockPostingsReader.this.docIn; >> - this.docIn = (IndexInput) startDocIn.clone(); >> - this.posIn = (IndexInput) BlockPostingsReader.this.posIn.clone(); >> + this.docIn = startDocIn.clone(); >> + this.posIn = BlockPostingsReader.this.posIn.clone(); >> encoded = new byte[MAX_ENCODED_SIZE]; >> indexHasOffsets = >> fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_ >> POSITIONS_AND_OFFSETS) >= 0; >> indexHasPayloads = fieldInfo.hasPayloads(); @@ -795,7 +795,7 @@ final >> class BlockPostingsReader extends >> // if (DEBUG) { >> // System.out.println(" create skipper"); >> // } >> - skipper = new BlockSkipReader((IndexInput) docIn.clone(), >> + skipper = new BlockSkipReader(docIn.clone(), >> BlockPostingsWriter.maxSkipLevels, >> BLOCK_SIZE, >> true, @@ -1046,9 +1046,9 @@ final >> class >> BlockPostingsReader extends >> >> public EverythingEnum(FieldInfo fieldInfo) throws IOException { >> this.startDocIn = BlockPostingsReader.this.docIn; >> - this.docIn = (IndexInput) startDocIn.clone(); >> - this.posIn = (IndexInput) BlockPostingsReader.this.posIn.clone(); >> - this.payIn = (IndexInput) BlockPostingsReader.this.payIn.clone(); >> + this.docIn = startDocIn.clone(); >> + this.posIn = BlockPostingsReader.this.posIn.clone(); >> + this.payIn = BlockPostingsReader.this.payIn.clone(); >> encoded = new byte[MAX_ENCODED_SIZE]; >> indexHasOffsets = >> fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_ >> POSITIONS_AND_OFFSETS) >= 0; >> if (indexHasOffsets) { >> @@ -1278,7 +1278,7 @@ final class BlockPostingsReader extends >> // if (DEBUG) { >> // System.out.println(" create skipper"); >> // } >> - skipper = new BlockSkipReader((IndexInput) docIn.clone(), >> + skipper = new BlockSkipReader(docIn.clone(), >> BlockPostingsWriter.maxSkipLevels, >> BLOCK_SIZE, >> true, > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
