lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael McCandless <luc...@mikemccandless.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
Date Sat, 27 Mar 2010 20:31:24 GMT
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 <buschmic@gmail.com> wrote:
> Hey Uwe, I can update the flex branch to use parallel arrays after the
> weekend.
>
>  Michael
>
> 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=928246&view=rev
>> 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
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
>>   lucene/java/branches/flex_1458/contrib/ant/src/resources/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/ant/src/resources/
>>   lucene/java/branches/flex_1458/contrib/ant/src/resources/org/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/ant/src/resources/org/
>>   lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/
>>
>> lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/lucene/
>>     - 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/lucene/ant/
>>     - 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/lucene/ant/antlib.xml
>>     - 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.alg
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg
>>   lucene/java/branches/flex_1458/contrib/benchmark/conf/collector.alg
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg
>>
>> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
>>
>> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
>>   lucene/java/branches/flex_1458/contrib/queries/lib/
>>     - copied from r928243, lucene/dev/trunk/lucene/contrib/queries/lib/
>>
>> lucene/java/branches/flex_1458/contrib/queries/lib/jakarta-regexp-1.4.jar
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar
>>   lucene/java/branches/flex_1458/contrib/queries/lib/regexp.LICENSE
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/lib/regexp.LICENSE
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexCapabilities.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexCapabilities.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/package.html
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/package.html
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regexp/
>>     - 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/regexp/RegexpTunnel.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/RegexpTunnel.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regexp/package.html
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/package.html
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/TestJakartaRegexpCapabilities.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestJakartaRegexpCapabilities.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
>>
>> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/package.html
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/package.html
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/package.html
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/package.html
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/
>>     - copied from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/package.html
>>     - copied unchanged from r928243,
>> lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/package.html
>>
>> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/
>>     - 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


Mime
View raw message