You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/03/12 01:27:31 UTC

[50/50] [abbrv] lucene-solr git commit: SOLR-445: Merge remote-tracking branch 'origin' into jira/SOLR-445

SOLR-445: Merge remote-tracking branch 'origin' into jira/SOLR-445


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d3e0bdd4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d3e0bdd4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d3e0bdd4

Branch: refs/heads/jira/SOLR-445
Commit: d3e0bdd4a72389609f7260faff3321470fc0ccd5
Parents: 0bd817d 007d41c
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Mar 11 15:18:41 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Mar 11 15:18:41 2016 -0700

----------------------------------------------------------------------
 dev-tools/scripts/smokeTestRelease.py           |   3 +-
 lucene/CHANGES.txt                              |   5 +
 .../lucene50/TestLucene50DocValuesFormat.java   |   2 +-
 .../index/TestBackwardsCompatibility.java       |   2 +-
 .../classification/ClassificationTestBase.java  |   7 +-
 .../DocumentClassificationTestBase.java         |   4 +-
 .../classification/utils/DataSplitterTest.java  |   5 +-
 .../org/apache/lucene/codecs/PointsWriter.java  |   6 +
 .../lucene54/Lucene54DocValuesConsumer.java     |  21 +-
 .../org/apache/lucene/document/DoublePoint.java |  16 +
 .../org/apache/lucene/document/FloatPoint.java  |  16 +
 .../org/apache/lucene/document/IntPoint.java    |  16 +
 .../org/apache/lucene/document/LongPoint.java   |  16 +
 .../org/apache/lucene/index/CheckIndex.java     |   7 +
 .../apache/lucene/index/CompositeReader.java    |   2 -
 .../org/apache/lucene/index/IndexReader.java    |   2 -
 .../org/apache/lucene/index/IndexWriter.java    |   1 +
 .../org/apache/lucene/index/MultiDocValues.java |   6 +-
 .../index/SingletonSortedSetDocValues.java      |   1 -
 .../index/SlowCompositeReaderWrapper.java       | 271 --------
 .../lucene/search/LegacyNumericRangeQuery.java  |  12 +-
 .../apache/lucene/search/PointInSetQuery.java   |  10 +-
 .../apache/lucene/search/PointRangeQuery.java   |  38 +-
 .../org/apache/lucene/util/bkd/BKDWriter.java   |   7 +-
 .../lucene/util/bkd/OfflinePointReader.java     |   3 +-
 .../lucene/util/bkd/OfflinePointWriter.java     |   3 -
 .../lucene54/TestLucene54DocValuesFormat.java   |   6 +-
 .../org/apache/lucene/index/Test2BPoints.java   | 164 +++++
 .../index/TestAllFilesCheckIndexHeader.java     |   8 +-
 .../index/TestAllFilesDetectTruncation.java     |   4 +-
 .../index/TestBinaryDocValuesUpdates.java       |  28 +-
 .../apache/lucene/index/TestCustomNorms.java    |   4 +-
 .../index/TestDemoParallelLeafReader.java       |  21 +-
 .../lucene/index/TestDirectoryReader.java       |   2 +-
 .../org/apache/lucene/index/TestDocValues.java  |  14 +-
 .../lucene/index/TestDocValuesIndexing.java     |  25 +-
 .../lucene/index/TestDocsAndPositions.java      |   4 +-
 .../apache/lucene/index/TestDocumentWriter.java |   2 +-
 .../apache/lucene/index/TestDuelingCodecs.java  |   4 +-
 .../index/TestExitableDirectoryReader.java      |  17 +-
 .../lucene/index/TestFilterLeafReader.java      |   8 +-
 .../test/org/apache/lucene/index/TestFlex.java  |   2 +-
 .../index/TestFlushByRamOrCountsPolicy.java     |   2 +-
 .../lucene/index/TestForceMergeForever.java     |   2 +-
 .../lucene/index/TestIndexReaderClose.java      |  52 +-
 .../apache/lucene/index/TestIndexWriter.java    |   6 +-
 .../lucene/index/TestLazyProxSkipping.java      |   2 +-
 .../apache/lucene/index/TestMultiDocValues.java |  16 +-
 .../lucene/index/TestMultiLevelSkipList.java    |   2 +-
 .../test/org/apache/lucene/index/TestNorms.java |   6 +-
 .../index/TestNumericDocValuesUpdates.java      |  30 +-
 .../org/apache/lucene/index/TestOmitNorms.java  |   8 +-
 .../apache/lucene/index/TestOmitPositions.java  |   2 +-
 .../org/apache/lucene/index/TestOmitTf.java     |   6 +-
 .../org/apache/lucene/index/TestOrdinalMap.java |   5 +-
 .../index/TestParallelCompositeReader.java      |  34 +-
 .../lucene/index/TestParallelLeafReader.java    |  28 +-
 .../index/TestParallelReaderEmptyIndex.java     |  22 +-
 .../lucene/index/TestParallelTermEnum.java      |   4 +-
 .../org/apache/lucene/index/TestPayloads.java   |  11 +-
 .../apache/lucene/index/TestPointValues.java    |  99 ++-
 .../lucene/index/TestPostingsOffsets.java       |   5 +-
 .../apache/lucene/index/TestReaderClosed.java   |   6 +-
 .../index/TestReaderWrapperDVTypeCheck.java     |   5 +-
 .../apache/lucene/index/TestRollingUpdates.java |   2 +-
 .../lucene/index/TestSegmentTermEnum.java       |   2 +-
 .../lucene/index/TestSortedSetDocValues.java    |  27 +
 .../apache/lucene/index/TestStressAdvance.java  |   2 +-
 .../lucene/index/TestSwappedIndexFiles.java     |   3 +-
 .../org/apache/lucene/index/TestTermsEnum.java  |   8 +-
 .../lucene/search/TestDisjunctionMaxQuery.java  |   6 +-
 .../lucene/search/TestMinShouldMatch2.java      |   2 +-
 .../lucene/search/TestMultiPhraseEnum.java      |   8 +-
 .../apache/lucene/search/TestPhraseQuery.java   |   4 +-
 .../apache/lucene/search/TestPointQueries.java  |  88 +++
 .../lucene/search/TestPositionIncrement.java    |  10 +-
 .../lucene/search/TestSimilarityProvider.java   |  11 +-
 .../apache/lucene/search/TestTermScorer.java    |   7 +-
 .../TestUsageTrackingFilterCachingPolicy.java   |  17 +-
 .../search/spans/TestFieldMaskingSpanQuery.java |  11 +-
 .../search/spans/TestNearSpansOrdered.java      |  29 +-
 .../lucene/search/spans/TestSpanCollection.java |   9 +-
 .../search/spans/TestSpanContainQuery.java      |   7 +-
 .../apache/lucene/search/spans/TestSpans.java   |  13 +-
 .../lucene/store/TestNRTCachingDirectory.java   |   2 +-
 .../org/apache/lucene/util/fst/TestFSTs.java    |   2 +-
 .../DefaultSortedSetDocValuesReaderState.java   |  55 +-
 .../facet/range/TestRangeFacetCounts.java       | 189 -----
 .../sortedset/TestSortedSetDocValuesFacets.java |  36 -
 .../lucene/search/grouping/TestGrouping.java    |  12 +-
 .../lucene/search/join/TestBlockJoin.java       |  25 +-
 .../apache/lucene/search/join/TestJoinUtil.java |   8 +-
 .../apache/lucene/index/memory/MemoryIndex.java |   6 +-
 .../memory/TestMemoryIndexAgainstRAMDir.java    |  12 +-
 .../index/SlowCompositeReaderWrapper.java       | 275 ++++++++
 .../apache/lucene/uninverting/FieldCache.java   | 113 ++-
 .../lucene/uninverting/FieldCacheImpl.java      | 164 ++++-
 .../lucene/uninverting/UninvertingReader.java   |  97 ++-
 .../index/TestSlowCompositeReaderWrapper.java   |  91 +++
 .../lucene/uninverting/TestDocTermOrds.java     |  14 +-
 .../lucene/uninverting/TestFieldCache.java      | 147 ++--
 .../uninverting/TestFieldCacheReopen.java       |  11 +-
 .../TestFieldCacheSanityChecker.java            |  10 +-
 .../lucene/uninverting/TestFieldCacheSort.java  | 684 +++++++++++++++++--
 .../uninverting/TestFieldCacheSortRandom.java   |   8 +-
 .../uninverting/TestFieldCacheVsDocValues.java  |   6 +-
 .../uninverting/TestFieldCacheWithThreads.java  |  13 +-
 .../uninverting/TestLegacyFieldCache.java       | 498 ++++++++++++++
 .../lucene/uninverting/TestNumericTerms32.java  |   6 +-
 .../lucene/uninverting/TestNumericTerms64.java  |   8 +-
 .../uninverting/TestUninvertingReader.java      |   6 +-
 .../lucene/queries/CommonTermsQueryTest.java    |   6 +-
 .../apache/lucene/queries/TermsQueryTest.java   |   4 +-
 .../function/TestSortedSetFieldSource.java      |   2 +-
 .../lucene/queries/payloads/PayloadHelper.java  |   3 +-
 .../queries/payloads/TestPayloadSpans.java      |  39 +-
 .../queries/payloads/TestPayloadTermQuery.java  |  11 +-
 .../flexible/core/nodes/package-info.java       |   4 +-
 .../flexible/standard/StandardQueryParser.java  |  29 +-
 .../LegacyNumericRangeQueryNodeBuilder.java     |  93 +++
 .../builders/NumericRangeQueryNodeBuilder.java  |  91 ---
 .../builders/PointRangeQueryNodeBuilder.java    | 137 ++++
 .../builders/StandardQueryTreeBuilder.java      |  12 +-
 .../standard/config/LegacyNumericConfig.java    | 166 +++++
 .../LegacyNumericFieldConfigListener.java       |  75 ++
 .../flexible/standard/config/NumericConfig.java | 164 -----
 .../config/NumericFieldConfigListener.java      |  73 --
 .../flexible/standard/config/PointsConfig.java  | 124 ++++
 .../standard/config/PointsConfigListener.java   |  65 ++
 .../config/StandardQueryConfigHandler.java      |  39 +-
 .../standard/nodes/LegacyNumericQueryNode.java  | 153 +++++
 .../nodes/LegacyNumericRangeQueryNode.java      | 153 +++++
 .../standard/nodes/NumericQueryNode.java        | 151 ----
 .../standard/nodes/NumericRangeQueryNode.java   | 151 ----
 .../flexible/standard/nodes/PointQueryNode.java | 151 ++++
 .../standard/nodes/PointRangeQueryNode.java     | 124 ++++
 .../LegacyNumericQueryNodeProcessor.java        | 154 +++++
 .../LegacyNumericRangeQueryNodeProcessor.java   | 170 +++++
 .../processors/NumericQueryNodeProcessor.java   | 152 -----
 .../NumericRangeQueryNodeProcessor.java         | 168 -----
 .../processors/PointQueryNodeProcessor.java     | 136 ++++
 .../PointRangeQueryNodeProcessor.java           | 148 ++++
 .../StandardQueryNodeProcessorPipeline.java     |   6 +-
 .../lucene/queryparser/xml/CoreParser.java      |   1 +
 .../LegacyNumericRangeQueryBuilder.java         |   2 +
 .../xml/builders/PointRangeQueryBuilder.java    |  95 +++
 .../standard/TestLegacyNumericQueryParser.java  | 535 +++++++++++++++
 .../standard/TestNumericQueryParser.java        | 535 ---------------
 .../flexible/standard/TestPointQueryParser.java |  82 +++
 .../lucene/queryparser/xml/PointRangeQuery.xml  |  31 +
 .../lucene/queryparser/xml/TestCoreParser.java  |   9 +-
 .../lucene/document/InetAddressPoint.java       |  23 +-
 .../lucene/document/TestBigIntegerPoint.java    |  15 +
 .../lucene/document/TestInetAddressPoint.java   |  21 +
 .../apache/lucene/document/TestLatLonPoint.java |  20 +
 .../apache/lucene/spatial/SpatialTestCase.java  |   4 +-
 .../spatial3d/PointInGeo3DShapeQuery.java       |   4 +-
 .../apache/lucene/spatial3d/TestGeo3DPoint.java |  14 +
 .../analyzing/TestFreeTextSuggester.java        |   2 +-
 .../index/BaseDocValuesFormatTestCase.java      |  64 +-
 .../index/BaseIndexFileFormatTestCase.java      |   6 +-
 .../lucene/index/BasePointsFormatTestCase.java  |   4 +-
 .../index/BasePostingsFormatTestCase.java       |  66 +-
 .../index/BaseStoredFieldsFormatTestCase.java   |   2 +-
 .../index/BaseTermVectorsFormatTestCase.java    |  12 +-
 .../ThreadedIndexingAndSearchingTestCase.java   |   4 +-
 .../org/apache/lucene/search/QueryUtils.java    |   6 +-
 .../lucene/search/ShardSearchingTestBase.java   |   2 +-
 .../lucene/search/spans/MultiSpansWrapper.java  |  51 --
 .../lucene/store/MockDirectoryWrapper.java      |   9 +-
 .../org/apache/lucene/util/LineFileDocs.java    |  58 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |  53 +-
 .../java/org/apache/lucene/util/TestUtil.java   |  14 +-
 .../lucene/analysis/TestMockAnalyzer.java       |   2 +-
 .../TestCompressingStoredFieldsFormat.java      |   5 +-
 .../TestCompressingTermVectorsFormat.java       |   8 +-
 .../lucene/index/TestAssertingLeafReader.java   |   5 +-
 lucene/tools/javadoc/ecj.javadocs.prefs         |   2 +-
 lucene/tools/junit4/cached-timehints.txt        |   2 +-
 solr/CHANGES.txt                                |  19 +
 .../cloud/OverseerCollectionMessageHandler.java |   1 +
 .../org/apache/solr/core/CoreContainer.java     |  15 +-
 .../src/java/org/apache/solr/core/SolrCore.java |  10 +-
 .../solr/handler/admin/ClusterStatus.java       |  16 +-
 .../solr/handler/admin/CollectionsHandler.java  | 103 ++-
 .../solr/handler/admin/LukeRequestHandler.java  |  12 +-
 .../java/org/apache/solr/schema/EnumField.java  |   2 +-
 .../java/org/apache/solr/schema/TrieField.java  |   8 +-
 .../org/apache/solr/update/SolrCoreState.java   |   8 +-
 .../org/apache/solr/update/VersionInfo.java     |   8 +-
 .../conf/schema-non-stored-docvalues.xml        | 131 ++--
 .../solr/cloud/CollectionsAPISolrJTest.java     |   2 +-
 .../org/apache/solr/cloud/DeleteStatusTest.java | 172 +++--
 .../apache/solr/cloud/SolrCloudExampleTest.java |   1 -
 .../apache/solr/cloud/TestCollectionAPI.java    |  19 +
 .../solr/schema/TestUseDocValuesAsStored.java   |  60 +-
 .../solr/client/solrj/io/sql/ResultSetImpl.java |   2 +-
 .../client/solrj/io/stream/DaemonStream.java    |   6 +-
 .../solrj/request/CollectionAdminRequest.java   | 568 +++++++++++++--
 .../client/solrj/request/CoreAdminRequest.java  |  23 +-
 .../solrj/util/SolrIdentifierValidator.java     |  28 +-
 .../apache/solr/common/cloud/ClusterState.java  |   4 +-
 .../common/params/CollectionAdminParams.java    |   2 +
 .../solr/client/solrj/io/sql/JdbcTest.java      |  15 +
 .../solrj/io/stream/StreamExpressionTest.java   |   8 +-
 .../request/TestCollectionAdminRequest.java     |   9 +-
 .../client/solrj/request/TestCoreAdmin.java     |  13 +-
 solr/webapp/web/css/angular/common.css          |  13 +-
 solr/webapp/web/css/styles/common.css           |  16 +-
 solr/webapp/web/index.html                      |   6 +-
 solr/webapp/web/old.html                        |   5 +-
 solr/webapp/web/partials/query.html             |  12 +-
 212 files changed, 6740 insertions(+), 3211 deletions(-)
----------------------------------------------------------------------