Return-Path: Delivered-To: apmail-lucene-java-dev-archive@www.apache.org Received: (qmail 60980 invoked from network); 27 Mar 2010 20:31:55 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Mar 2010 20:31:55 -0000 Received: (qmail 26057 invoked by uid 500); 27 Mar 2010 20:31:54 -0000 Delivered-To: apmail-lucene-java-dev-archive@lucene.apache.org Received: (qmail 26009 invoked by uid 500); 27 Mar 2010 20:31:54 -0000 Mailing-List: contact java-dev-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-dev@lucene.apache.org Received: (qmail 26001 invoked by uid 99); 27 Mar 2010 20:31:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Mar 2010 20:31:54 +0000 X-ASF-Spam-Status: No, hits=0.7 required=10.0 tests=RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [74.125.83.48] (HELO mail-gw0-f48.google.com) (74.125.83.48) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Mar 2010 20:31:45 +0000 Received: by gwb19 with SMTP id 19so1585992gwb.35 for ; Sat, 27 Mar 2010 13:31:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.150.145.18 with HTTP; Sat, 27 Mar 2010 13:31:24 -0700 (PDT) Date: Sat, 27 Mar 2010 16:31:24 -0400 Received: by 10.151.88.12 with SMTP id q12mr3064875ybl.315.1269721884266; Sat, 27 Mar 2010 13:31:24 -0700 (PDT) Message-ID: <9ac0c6aa1003271331r62a7c4dfn39145c78d81a76d3@mail.gmail.com> Subject: Re: svn commit: r928246 [1/6] - in /lucene/java/branches/flex_1458: ./ backwards/src/ backwards/src/java/org/apache/lucene/search/ backwards/src/test/org/apache/lucene/analysis/ backwards/src/test/org/apache/lucene/document/ backwards/src/test/org/ap From: Michael McCandless To: java-dev@lucene.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org I'm merging the conflicts now... it turned out to cause a number of conflicts because in flex I changed how DW stores the terms in RAM, to first prefix-code each term's length as vInt (most often 1 byte, but in messed up cases 2 bytes), and then then the term's characters as UTF8 bytes. This caused the conflicts... Mike On Sat, Mar 27, 2010 at 4:07 PM, Michael Busch wrote: > Hey Uwe, I can update the flex branch to use parallel arrays after the > weekend. > > =A0Michael > > On Mar 27, 2010, at 12:12 PM, uschindler@apache.org wrote: > >> Author: uschindler >> Date: Sat Mar 27 19:12:08 2010 >> New Revision: 928246 >> >> URL: http://svn.apache.org/viewvc?rev=3D928246&view=3Drev >> Log: >> Merge upto trunk rev 928243 >> >> The following revision of Michael Busch was left out (I do not know how >> this affects flex): 926791 (buschmi, LUCENE-2329: Use parallel arrays >> instead of PostingList objects in TermsHash*) >> >> Also I added a noncommit to the Directory.copyTo() method, as the >> IndexFileNameFilter now needs a Codec which is unknown to the directory.= I >> replaced with Arrays.asList(listAll()), without filter, for now. >> >> Added: >> >> lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util= /LuceneJUnitResultFormatter.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/Lucene= JUnitResultFormatter.java >> =A0 lucene/java/branches/flex_1458/contrib/ant/src/resources/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/ant/src/resources/ >> =A0 lucene/java/branches/flex_1458/contrib/ant/src/resources/org/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/ant/src/resources/org/ >> =A0 lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/ >> >> lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/luce= ne/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/lucene/ >> >> lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/luce= ne/ant/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/lucene/ant/ >> >> lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/luce= ne/ant/antlib.xml >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/lucene/ant/= antlib.xml >> >> lucene/java/branches/flex_1458/contrib/benchmark/conf/collector-small.al= g >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg >> =A0 lucene/java/branches/flex_1458/contrib/benchmark/conf/collector.alg >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg >> >> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/luc= ene/benchmark/byTask/tasks/SearchWithCollectorTask.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/ben= chmark/byTask/tasks/SearchWithCollectorTask.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/ >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/BaseFragmentsBuilder.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/BaseFragmentsBuilder.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/FastVectorHighlighter.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/FastVectorHighlighter.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/FieldFragList.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/FieldFragList.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/FieldPhraseList.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/FieldPhraseList.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/FieldQuery.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/FieldQuery.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/FieldTermStack.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/FieldTermStack.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/FragListBuilder.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/FragListBuilder.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/FragmentsBuilder.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/FragmentsBuilder.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/ScoreOrderFragmentsBuilder.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/SimpleFragListBuilder.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/SimpleFragListBuilder.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/SimpleFragmentsBuilder.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/SimpleFragmentsBuilder.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/l= ucene/search/vectorhighlight/package.html >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/s= earch/vectorhighlight/package.html >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/ >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/AbstractTestCase.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/AbstractTestCase.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/FieldPhraseListTest.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/FieldPhraseListTest.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/FieldQueryTest.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/FieldQueryTest.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/FieldTermStackTest.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/FieldTermStackTest.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/IndexTimeSynonymTest.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/IndexTimeSynonymTest.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/ScoreOrderFragmentsBuilderTest.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/SimpleFragListBuilderTest.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/SimpleFragListBuilderTest.java >> >> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/l= ucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/s= earch/vectorhighlight/SimpleFragmentsBuilderTest.java >> =A0 lucene/java/branches/flex_1458/contrib/queries/lib/ >> =A0 =A0 - copied from r928243, lucene/dev/trunk/lucene/contrib/queries/l= ib/ >> >> lucene/java/branches/flex_1458/contrib/queries/lib/jakarta-regexp-1.4.ja= r >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar >> =A0 lucene/java/branches/flex_1458/contrib/queries/lib/regexp.LICENSE >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/lib/regexp.LICENSE >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/ >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/JakartaRegexpCapabilities.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/JakartaRegexpCapabilities.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/JavaUtilRegexCapabilities.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/JavaUtilRegexCapabilities.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/RegexCapabilities.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/RegexCapabilities.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/RegexQuery.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/RegexQuery.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/RegexQueryCapable.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/RegexQueryCapable.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/RegexTermEnum.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/RegexTermEnum.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/SpanRegexQuery.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/SpanRegexQuery.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucen= e/search/regex/package.html >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/searc= h/regex/package.html >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regex= p/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/ >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regex= p/RegexpTunnel.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/Regex= pTunnel.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regex= p/package.html >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/packa= ge.html >> >> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucen= e/search/regex/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/searc= h/regex/ >> >> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucen= e/search/regex/TestJakartaRegexpCapabilities.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/searc= h/regex/TestJakartaRegexpCapabilities.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucen= e/search/regex/TestRegexQuery.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/searc= h/regex/TestRegexQuery.java >> >> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucen= e/search/regex/TestSpanRegexQuery.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/searc= h/regex/TestSpanRegexQuery.java >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/analyzing/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/analyzing/ >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/analyzing/AnalyzingQueryParser.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/analyzing/AnalyzingQueryParser.java >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/analyzing/package.html >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/analyzing/package.html >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/complexPhrase/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/complexPhrase/ >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/complexPhrase/ComplexPhraseQueryParser.java >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/complexPhrase/package.html >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/complexPhrase/package.html >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/ext/ >> =A0 =A0 - copied from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/ext/ >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/ext/ExtendableQueryParser.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/ext/ExtendableQueryParser.java >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/ext/ExtensionQuery.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/ext/ExtensionQuery.java >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/ext/Extensions.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/ext/Extensions.java >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/ext/ParserExtension.java >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/ext/ParserExtension.java >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/ext/package.html >> =A0 =A0 - copied unchanged from r928243, >> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/q= ueryParser/ext/package.html >> >> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/l= ucene/queryParser/precedence/ >> =A0 =A0 - copied from > > --------------------------------------------------------------------- > 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