lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r1210041 [1/4] - in /lucene/dev/branches/solrcloud: ./ dev-tools/eclipse/ dev-tools/idea/lucene/contrib/ dev-tools/maven/ dev-tools/maven/solr/core/ lucene/ lucene/contrib/ lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appendi...
Date Sun, 04 Dec 2011 01:14:58 GMT
Author: yonik
Date: Sun Dec  4 01:14:52 2011
New Revision: 1210041

URL: http://svn.apache.org/viewvc?rev=1210041&view=rev
Log:
merge up to r1210021

Added:
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesConsumer.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesConsumer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesFormat.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesProducer.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesProducer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosFormat.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosReader.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosWriter.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SegmentInfosFormat.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SegmentInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SegmentInfosReader.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SegmentInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SegmentInfosWriter.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SegmentInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SkipListReader.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SkipListReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SkipListWriter.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40SkipListWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsFormat.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsReader.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsWriter.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40TermVectorsFormat.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40TermVectorsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40TermVectorsReader.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40TermVectorsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40TermVectorsWriter.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40TermVectorsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java
    lucene/dev/branches/solrcloud/lucene/src/tools/javadoc/
      - copied from r1210021, lucene/dev/trunk/lucene/src/tools/javadoc/
    lucene/dev/branches/solrcloud/lucene/src/tools/javadoc/java6/
      - copied from r1210021, lucene/dev/trunk/lucene/src/tools/javadoc/java6/
    lucene/dev/branches/solrcloud/lucene/src/tools/javadoc/java6/package-list
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/tools/javadoc/java6/package-list
    lucene/dev/branches/solrcloud/lucene/src/tools/javadoc/junit/
      - copied from r1210021, lucene/dev/trunk/lucene/src/tools/javadoc/junit/
    lucene/dev/branches/solrcloud/lucene/src/tools/javadoc/junit/package-list
      - copied unchanged from r1210021, lucene/dev/trunk/lucene/src/tools/javadoc/junit/package-list
    lucene/dev/branches/solrcloud/modules/join/src/test/org/apache/lucene/search/join/
      - copied from r1210021, lucene/dev/trunk/modules/join/src/test/org/apache/lucene/search/join/
    lucene/dev/branches/solrcloud/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/BytesRefSorter.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/BytesRefSorter.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionBuilder.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionBuilder.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FloatMagic.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FloatMagic.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/InMemorySorter.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/InMemorySorter.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/Sort.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/Sort.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FloatMagicTest.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FloatMagicTest.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/LargeInputFST.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/LargeInputFST.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/TestSort.java
      - copied unchanged from r1210021, lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/TestSort.java
    lucene/dev/branches/solrcloud/solr/lib/apache-solr-noggit-r1209632.jar
      - copied unchanged from r1210021, lucene/dev/trunk/solr/lib/apache-solr-noggit-r1209632.jar
    lucene/dev/branches/solrcloud/solr/lib/commons-io-2.1.jar
      - copied unchanged from r1210021, lucene/dev/trunk/solr/lib/commons-io-2.1.jar
    lucene/dev/branches/solrcloud/solr/lib/commons-lang-2.6.jar
      - copied unchanged from r1210021, lucene/dev/trunk/solr/lib/commons-lang-2.6.jar
Removed:
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/DefaultSkipListReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/DefaultSkipListWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
    lucene/dev/branches/solrcloud/modules/join/src/test/org/apache/lucene/search/TestBlockJoin.java
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTLookupTest.java
    lucene/dev/branches/solrcloud/solr/lib/apache-solr-noggit-r1099557.jar
    lucene/dev/branches/solrcloud/solr/lib/commons-io-1.4.jar
    lucene/dev/branches/solrcloud/solr/lib/commons-lang-2.4.jar
Modified:
    lucene/dev/branches/solrcloud/   (props changed)
    lucene/dev/branches/solrcloud/.gitignore
    lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/   (props changed)
    lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template
    lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template
    lucene/dev/branches/solrcloud/lucene/   (props changed)
    lucene/dev/branches/solrcloud/lucene/CHANGES.txt
    lucene/dev/branches/solrcloud/lucene/build.xml
    lucene/dev/branches/solrcloud/lucene/common-build.xml
    lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
    lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java
    lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java   (props changed)
    lucene/dev/branches/solrcloud/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FieldInfos.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FlushPolicy.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFileNames.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexUpgrader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiDocsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiFields.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiNorms.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TieredMergePolicy.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xFields.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/SegmentTermDocs.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReaderIndex.java   (props changed)
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextTermVectorsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/PrefixTermsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherManager.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TermScorer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/BytesRef.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/InfoStream.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/PrintStreamInfoStream.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/StringHelper.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/fst/FST.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LuceneJUnitResultFormatter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/NullInfoStream.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSearcherManager.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
    lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
    lucene/dev/branches/solrcloud/modules/benchmark/   (props changed)
    lucene/dev/branches/solrcloud/modules/facet/   (props changed)
    lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java
    lucene/dev/branches/solrcloud/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
    lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
    lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java
    lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java   (props changed)
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java
    lucene/dev/branches/solrcloud/solr/   (props changed)
    lucene/dev/branches/solrcloud/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/solrcloud/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/solrcloud/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/solrcloud/solr/README.txt   (props changed)
    lucene/dev/branches/solrcloud/solr/build.xml   (contents, props changed)
    lucene/dev/branches/solrcloud/solr/client/   (props changed)
    lucene/dev/branches/solrcloud/solr/cloud-dev/   (props changed)
    lucene/dev/branches/solrcloud/solr/common-build.xml   (contents, props changed)
    lucene/dev/branches/solrcloud/solr/contrib/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/clustering/src/test-files/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler-extras/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/uima/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/uima/src/test-files/   (props changed)
    lucene/dev/branches/solrcloud/solr/core/   (props changed)
    lucene/dev/branches/solrcloud/solr/core/build.xml
    lucene/dev/branches/solrcloud/solr/core/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
    lucene/dev/branches/solrcloud/solr/core/src/test/   (props changed)
    lucene/dev/branches/solrcloud/solr/dev-tools/   (props changed)
    lucene/dev/branches/solrcloud/solr/example/   (props changed)
    lucene/dev/branches/solrcloud/solr/lib/   (props changed)
    lucene/dev/branches/solrcloud/solr/lib/apache-solr-noggit-pom.xml.template
    lucene/dev/branches/solrcloud/solr/scripts/   (props changed)
    lucene/dev/branches/solrcloud/solr/site/   (props changed)
    lucene/dev/branches/solrcloud/solr/site-src/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/solrj/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/common/   (props changed)
    lucene/dev/branches/solrcloud/solr/test-framework/   (props changed)
    lucene/dev/branches/solrcloud/solr/test-framework/build.xml
    lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
    lucene/dev/branches/solrcloud/solr/testlogging.properties   (props changed)
    lucene/dev/branches/solrcloud/solr/webapp/   (props changed)

Modified: lucene/dev/branches/solrcloud/.gitignore
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/.gitignore?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/.gitignore (original)
+++ lucene/dev/branches/solrcloud/.gitignore Sun Dec  4 01:14:52 2011
@@ -72,3 +72,8 @@ lucene-libs
 
 # /solr/client/ruby/flare/
 /solr/client/ruby/flare/tmp
+
+# output folders.
+bin.misc/
+bin.tests-framework/
+

Modified: lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath Sun Dec  4 01:14:52 2011
@@ -98,13 +98,13 @@
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
-	<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
+	<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1209632.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-codec-1.5.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-csv-1.0-SNAPSHOT-r966014.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="lib" path="solr/lib/commons-io-1.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/commons-lang-2.4.jar"/>
+	<classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
+	<classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
 	<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
 	<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
 	<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template Sun Dec  4 01:14:52 2011
@@ -158,7 +158,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>1.4</version>
+        <version>2.1</version>
       </dependency>
       <dependency>
         <groupId>commons-httpclient</groupId>
@@ -168,7 +168,7 @@
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.4</version>
+        <version>2.6</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
@@ -306,11 +306,6 @@
         <version>2.2</version>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.jdt</groupId>
-        <artifactId>core</artifactId>
-        <version>3.1.1</version>
-      </dependency>
-      <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
         <version>${patched.jetty.version}</version>
@@ -657,7 +652,7 @@
                   <artifactId>solr-noggit</artifactId>
                   <version>${project.version}</version>
                   <packaging>jar</packaging>
-                  <file>solr/lib/apache-solr-noggit-r1099557.jar</file>
+                  <file>solr/lib/apache-solr-noggit-r1209632.jar</file>
                 </configuration>  
               </execution>
               <execution>

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template Sun Dec  4 01:14:52 2011
@@ -113,10 +113,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>core</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>

Modified: lucene/dev/branches/solrcloud/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/CHANGES.txt?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/CHANGES.txt Sun Dec  4 01:14:52 2011
@@ -669,6 +669,34 @@ Bug fixes
   to correctly respect deletions on reopened SegmentReaders. Factored out
   FieldCacheDocIdSet to be a top-level class.  (Uwe Schindler, Simon Willnauer)
 
+Build
+
+* LUCENE-3228: Stop downloading external javadoc package-list files:
+
+  - Added package-list files for Oracle Java javadocs and JUnit javadocs to
+    Lucene/Solr subversion.
+
+  - The Oracle Java javadocs package-list file is excluded from Lucene and
+    Solr source release packages.
+
+  - Regardless of network connectivity, javadocs built from a subversion
+    checkout contain links to Oracle & JUnit javadocs.
+
+  - Building javadocs from a source release package will download the Oracle
+    Java package-list file if it isn't already present.
+
+  - When the Oracle Java package-list file is not present and download fails,
+    the javadocs targets will not fail the build, though an error will appear
+    in the build log.  In this case, the built javadocs will not contain links
+    to Oracle Java javadocs.
+
+  - Links from Solr javadocs to Lucene's javadocs are enabled. When building
+    a X.Y.Z-SNAPSHOT version, the links are to the most recently built nightly
+    Jenkins javadocs. When building a release version, links are to the
+    Lucene release javadocs for the same version.
+
+  (Steve Rowe, hossman)
+
 ======================= Lucene 3.5.0 =======================
 
 Changes in backwards compatibility policy

Modified: lucene/dev/branches/solrcloud/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/build.xml?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/build.xml Sun Dec  4 01:14:52 2011
@@ -249,6 +249,7 @@
         <sources>
           <!-- TODO: find a dynamic way to do include multiple source roots -->
           <packageset dir="src/java"/>
+          <packageset dir="src/test-framework/java"/>
 
           <!-- please keep this list up to date, and in alpha order...   -->
         
@@ -377,6 +378,10 @@
               value="${dist.dir}/lucene-${version}-src.tgz"/>
     <delete file="${source.package.file}"/>
     <svn-export-source source.dir="."/>
+
+    <!-- Exclude javadoc package-list files under licenses incompatible with the ASL -->
+    <delete dir="${svn.export.dir}/src/tools/javadoc/java6"/>
+
     <build-changes changes.src.dir="${svn.export.dir}/src/site/changes"
                    changes.target.dir="${svn.export.dir}/docs/changes"/>
     <tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
@@ -567,6 +572,8 @@
           title="${Name} ${version} Test Framework API">
         <sources>
           <packageset dir="src/test-framework/java"/>
+          <link offline="true" href="${javadoc.link.junit}"
+                packagelistLoc="${javadoc.packagelist.dir}/junit"/>
           <link href=""/>
         </sources>
       </invoke-javadoc>

Modified: lucene/dev/branches/solrcloud/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/common-build.xml?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/common-build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/common-build.xml Sun Dec  4 01:14:52 2011
@@ -110,6 +110,9 @@
   <property name="javac.includeAntRuntime" value="${run.clover}"/>
 
   <property name="javadoc.link" value="http://download.oracle.com/javase/6/docs/api/"/>
+  <property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
+  <property name="javadoc.packagelist.dir" value="${common.dir}/src/tools/javadoc"/>
+  <available file="${javadoc.packagelist.dir}/java6/package-list" property="javadoc.java6.packagelist.exists"/>
   <property name="javadoc.access" value="protected"/>
   <property name="javadoc.charset" value="utf-8"/>
   <property name="javadoc.dir" value="${common.dir}/build/docs/api"/>
@@ -843,6 +846,7 @@
   	<attribute name="title" default="${Name} ${version} API"/>
     <attribute name="overview" default="${src.dir}/overview.html"/>
     <sequential>
+      <antcall target="download-java6-javadoc-packagelist"/>
       <copy todir="@{destdir}" file="${prettify.dir}/prettify.js" overwrite="false" />
       <copy todir="@{destdir}" file="${prettify.dir}/prettify.css" overwrite="false" />
       <record name="@{destdir}/log_javadoc.txt" action="start" append="no"/>
@@ -859,7 +863,6 @@
           use="true"
           failonerror="true"
           source="${ant.java.version}"
-          link="${javadoc.link}"
           windowtitle="${Name} ${version} API"
           doctitle="@{title}"
           stylesheetfile="${prettify.dir}/stylesheet+prettify.css"
@@ -870,6 +873,7 @@
         <tag name="lucene.internal"
         description="NOTE: This API is for internal purposes only and might change in incompatible ways in the next release."/>
       	<link offline="true" packagelistLoc="${javadoc.dir}"/>
+        <link offline="true" href="${javadoc.link}" packagelistLoc="${javadoc.packagelist.dir}/java6"/>
         <header><![CDATA[
            <script src="{@docRoot}/prettify.js" type="text/javascript"></script>
            <script language="JavaScript">window.onload=function(){windowTitle();prettyPrint();}</script>
@@ -920,6 +924,12 @@
     </sequential>
   </macrodef>
 
+  <target name="download-java6-javadoc-packagelist" unless="javadoc.java6.packagelist.exists">
+    <mkdir dir="${javadoc.packagelist.dir}/java6"/>
+    <get src="${javadoc.link}/package-list"
+         dest="${javadoc.packagelist.dir}/java6/package-list" ignoreerrors="true"/>
+  </target>
+
   <!-- VALIDATION work -->
 
   <target name="check-legal-lucene" depends="compile-tools">

Modified: lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt Sun Dec  4 01:14:52 2011
@@ -83,8 +83,6 @@ Bug Fixes
 
 ======================= Lucene 3.6.0 ================
 
-(No Changes)
-
 Bug Fixes
 
  * LUCENE-3600: BlockJoinQuery now supports parent docs that have no
@@ -92,6 +90,15 @@ Bug Fixes
    assert if such a parent doc was the first doc in the segment).
    (Shay Banon, Mike McCandless)
 
+ * LUCENE-3609: Fix regression in BooleanFilter, introduced in Lucene 3.5,
+   to correctly handle minShouldMatch behaviour of previous versions.
+   (Shay Banon, Uwe Schindler)
+ 
+Documentation
+
+ * LUCENE-3599: Javadocs for DistanceUtils.haversine() were incorrectly 
+   stating the expected order of the arguments (David Smiley via hossman)
+
 ======================= Lucene 3.5.0 ================
 
 Changes in backwards compatibility policy
@@ -208,7 +215,7 @@ New Features
    added support for simple numeric queries, such as <age:4>, in contrib
    query parser (Vinicius Barros via Uwe Schindler)
 
-Changes in runtime behavior:
+Changes in runtime behavior
 
  * LUCENE-1768: StandardQueryConfigHandler now uses NumericFieldConfigListener
    to set a NumericConfig to its corresponding FieldConfig;

Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java Sun Dec  4 01:14:52 2011
@@ -18,10 +18,6 @@ package org.apache.lucene.index.codecs.a
  */
 
 import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.codecs.DefaultDocValuesFormat;
-import org.apache.lucene.index.codecs.DefaultFieldInfosFormat;
-import org.apache.lucene.index.codecs.DefaultStoredFieldsFormat;
-import org.apache.lucene.index.codecs.DefaultTermVectorsFormat;
 import org.apache.lucene.index.codecs.DocValuesFormat;
 import org.apache.lucene.index.codecs.FieldInfosFormat;
 import org.apache.lucene.index.codecs.StoredFieldsFormat;
@@ -29,6 +25,10 @@ import org.apache.lucene.index.codecs.Po
 import org.apache.lucene.index.codecs.SegmentInfosFormat;
 import org.apache.lucene.index.codecs.TermVectorsFormat;
 import org.apache.lucene.index.codecs.lucene40.Lucene40Codec;
+import org.apache.lucene.index.codecs.lucene40.Lucene40FieldInfosFormat;
+import org.apache.lucene.index.codecs.lucene40.Lucene40DocValuesFormat;
+import org.apache.lucene.index.codecs.lucene40.Lucene40StoredFieldsFormat;
+import org.apache.lucene.index.codecs.lucene40.Lucene40TermVectorsFormat;
 
 /**
  * This codec extends {@link Lucene40Codec} to work on append-only outputs, such
@@ -43,10 +43,10 @@ public class AppendingCodec extends Code
 
   private final PostingsFormat postings = new AppendingPostingsFormat();
   private final SegmentInfosFormat infos = new AppendingSegmentInfosFormat();
-  private final StoredFieldsFormat fields = new DefaultStoredFieldsFormat();
-  private final FieldInfosFormat fieldInfos = new DefaultFieldInfosFormat();
-  private final TermVectorsFormat vectors = new DefaultTermVectorsFormat();
-  private final DocValuesFormat docValues = new DefaultDocValuesFormat();
+  private final StoredFieldsFormat fields = new Lucene40StoredFieldsFormat();
+  private final FieldInfosFormat fieldInfos = new Lucene40FieldInfosFormat();
+  private final TermVectorsFormat vectors = new Lucene40TermVectorsFormat();
+  private final DocValuesFormat docValues = new Lucene40DocValuesFormat();
   
   @Override
   public PostingsFormat postingsFormat() {

Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java Sun Dec  4 01:14:52 2011
@@ -17,10 +17,10 @@ package org.apache.lucene.index.codecs.a
  * limitations under the License.
  */
 
-import org.apache.lucene.index.codecs.DefaultSegmentInfosFormat;
 import org.apache.lucene.index.codecs.SegmentInfosWriter;
+import org.apache.lucene.index.codecs.lucene40.Lucene40SegmentInfosFormat;
 
-public class AppendingSegmentInfosFormat extends DefaultSegmentInfosFormat {
+public class AppendingSegmentInfosFormat extends Lucene40SegmentInfosFormat {
   private final SegmentInfosWriter writer = new AppendingSegmentInfosWriter();
 
   @Override

Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java Sun Dec  4 01:14:52 2011
@@ -19,10 +19,10 @@ package org.apache.lucene.index.codecs.a
 
 import java.io.IOException;
 
-import org.apache.lucene.index.codecs.DefaultSegmentInfosWriter;
+import org.apache.lucene.index.codecs.lucene40.Lucene40SegmentInfosWriter;
 import org.apache.lucene.store.IndexOutput;
 
-public class AppendingSegmentInfosWriter extends DefaultSegmentInfosWriter {
+public class AppendingSegmentInfosWriter extends Lucene40SegmentInfosWriter {
 
   @Override
   public void prepareCommit(IndexOutput segmentOutput) throws IOException {

Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Sun Dec  4 01:14:52 2011
@@ -25,11 +25,15 @@ import org.apache.lucene.index.FieldsEnu
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.FieldReaderException;
 import org.apache.lucene.index.DocsEnum;
+import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.PriorityQueue;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.ReaderUtil;
+
 import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Comparator;
 
@@ -178,45 +182,34 @@ public class HighFreqTerms {
     return ts;
   }
   
-  public static long getTotalTermFreq(IndexReader reader, String field, BytesRef termText) throws Exception {
-
-    long totalTF = 0;
+  public static long getTotalTermFreq(IndexReader reader, final String field, final BytesRef termText) throws Exception {   
+    final long totalTF[] = new long[1];
     
-    Terms terms = MultiFields.getTerms(reader, field);
-    if (terms == null) {
-      return 0;
-    }
-
-    TermsEnum termsEnum = terms.iterator(null);
-    if (termsEnum.seekCeil(termText) != TermsEnum.SeekStatus.FOUND) {
-      return 0;
-    }
+    new ReaderUtil.Gather(reader) {
 
-    Bits liveDocs = MultiFields.getLiveDocs(reader);
-    if (liveDocs == null) {
-      // TODO: we could do this up front, during the scan
-      // (next()), instead of after-the-fact here w/ seek,
-      // if the codec supports it and there are no del
-      // docs...
-      final long totTF = termsEnum.totalTermFreq();
-      if (totTF != -1) {
-        return totTF;
+      @Override
+      protected void add(int base, IndexReader r) throws IOException {
+        Bits liveDocs = r.getLiveDocs();
+        if (liveDocs == null) {
+          // TODO: we could do this up front, during the scan
+          // (next()), instead of after-the-fact here w/ seek,
+          // if the codec supports it and there are no del
+          // docs...
+          final long totTF = r.totalTermFreq(field, termText);
+          if (totTF != -1) {
+            totalTF[0] += totTF;
+            return;
+          }
+        }
+        DocsEnum de = r.termDocsEnum(liveDocs, field, termText);
+        if (de != null) {
+          while (de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS)
+            totalTF[0] += de.freq();
+        }
       }
-    }
+    }.run();
     
-    DocsEnum de = termsEnum.docs(liveDocs, null);
-
-    // use DocsEnum.read() and BulkResult api
-    final DocsEnum.BulkReadResult bulkresult = de.getBulkResult();
-    int count;
-    while ((count = de.read()) != 0) {
-      final int[] freqs = bulkresult.freqs.ints;
-      final int limit = bulkresult.freqs.offset + count;
-      for(int i=bulkresult.freqs.offset;i<limit;i++) {
-        totalTF += freqs[i];
-      }
-    }
-    return totalTF;
+    return totalTF[0];
   }
   
   public static void fillQueue(TermsEnum termsEnum, TermStatsQueue tiq, String field) throws Exception {

Modified: lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java Sun Dec  4 01:14:52 2011
@@ -21,6 +21,7 @@ import org.apache.lucene.index.FilteredT
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.StringHelper;
 
 import java.io.IOException;
 
@@ -53,7 +54,7 @@ public class RegexTermsEnum extends Filt
 
   @Override
   protected AcceptStatus accept(BytesRef term) {
-    if (term.startsWith(prefixRef)) {
+    if (StringHelper.startsWith(term, prefixRef)) {
       // TODO: set BoostAttr based on distance of
       // searchTerm.text() and term().text()
       return regexImpl.match(term) ? AcceptStatus.YES : AcceptStatus.NO;

Modified: lucene/dev/branches/solrcloud/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java Sun Dec  4 01:14:52 2011
@@ -312,15 +312,15 @@ public class DistanceUtils {
   }
 
   /**
-   * @param x1     The x coordinate of the first point, in radians
+   * Computes the haversine distance between two points. The arguments are in radians and provided in lat,lon order.
    * @param y1     The y coordinate of the first point, in radians
-   * @param x2     The x coordinate of the second point, in radians
+   * @param x1     The x coordinate of the first point, in radians
    * @param y2     The y coordinate of the second point, in radians
+   * @param x2     The x coordinate of the second point, in radians
    * @param radius The radius of the sphere
-   * @return The distance between the two points, as determined by the Haversine formula.
-
+   * @return The distance between the two points, as determined by the haversine formula.
    */
-  public static double haversine(double x1, double y1, double x2, double y2, double radius) {
+  public static double haversine(double y1, double x1, double y2, double x2, double radius) {
     double result = 0;
     //make sure they aren't all the same, as then we can just return 0
     if ((x1 != x2) || (y1 != y2)) {
@@ -328,8 +328,8 @@ public class DistanceUtils {
       double diffY = y1 - y2;
       double hsinX = Math.sin(diffX * 0.5);
       double hsinY = Math.sin(diffY * 0.5);
-      double h = hsinX * hsinX +
-              (Math.cos(x1) * Math.cos(x2) * hsinY * hsinY);
+      double h = hsinY * hsinY +
+          (Math.cos(y1) * Math.cos(y2) * hsinX * hsinX);
       result = (radius * 2 * Math.atan2(Math.sqrt(h), Math.sqrt(1 - h)));
     }
     return result;

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java Sun Dec  4 01:14:52 2011
@@ -22,6 +22,7 @@ import java.util.Comparator;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;
+import org.apache.lucene.util.StringHelper;
 import org.apache.lucene.util.automaton.ByteRunAutomaton;
 import org.apache.lucene.util.automaton.CompiledAutomaton;
 import org.apache.lucene.util.automaton.Transition;
@@ -94,7 +95,7 @@ class AutomatonTermsEnum extends Filtere
    */
   @Override
   protected AcceptStatus accept(final BytesRef term) {
-    if (commonSuffixRef == null || term.endsWith(commonSuffixRef)) {
+    if (commonSuffixRef == null || StringHelper.endsWith(term, commonSuffixRef)) {
       if (runAutomaton.run(term.bytes, term.offset, term.length))
         return linear ? AcceptStatus.YES : AcceptStatus.YES_AND_SEEK;
       else

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java Sun Dec  4 01:14:52 2011
@@ -88,7 +88,7 @@ class BufferedDeletesStream {
     deletes.add(packet);
     numTerms.addAndGet(packet.numTermDeletes);
     bytesUsed.addAndGet(packet.bytesUsed);
-    if (infoStream != null) {
+    if (infoStream.isEnabled("BD")) {
       infoStream.message("BD", "push deletes " + packet + " delGen=" + packet.delGen() + " packetCount=" + deletes.size() + " totBytesUsed=" + bytesUsed.get());
     }
     assert checkDeleteStats();
@@ -159,13 +159,13 @@ class BufferedDeletesStream {
     assert checkDeleteStats();
 
     if (!any()) {
-      if (infoStream != null) {
+      if (infoStream.isEnabled("BD")) {
         infoStream.message("BD", "applyDeletes: no deletes; skipping");
       }
       return new ApplyDeletesResult(false, nextGen++, null);
     }
 
-    if (infoStream != null) {
+    if (infoStream.isEnabled("BD")) {
       infoStream.message("BD", "applyDeletes: infos=" + infos + " packetCount=" + deletes.size());
     }
 
@@ -237,7 +237,7 @@ class BufferedDeletesStream {
           allDeleted.add(info);
         }
 
-        if (infoStream != null) {
+        if (infoStream.isEnabled("BD")) {
           infoStream.message("BD", "seg=" + info + " segGen=" + segGen + " segDeletes=[" + packet + "]; coalesced deletes=[" + (coalescedDeletes == null ? "null" : coalescedDeletes) + "] delCount=" + delCount + (segAllDeletes ? " 100% deleted" : ""));
         }
 
@@ -279,7 +279,7 @@ class BufferedDeletesStream {
             allDeleted.add(info);
           }
 
-          if (infoStream != null) {
+          if (infoStream.isEnabled("BD")) {
             infoStream.message("BD", "seg=" + info + " segGen=" + segGen + " coalesced deletes=[" + (coalescedDeletes == null ? "null" : coalescedDeletes) + "] delCount=" + delCount + (segAllDeletes ? " 100% deleted" : ""));
           }
         }
@@ -290,7 +290,7 @@ class BufferedDeletesStream {
     }
 
     assert checkDeleteStats();
-    if (infoStream != null) {
+    if (infoStream.isEnabled("BD")) {
       infoStream.message("BD", "applyDeletes took " + (System.currentTimeMillis()-t0) + " msec");
     }
     // assert infos != segmentInfos || !any() : "infos=" + infos + " segmentInfos=" + segmentInfos + " any=" + any;
@@ -313,7 +313,7 @@ class BufferedDeletesStream {
       minGen = Math.min(info.getBufferedDeletesGen(), minGen);
     }
 
-    if (infoStream != null) {
+    if (infoStream.isEnabled("BD")) {
       infoStream.message("BD", "prune sis=" + segmentInfos + " minGen=" + minGen + " packetCount=" + deletes.size());
     }
     final int limit = deletes.size();
@@ -333,7 +333,7 @@ class BufferedDeletesStream {
 
   private synchronized void prune(int count) {
     if (count > 0) {
-      if (infoStream != null) {
+      if (infoStream.isEnabled("BD")) {
         infoStream.message("BD", "pruneDeletes: prune " + count + " packets; " + (deletes.size() - count) + " packets remain");
       }
       for(int delIDX=0;delIDX<count;delIDX++) {

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java Sun Dec  4 01:14:52 2011
@@ -26,7 +26,6 @@ import org.apache.lucene.store.IOContext
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.codecs.DefaultSegmentInfosWriter;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -401,20 +400,20 @@ public class CheckIndex {
     String sFormat = "";
     boolean skip = false;
 
-    if (format == DefaultSegmentInfosWriter.FORMAT_DIAGNOSTICS) {
+    if (format == SegmentInfos.FORMAT_DIAGNOSTICS) {
       sFormat = "FORMAT_DIAGNOSTICS [Lucene 2.9]";
-    } else if (format == DefaultSegmentInfosWriter.FORMAT_HAS_VECTORS) {
+    } else if (format == SegmentInfos.FORMAT_HAS_VECTORS) {
       sFormat = "FORMAT_HAS_VECTORS [Lucene 3.1]";
-    } else if (format == DefaultSegmentInfosWriter.FORMAT_3_1) {
+    } else if (format == SegmentInfos.FORMAT_3_1) {
       sFormat = "FORMAT_3_1 [Lucene 3.1+]";
-    } else if (format == DefaultSegmentInfosWriter.FORMAT_4_0) {
+    } else if (format == SegmentInfos.FORMAT_4_0) {
       sFormat = "FORMAT_4_0 [Lucene 4.0]";
-    } else if (format == DefaultSegmentInfosWriter.FORMAT_CURRENT) {
+    } else if (format == SegmentInfos.FORMAT_CURRENT) {
       throw new RuntimeException("BUG: You should update this tool!");
-    } else if (format < DefaultSegmentInfosWriter.FORMAT_CURRENT) {
+    } else if (format < SegmentInfos.FORMAT_CURRENT) {
       sFormat = "int=" + format + " [newer version of Lucene than this tool supports]";
       skip = true;
-    } else if (format > DefaultSegmentInfosWriter.FORMAT_MINIMUM) {
+    } else if (format > SegmentInfos.FORMAT_MINIMUM) {
       sFormat = "int=" + format + " [older version of Lucene than this tool supports]";
       skip = true;
     }

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Sun Dec  4 01:14:52 2011
@@ -218,7 +218,7 @@ public class ConcurrentMergeScheduler ex
    * </pre>
    */
   protected boolean verbose() {
-    return writer != null && writer.verbose();
+    return writer != null && writer.infoStream.isEnabled("CMS");
   }
   
   /**
@@ -226,10 +226,7 @@ public class ConcurrentMergeScheduler ex
    * called and returned true.
    */
   protected void message(String message) {
-    final InfoStream infoStream = writer.infoStream;
-    if (infoStream != null) {
-      infoStream.message("CMS", message);
-    }
+    writer.infoStream.message("CMS", message);
   }
 
   private synchronized void initMergeThreadPriority() {

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DirectoryReader.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DirectoryReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DirectoryReader.java Sun Dec  4 01:14:52 2011
@@ -36,6 +36,7 @@ import org.apache.lucene.store.LockObtai
 import org.apache.lucene.index.codecs.PerDocValues;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.InfoStream;
 import org.apache.lucene.util.MapBackedSet;
 
 /** 
@@ -685,9 +686,10 @@ class DirectoryReader extends IndexReade
       segmentInfos.setUserData(commitUserData);
       // Default deleter (for backwards compatibility) is
       // KeepOnlyLastCommitDeleter:
+      // nocommit: Decide what to do with InfoStream here? Use default or keep NO_OUTPUT?
       IndexFileDeleter deleter = new IndexFileDeleter(directory,
                                                       deletionPolicy == null ? new KeepOnlyLastCommitDeletionPolicy() : deletionPolicy,
-                                                      segmentInfos, null, null);
+                                                      segmentInfos, InfoStream.NO_OUTPUT, null);
       segmentInfos.updateGeneration(deleter.getLastSegmentInfos());
       segmentInfos.changed();
 

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java Sun Dec  4 01:14:52 2011
@@ -17,9 +17,11 @@
 
 package org.apache.lucene.index;
 
+import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.PagedBytes;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.StringHelper;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -278,7 +280,7 @@ public class DocTermOrds {
     // seek above):
     for (;;) {
       final BytesRef t = te.term();
-      if (t == null || (termPrefix != null && !t.startsWith(termPrefix))) {
+      if (t == null || (termPrefix != null && !StringHelper.startsWith(t, termPrefix))) {
         break;
       }
       //System.out.println("visit term=" + t.utf8ToString() + " " + t + " termNum=" + termNum);
@@ -314,90 +316,85 @@ public class DocTermOrds {
 
         docsEnum = te.docs(liveDocs, docsEnum);
 
-        final DocsEnum.BulkReadResult bulkResult = docsEnum.getBulkResult();
-
         // dF, but takes deletions into account
         int actualDF = 0;
 
         for (;;) {
-          int chunk = docsEnum.read();
-          if (chunk <= 0) {
+          int doc = docsEnum.nextDoc();
+          if (doc == DocIdSetIterator.NO_MORE_DOCS) {
             break;
           }
           //System.out.println("  chunk=" + chunk + " docs");
 
-          actualDF += chunk;
+          actualDF ++;
+          termInstances++;
+          
+          //System.out.println("    docID=" + doc);
+          // add TNUM_OFFSET to the term number to make room for special reserved values:
+          // 0 (end term) and 1 (index into byte array follows)
+          int delta = termNum - lastTerm[doc] + TNUM_OFFSET;
+          lastTerm[doc] = termNum;
+          int val = index[doc];
+
+          if ((val & 0xff)==1) {
+            // index into byte array (actually the end of
+            // the doc-specific byte[] when building)
+            int pos = val >>> 8;
+            int ilen = vIntSize(delta);
+            byte[] arr = bytes[doc];
+            int newend = pos+ilen;
+            if (newend > arr.length) {
+              // We avoid a doubling strategy to lower memory usage.
+              // this faceting method isn't for docs with many terms.
+              // In hotspot, objects have 2 words of overhead, then fields, rounded up to a 64-bit boundary.
+              // TODO: figure out what array lengths we can round up to w/o actually using more memory
+              // (how much space does a byte[] take up?  Is data preceded by a 32 bit length only?
+              // It should be safe to round up to the nearest 32 bits in any case.
+              int newLen = (newend + 3) & 0xfffffffc;  // 4 byte alignment
+              byte[] newarr = new byte[newLen];
+              System.arraycopy(arr, 0, newarr, 0, pos);
+              arr = newarr;
+              bytes[doc] = newarr;
+            }
+            pos = writeInt(delta, arr, pos);
+            index[doc] = (pos<<8) | 1;  // update pointer to end index in byte[]
+          } else {
+            // OK, this int has data in it... find the end (a zero starting byte - not
+            // part of another number, hence not following a byte with the high bit set).
+            int ipos;
+            if (val==0) {
+              ipos=0;
+            } else if ((val & 0x0000ff80)==0) {
+              ipos=1;
+            } else if ((val & 0x00ff8000)==0) {
+              ipos=2;
+            } else if ((val & 0xff800000)==0) {
+              ipos=3;
+            } else {
+              ipos=4;
+            }
 
-          for (int i=0; i<chunk; i++) {
-            termInstances++;
-            int doc = bulkResult.docs.ints[i];
-            //System.out.println("    docID=" + doc);
-            // add TNUM_OFFSET to the term number to make room for special reserved values:
-            // 0 (end term) and 1 (index into byte array follows)
-            int delta = termNum - lastTerm[doc] + TNUM_OFFSET;
-            lastTerm[doc] = termNum;
-            int val = index[doc];
+            //System.out.println("      ipos=" + ipos);
 
-            if ((val & 0xff)==1) {
-              // index into byte array (actually the end of
-              // the doc-specific byte[] when building)
-              int pos = val >>> 8;
-              int ilen = vIntSize(delta);
-              byte[] arr = bytes[doc];
-              int newend = pos+ilen;
-              if (newend > arr.length) {
-                // We avoid a doubling strategy to lower memory usage.
-                // this faceting method isn't for docs with many terms.
-                // In hotspot, objects have 2 words of overhead, then fields, rounded up to a 64-bit boundary.
-                // TODO: figure out what array lengths we can round up to w/o actually using more memory
-                // (how much space does a byte[] take up?  Is data preceded by a 32 bit length only?
-                // It should be safe to round up to the nearest 32 bits in any case.
-                int newLen = (newend + 3) & 0xfffffffc;  // 4 byte alignment
-                byte[] newarr = new byte[newLen];
-                System.arraycopy(arr, 0, newarr, 0, pos);
-                arr = newarr;
-                bytes[doc] = newarr;
+            int endPos = writeInt(delta, tempArr, ipos);
+            //System.out.println("      endpos=" + endPos);
+            if (endPos <= 4) {
+              //System.out.println("      fits!");
+              // value will fit in the integer... move bytes back
+              for (int j=ipos; j<endPos; j++) {
+                val |= (tempArr[j] & 0xff) << (j<<3);
               }
-              pos = writeInt(delta, arr, pos);
-              index[doc] = (pos<<8) | 1;  // update pointer to end index in byte[]
+              index[doc] = val;
             } else {
-              // OK, this int has data in it... find the end (a zero starting byte - not
-              // part of another number, hence not following a byte with the high bit set).
-              int ipos;
-              if (val==0) {
-                ipos=0;
-              } else if ((val & 0x0000ff80)==0) {
-                ipos=1;
-              } else if ((val & 0x00ff8000)==0) {
-                ipos=2;
-              } else if ((val & 0xff800000)==0) {
-                ipos=3;
-              } else {
-                ipos=4;
-              }
-
-              //System.out.println("      ipos=" + ipos);
-
-              int endPos = writeInt(delta, tempArr, ipos);
-              //System.out.println("      endpos=" + endPos);
-              if (endPos <= 4) {
-                //System.out.println("      fits!");
-                // value will fit in the integer... move bytes back
-                for (int j=ipos; j<endPos; j++) {
-                  val |= (tempArr[j] & 0xff) << (j<<3);
-                }
-                index[doc] = val;
-              } else {
-                // value won't fit... move integer into byte[]
-                for (int j=0; j<ipos; j++) {
-                  tempArr[j] = (byte)val;
-                  val >>>=8;
-                }
-                // point at the end index in the byte[]
-                index[doc] = (endPos<<8) | 1;
-                bytes[doc] = tempArr;
-                tempArr = new byte[12];
+              // value won't fit... move integer into byte[]
+              for (int j=0; j<ipos; j++) {
+                tempArr[j] = (byte)val;
+                val >>>=8;
               }
+              // point at the end index in the byte[]
+              index[doc] = (endPos<<8) | 1;
+              bytes[doc] = tempArr;
+              tempArr = new byte[12];
             }
           }
         }
@@ -785,7 +782,7 @@ public class DocTermOrds {
     private BytesRef setTerm() throws IOException {
       term = termsEnum.term();
       //System.out.println("  setTerm() term=" + term.utf8ToString() + " vs prefix=" + (prefix == null ? "null" : prefix.utf8ToString()));
-      if (prefix != null && !term.startsWith(prefix)) {
+      if (prefix != null && !StringHelper.startsWith(term, prefix)) {
         term = null;
       }
       return term;

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java Sun Dec  4 01:14:52 2011
@@ -35,14 +35,4 @@ public abstract class DocsAndPositionsEn
   public abstract BytesRef getPayload() throws IOException;
 
   public abstract boolean hasPayload();
-
-  @Override
-  public final int read() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BulkReadResult getBulkResult() {
-    throw new UnsupportedOperationException();
-  }
 }

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsEnum.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocsEnum.java Sun Dec  4 01:14:52 2011
@@ -17,18 +17,12 @@ package org.apache.lucene.index;
  * limitations under the License.
  */
 
-import java.io.IOException;
-
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.AttributeSource;
-import org.apache.lucene.util.IntsRef;
 
 /** Iterates through the documents, term freq and positions.
  *  NOTE: you must first call {@link #nextDoc} before using
- *  any of the per-doc methods (this does not apply to the
- *  bulk read {@link #read} method).
- *
- *  @lucene.experimental */
+ *  any of the per-doc methods. */
 public abstract class DocsEnum extends DocIdSetIterator {
 
   private AttributeSource atts = null;
@@ -43,60 +37,4 @@ public abstract class DocsEnum extends D
     if (atts == null) atts = new AttributeSource();
     return atts;
   }
-
-  // TODO: maybe add bulk read only docIDs (for eventual
-  // match-only scoring)
-
-  public static class BulkReadResult {
-    public final IntsRef docs = new IntsRef();
-    public final IntsRef freqs = new IntsRef();
-  }
-
-  protected BulkReadResult bulkResult;
-
-  protected final void initBulkResult() {
-    if (bulkResult == null) {
-      bulkResult = new BulkReadResult();
-      bulkResult.docs.ints = new int[64];
-      bulkResult.freqs.ints = new int[64];
-    }
-  }
-
-  /** Call this once, up front, and hold a reference to the
-   *  returned bulk result.  When you call {@link #read}, it
-   *  fills the docs and freqs of this pre-shared bulk
-   *  result. */
-  public BulkReadResult getBulkResult() {
-    initBulkResult();
-    return bulkResult;
-  }
-  
-  /** Bulk read (docs and freqs).  After this is called,
-   *  {@link #docID()} and {@link #freq} are undefined.
-   *  This returns the count read, or 0 if the end is
-   *  reached.  The resulting docs and freqs are placed into
-   *  the pre-shard {@link BulkReadResult} instance returned
-   *  by {@link #getBulkResult}.  Note that the {@link
-   *  IntsRef} for docs and freqs will not have their length
-   *  set.
-   * 
-   *  <p>NOTE: the default impl simply delegates to {@link
-   *  #nextDoc}, but subclasses may do this more
-   *  efficiently. */
-  public int read() throws IOException {
-    int count = 0;
-    final int[] docs = bulkResult.docs.ints;
-    final int[] freqs = bulkResult.freqs.ints;
-    while(count < docs.length) {
-      final int doc = nextDoc();
-      if (doc != NO_MORE_DOCS) {
-        docs[count] = doc;
-        freqs[count] = freq();
-        count++;
-      } else {
-        break;
-      }
-    }
-    return count;
-  }
 }

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java Sun Dec  4 01:14:52 2011
@@ -216,9 +216,7 @@ final class DocumentsWriter {
     }
 
     try {
-      if (infoStream != null) {
-        infoStream.message("DW", "abort");
-      }
+      infoStream.message("DW", "abort");
 
       final Iterator<ThreadState> threadsIterator = perThreadPool.getActivePerThreadsIterator();
       while (threadsIterator.hasNext()) {
@@ -243,14 +241,14 @@ final class DocumentsWriter {
       }
       success = true;
     } finally {
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DW")) {
         infoStream.message("DW", "done abort; abortedFiles=" + abortedFiles + " success=" + success);
       }
     }
   }
 
   boolean anyChanges() {
-    if (infoStream != null) {
+    if (infoStream.isEnabled("DW")) {
       infoStream.message("DW", "anyChanges? numDocsInRam=" + numDocsInRAM.get()
           + " deletes=" + anyDeletions() + " hasTickets:"
           + ticketQueue.hasTickets() + " pendingChangesInFullFlush: "
@@ -289,7 +287,7 @@ final class DocumentsWriter {
     boolean maybeMerge = false;
     if (flushControl.anyStalledThreads() || flushControl.numQueuedFlushes() > 0) {
       // Help out flushing any queued DWPTs so we can un-stall:
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DW")) {
         infoStream.message("DW", "DocumentsWriter has queued dwpt; will hijack this thread to flush pending segment(s)");
       }
       do {
@@ -300,14 +298,14 @@ final class DocumentsWriter {
           maybeMerge |= doFlush(flushingDWPT);
         }
   
-        if (infoStream != null && flushControl.anyStalledThreads()) {
+        if (infoStream.isEnabled("DW") && flushControl.anyStalledThreads()) {
           infoStream.message("DW", "WARNING DocumentsWriter has stalled threads; waiting");
         }
         
         flushControl.waitIfStalled(); // block if stalled
       } while (flushControl.numQueuedFlushes() != 0); // still queued DWPTs try help flushing
 
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DW")) {
         infoStream.message("DW", "continue indexing after helping out flushing DocumentsWriter is healthy");
       }
     }
@@ -466,7 +464,7 @@ final class DocumentsWriter {
     final double ramBufferSizeMB = indexWriter.getConfig().getRAMBufferSizeMB();
     if (ramBufferSizeMB != IndexWriterConfig.DISABLE_AUTO_FLUSH &&
         flushControl.getDeleteBytesUsed() > (1024*1024*ramBufferSizeMB/2)) {
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DW")) {
         infoStream.message("DW", "force apply deletes bytesUsed=" + flushControl.getDeleteBytesUsed() + " vs ramBuffer=" + (1024*1024*ramBufferSizeMB));
       }
       applyAllDeletes(deleteQueue);
@@ -500,7 +498,7 @@ final class DocumentsWriter {
       assert bufferedDeletes != null;
       if (bufferedDeletes != null && bufferedDeletes.any()) {
         indexWriter.publishFrozenDeletes(bufferedDeletes);
-        if (infoStream != null) {
+        if (infoStream.isEnabled("DW")) {
           infoStream.message("DW", "flush: push buffered deletes: " + bufferedDeletes);
         }
       }
@@ -527,14 +525,14 @@ final class DocumentsWriter {
     assert newSegment != null;
     final SegmentInfo segInfo = indexWriter.prepareFlushedSegment(newSegment);
     final BufferedDeletes deletes = newSegment.segmentDeletes;
-    if (infoStream != null) {
+    if (infoStream.isEnabled("DW")) {
       infoStream.message("DW", Thread.currentThread().getName() + ": publishFlushedSegment seg-private deletes=" + deletes);  
     }
     FrozenBufferedDeletes packet = null;
     if (deletes != null && deletes.any()) {
       // Segment private delete
       packet = new FrozenBufferedDeletes(deletes, true);
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DW")) {
         infoStream.message("DW", "flush: push buffered seg private deletes: " + packet);
       }
     }
@@ -560,7 +558,7 @@ final class DocumentsWriter {
   final boolean flushAllThreads()
     throws IOException {
     final DocumentsWriterDeleteQueue flushingDeleteQueue;
-    if (infoStream != null) {
+    if (infoStream.isEnabled("DW")) {
       infoStream.message("DW", Thread.currentThread().getName() + " startFullFlush");
     }
     
@@ -586,7 +584,7 @@ final class DocumentsWriter {
       // If a concurrent flush is still in flight wait for it
       flushControl.waitForFlush();  
       if (!anythingFlushed && flushingDeleteQueue.anyChanges()) { // apply deletes if we did not flush any document
-        if (infoStream != null) {
+        if (infoStream.isEnabled("DW")) {
           infoStream.message("DW", Thread.currentThread().getName() + ": flush naked frozen global deletes");
         }
         synchronized (ticketQueue) {
@@ -604,7 +602,7 @@ final class DocumentsWriter {
   
   final void finishFullFlush(boolean success) {
     try {
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DW")) {
         infoStream.message("DW", Thread.currentThread().getName() + " finishFullFlush success=" + success);
       }
       assert setFlushingDeleteQueue(null);

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java Sun Dec  4 01:14:52 2011
@@ -453,7 +453,7 @@ public final class DocumentsWriterFlushC
   private final List<DocumentsWriterPerThread> fullFlushBuffer = new ArrayList<DocumentsWriterPerThread>();
 
   void addFlushableState(ThreadState perThread) {
-    if (documentsWriter.infoStream != null) {
+    if (documentsWriter.infoStream.isEnabled("DWFC")) {
       documentsWriter.infoStream.message("DWFC", Thread.currentThread().getName() + ": addFlushableState " + perThread.perThread);
     }
     final DocumentsWriterPerThread dwpt = perThread.perThread;

Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1210041&r1=1210040&r2=1210041&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Sun Dec  4 01:14:52 2011
@@ -131,9 +131,7 @@ public class DocumentsWriterPerThread {
   void abort() throws IOException {
     hasAborted = aborting = true;
     try {
-      if (infoStream != null) {
-        infoStream.message("DWPT", "now abort");
-      }
+      infoStream.message("DWPT", "now abort");
       try {
         consumer.abort();
       } catch (Throwable t) {
@@ -146,9 +144,7 @@ public class DocumentsWriterPerThread {
 
     } finally {
       aborting = false;
-      if (infoStream != null) {
-        infoStream.message("DWPT", "done abort");
-      }
+      infoStream.message("DWPT", "done abort");
     }
   }
   private final static boolean INFO_VERBOSE = false;
@@ -226,12 +222,12 @@ public class DocumentsWriterPerThread {
       // this call is synchronized on IndexWriter.segmentInfos
       segment = writer.newSegmentName();
       assert numDocsInRAM == 0;
-      if (INFO_VERBOSE && infoStream != null) {
+      if (INFO_VERBOSE && infoStream.isEnabled("DWPT")) {
         infoStream.message("DWPT", Thread.currentThread().getName() + " init seg=" + segment + " delQueue=" + deleteQueue);  
       }
       
     }
-    if (INFO_VERBOSE && infoStream != null) {
+    if (INFO_VERBOSE && infoStream.isEnabled("DWPT")) {
       infoStream.message("DWPT", Thread.currentThread().getName() + " update delTerm=" + delTerm + " docID=" + docState.docID + " seg=" + segment);
     }
     boolean success = false;
@@ -274,11 +270,11 @@ public class DocumentsWriterPerThread {
       // this call is synchronized on IndexWriter.segmentInfos
       segment = writer.newSegmentName();
       assert numDocsInRAM == 0;
-      if (INFO_VERBOSE && infoStream != null) {
+      if (INFO_VERBOSE && infoStream.isEnabled("DWPT")) {
         infoStream.message("DWPT", Thread.currentThread().getName() + " init seg=" + segment + " delQueue=" + deleteQueue);  
       }
     }
-    if (INFO_VERBOSE && infoStream != null) {
+    if (INFO_VERBOSE && infoStream.isEnabled("DWPT")) {
       infoStream.message("DWPT", Thread.currentThread().getName() + " update delTerm=" + delTerm + " docID=" + docState.docID + " seg=" + segment);
     }
     int docCount = 0;
@@ -459,12 +455,12 @@ public class DocumentsWriterPerThread {
       pendingDeletes.docIDs.clear();
     }
 
-    if (infoStream != null) {
+    if (infoStream.isEnabled("DWPT")) {
       infoStream.message("DWPT", "flush postings as segment " + flushState.segmentName + " numDocs=" + numDocsInRAM);
     }
 
     if (aborting) {
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DWPT")) {
         infoStream.message("DWPT", "flush: skip because aborting is set");
       }
       return null;
@@ -476,7 +472,7 @@ public class DocumentsWriterPerThread {
       consumer.flush(flushState);
       pendingDeletes.terms.clear();
       final SegmentInfo newSegment = new SegmentInfo(segment, flushState.numDocs, directory, false, flushState.codec, fieldInfos.asReadOnly());
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DWPT")) {
         infoStream.message("DWPT", "new segment has " + (flushState.liveDocs == null ? 0 : (flushState.numDocs - flushState.liveDocs.count())) + " deleted docs");
         infoStream.message("DWPT", "new segment has " + (newSegment.getHasVectors() ? "vectors" : "no vectors"));
         infoStream.message("DWPT", "flushedFiles=" + newSegment.files());
@@ -493,7 +489,7 @@ public class DocumentsWriterPerThread {
         pendingDeletes = new BufferedDeletes();
       }
 
-      if (infoStream != null) {
+      if (infoStream.isEnabled("DWPT")) {
         final double newSegmentSizeNoStore = newSegment.sizeInBytes(false)/1024./1024.;
         final double newSegmentSize = newSegment.sizeInBytes(true)/1024./1024.;
         infoStream.message("DWPT", "flushed: segment=" + newSegment + 



Mime
View raw message