You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/09/07 09:57:38 UTC
[50/50] [abbrv] lucene-solr:apiv2: SOLR-8029: Merge remote-tracking
branch 'remotes/origin/master' into apiv2
SOLR-8029: Merge remote-tracking branch 'remotes/origin/master' into apiv2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b49d9027
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b49d9027
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b49d9027
Branch: refs/heads/apiv2
Commit: b49d9027b346e65853f6d1210f45d5c918760e70
Parents: 9241198 1a61fb6
Author: Noble Paul <no...@apache.org>
Authored: Wed Sep 7 15:26:10 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Sep 7 15:26:10 2016 +0530
----------------------------------------------------------------------
.../lucene/spatial-extras/spatial-extras.iml | 1 +
.../idea/solr/contrib/analytics/analytics.iml | 1 +
dev-tools/idea/solr/core/src/java/solr-core.iml | 1 +
.../idea/solr/core/src/solr-core-tests.iml | 1 +
dev-tools/scripts/addVersion.py | 6 +-
dev-tools/scripts/buildAndPushRelease.py | 2 +-
dev-tools/scripts/poll-mirrors.pl | 155 --
dev-tools/scripts/poll-mirrors.py | 153 ++
dev-tools/scripts/smokeTestRelease.py | 17 +-
lucene/CHANGES.txt | 44 +-
.../analysis/miscellaneous/TestTrimFilter.java | 46 +-
.../apache/lucene/analysis/ja/util/CSVUtil.java | 2 +-
.../apache/lucene/analysis/ja/TestCSVUtil.java | 52 +
.../lucene/codecs/lucene50/Lucene50Codec.java | 170 --
.../lucene50/Lucene50DocValuesConsumer.java | 658 ------
.../lucene50/Lucene50DocValuesFormat.java | 115 -
.../lucene50/Lucene50DocValuesProducer.java | 1299 ------------
.../codecs/lucene50/Lucene50NormsFormat.java | 62 -
.../codecs/lucene50/Lucene50NormsProducer.java | 481 -----
.../lucene50/Lucene50SegmentInfoFormat.java | 21 +-
.../lucene/codecs/lucene53/Lucene53Codec.java | 176 --
.../apache/lucene/codecs/lucene53/package.html | 25 -
.../lucene/codecs/lucene54/Lucene54Codec.java | 178 --
.../apache/lucene/codecs/lucene54/package.html | 25 -
.../apache/lucene/legacy/LegacyDoubleField.java | 174 ++
.../org/apache/lucene/legacy/LegacyField.java | 90 +
.../apache/lucene/legacy/LegacyFieldType.java | 149 ++
.../apache/lucene/legacy/LegacyFloatField.java | 174 ++
.../apache/lucene/legacy/LegacyIntField.java | 175 ++
.../apache/lucene/legacy/LegacyLongField.java | 184 ++
.../lucene/legacy/LegacyNumericRangeQuery.java | 537 +++++
.../lucene/legacy/LegacyNumericTokenStream.java | 357 ++++
.../apache/lucene/legacy/LegacyNumericType.java | 34 +
.../lucene/legacy/LegacyNumericUtils.java | 510 +++++
.../org/apache/lucene/legacy/package-info.java | 21 +
.../services/org.apache.lucene.codecs.Codec | 3 -
.../org.apache.lucene.codecs.DocValuesFormat | 1 -
.../codecs/lucene50/Lucene50NormsConsumer.java | 403 ----
.../lucene/codecs/lucene50/Lucene50RWCodec.java | 41 -
.../codecs/lucene50/Lucene50RWNormsFormat.java | 36 -
.../lucene50/Lucene50RWSegmentInfoFormat.java | 21 +-
.../lucene50/TestLucene50DocValuesFormat.java | 281 ---
.../lucene50/TestLucene50NormsFormat.java | 130 --
.../index/TestBackwardsCompatibility.java | 12 +-
.../org/apache/lucene/index/index.6.2.0-cfs.zip | Bin 0 -> 15880 bytes
.../apache/lucene/index/index.6.2.0-nocfs.zip | Bin 0 -> 15867 bytes
.../apache/lucene/legacy/TestLegacyField.java | 196 ++
.../lucene/legacy/TestLegacyFieldReuse.java | 81 +
.../lucene/legacy/TestLegacyNumericUtils.java | 571 +++++
.../apache/lucene/legacy/TestLegacyTerms.java | 164 ++
.../TestMultiValuedNumericRangeQuery.java | 84 +
.../lucene/legacy/TestNumericRangeQuery32.java | 461 ++++
.../lucene/legacy/TestNumericRangeQuery64.java | 490 +++++
.../lucene/legacy/TestNumericTokenStream.java | 188 ++
.../analysis/LegacyNumericTokenStream.java | 357 ----
.../org/apache/lucene/analysis/TokenStream.java | 7 +-
.../PackedTokenAttributeImpl.java | 11 +
.../PositionIncrementAttributeImpl.java | 5 +
.../lucene/codecs/MutablePointsReader.java | 6 +-
.../lucene50/Lucene50FieldInfosFormat.java | 12 +-
.../java/org/apache/lucene/document/Field.java | 39 +-
.../org/apache/lucene/document/FieldType.java | 98 +-
.../lucene/document/LegacyDoubleField.java | 172 --
.../lucene/document/LegacyFloatField.java | 174 --
.../apache/lucene/document/LegacyIntField.java | 174 --
.../apache/lucene/document/LegacyLongField.java | 182 --
.../java/org/apache/lucene/geo/Rectangle.java | 29 +
.../index/DocumentsWriterDeleteQueue.java | 16 +-
.../org/apache/lucene/index/IndexWriter.java | 18 -
.../org/apache/lucene/index/LogMergePolicy.java | 6 +-
.../apache/lucene/index/PointValuesWriter.java | 14 +-
.../org/apache/lucene/index/SegmentInfos.java | 24 +-
.../org/apache/lucene/search/BooleanQuery.java | 42 +
.../org/apache/lucene/search/LRUQueryCache.java | 1 +
.../lucene/search/LegacyNumericRangeQuery.java | 536 -----
.../org/apache/lucene/search/PrefixQuery.java | 5 +-
.../apache/lucene/store/ByteBufferGuard.java | 136 ++
.../lucene/store/ByteBufferIndexInput.java | 104 +-
.../java/org/apache/lucene/store/DataInput.java | 33 -
.../org/apache/lucene/store/DataOutput.java | 45 -
.../org/apache/lucene/store/MMapDirectory.java | 8 +-
.../org/apache/lucene/util/AttributeImpl.java | 11 +
.../org/apache/lucene/util/AttributeSource.java | 10 +
.../org/apache/lucene/util/ByteBlockPool.java | 21 +
.../apache/lucene/util/InPlaceMergeSorter.java | 4 +-
.../org/apache/lucene/util/IntroSelector.java | 2 +
.../org/apache/lucene/util/IntroSorter.java | 13 +-
.../apache/lucene/util/LegacyNumericUtils.java | 508 -----
.../org/apache/lucene/util/MSBRadixSorter.java | 109 +-
.../org/apache/lucene/util/RadixSelector.java | 94 +-
.../src/java/org/apache/lucene/util/Sorter.java | 59 +-
.../java/org/apache/lucene/util/Version.java | 7 +
.../apache/lucene/util/automaton/Automaton.java | 4 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 56 +-
.../util/bkd/MutablePointsReaderUtils.java | 19 +-
.../lucene/analysis/TestNumericTokenStream.java | 169 --
.../TestGrowableByteArrayDataOutput.java | 2 +-
.../org/apache/lucene/document/TestField.java | 94 -
.../apache/lucene/document/TestFieldType.java | 9 -
.../org/apache/lucene/geo/TestGeoUtils.java | 11 +-
.../org/apache/lucene/geo/TestPolygon2D.java | 9 +-
.../index/TestAllFilesCheckIndexHeader.java | 7 +-
.../org/apache/lucene/index/TestFieldReuse.java | 53 +-
.../apache/lucene/index/TestIndexSorting.java | 2 +-
.../index/TestIndexingSequenceNumbers.java | 4 +
.../test/org/apache/lucene/index/TestTerms.java | 134 --
.../org/apache/lucene/search/TestBoolean2.java | 13 +-
.../lucene/search/TestBooleanRewrites.java | 87 +
.../TestMultiValuedNumericRangeQuery.java | 80 -
.../lucene/search/TestNumericRangeQuery32.java | 589 ------
.../lucene/search/TestNumericRangeQuery64.java | 623 ------
.../lucene/search/TestSearcherManager.java | 142 ++
.../TestSimpleExplanationsWithFillerDocs.java | 2 +
.../apache/lucene/store/TestMmapDirectory.java | 38 +
.../apache/lucene/util/TestByteBlockPool.java | 25 +-
.../lucene/util/TestLegacyNumericUtils.java | 564 -----
.../apache/lucene/util/TestMSBRadixSorter.java | 68 +
.../apache/lucene/util/TestRadixSelector.java | 31 +-
.../util/bkd/TestMutablePointsReaderUtils.java | 49 +-
.../CustomSeparatorBreakIterator.java | 4 +-
.../postingshighlight/WholeBreakIterator.java | 4 +-
.../search/join/DocValuesTermsCollector.java | 83 -
.../org/apache/lucene/search/join/JoinUtil.java | 45 -
.../search/join/TermsIncludingScoreQuery.java | 9 -
.../apache/lucene/search/join/TestJoinUtil.java | 23 +-
.../memory/TestMemoryIndexAgainstRAMDir.java | 7 -
.../search/TestDiversifiedTopDocsCollector.java | 5 +-
.../lucene/queries/mlt/TestMoreLikeThis.java | 1 +
.../flexible/standard/StandardQueryParser.java | 19 -
.../LegacyNumericRangeQueryNodeBuilder.java | 93 -
.../builders/StandardQueryTreeBuilder.java | 4 -
.../standard/config/LegacyNumericConfig.java | 166 --
.../LegacyNumericFieldConfigListener.java | 75 -
.../config/StandardQueryConfigHandler.java | 29 +-
.../standard/nodes/LegacyNumericQueryNode.java | 153 --
.../nodes/LegacyNumericRangeQueryNode.java | 153 --
.../LegacyNumericQueryNodeProcessor.java | 154 --
.../LegacyNumericRangeQueryNodeProcessor.java | 170 --
.../StandardQueryNodeProcessorPipeline.java | 2 -
.../lucene/queryparser/xml/CoreParser.java | 1 -
.../LegacyNumericRangeQueryBuilder.java | 135 --
.../standard/TestLegacyNumericQueryParser.java | 535 -----
.../xml/CoreParserTestIndexData.java | 2 -
.../queryparser/xml/LegacyNumericRangeQuery.xml | 31 -
.../LegacyNumericRangeQueryWithoutLowerTerm.xml | 31 -
.../xml/LegacyNumericRangeQueryWithoutRange.xml | 31 -
.../LegacyNumericRangeQueryWithoutUpperTerm.xml | 31 -
.../lucene/queryparser/xml/TestCoreParser.java | 20 -
.../builders/TestNumericRangeQueryBuilder.java | 179 --
.../lucene/replicator/nrt/FileMetaData.java | 5 +
.../lucene/replicator/nrt/SimpleCopyJob.java | 2 +
.../apache/lucene/document/FloatRangeField.java | 262 +++
.../lucene/document/InetAddressPoint.java | 2 +-
.../apache/lucene/document/IntRangeField.java | 262 +++
.../apache/lucene/document/LongRangeField.java | 260 +++
.../search/BaseRangeFieldQueryTestCase.java | 238 +--
.../search/TestDoubleRangeFieldQueries.java | 154 +-
.../search/TestFloatRangeFieldQueries.java | 240 +++
.../lucene/search/TestIntRangeFieldQueries.java | 240 +++
.../search/TestLongRangeFieldQueries.java | 240 +++
lucene/spatial-extras/build.xml | 8 +-
.../lucene/spatial/bbox/BBoxStrategy.java | 39 +-
.../prefix/BytesRefIteratorTokenStream.java | 2 +-
.../spatial/vector/PointVectorStrategy.java | 37 +-
.../lucene/spatial/bbox/TestBBoxStrategy.java | 8 +-
.../apache/lucene/spatial3d/geom/Bounds.java | 7 +
.../spatial3d/geom/GeoConcavePolygon.java | 63 +-
.../lucene/spatial3d/geom/GeoConvexPolygon.java | 59 +-
.../lucene/spatial3d/geom/LatLonBounds.java | 5 +
.../org/apache/lucene/spatial3d/geom/Plane.java | 101 +-
.../apache/lucene/spatial3d/geom/XYZBounds.java | 11 +
.../lucene/spatial3d/geom/GeoBBoxTest.java | 15 +
.../lucene/spatial3d/geom/GeoCircleTest.java | 14 +
.../lucene/spatial3d/geom/GeoPolygonTest.java | 66 +-
.../lucene/store/BaseDirectoryTestCase.java | 30 -
.../lucene/store/MockDirectoryWrapper.java | 4 +-
.../lucene/store/MockIndexInputWrapper.java | 47 +-
.../store/SlowClosingMockIndexInputWrapper.java | 2 +-
.../store/SlowOpeningMockIndexInputWrapper.java | 2 +-
.../java/org/apache/lucene/util/TestUtil.java | 13 +-
.../lucene/store/TestMockDirectoryWrapper.java | 36 +
lucene/tools/junit4/solr-tests.policy | 1 +
lucene/tools/junit4/tests.policy | 5 +-
solr/CHANGES.txt | 159 ++
.../accumulator/FacetingAccumulator.java | 2 +-
.../solr/analytics/util/AnalyticsParsers.java | 2 +-
.../util/valuesource/DateFieldSource.java | 2 +-
.../solr/handler/dataimport/JdbcDataSource.java | 6 +-
.../dataimport/SimplePropertiesWriter.java | 33 +-
.../handler/dataimport/TestJdbcDataSource.java | 39 +
.../handler/extraction/XLSXResponseWriter.java | 414 ++++
.../extraction/solr/collection1/conf/schema.xml | 2 +
.../extraction/TestXLSXResponseWriter.java | 257 +++
.../org/apache/solr/cloud/AddReplicaCmd.java | 192 ++
.../java/org/apache/solr/cloud/BackupCmd.java | 132 ++
.../org/apache/solr/cloud/CreateAliasCmd.java | 101 +
.../apache/solr/cloud/CreateCollectionCmd.java | 291 +++
.../org/apache/solr/cloud/CreateShardCmd.java | 120 ++
.../org/apache/solr/cloud/DeleteAliasCmd.java | 95 +
.../apache/solr/cloud/DeleteCollectionCmd.java | 121 ++
.../org/apache/solr/cloud/DeleteNodeCmd.java | 98 +
.../org/apache/solr/cloud/DeleteReplicaCmd.java | 281 +++
.../org/apache/solr/cloud/DeleteShardCmd.java | 180 ++
.../java/org/apache/solr/cloud/MigrateCmd.java | 333 +++
.../OverseerCollectionConfigSetProcessor.java | 22 +-
.../cloud/OverseerCollectionMessageHandler.java | 1979 ++----------------
.../org/apache/solr/cloud/OverseerRoleCmd.java | 102 +
.../apache/solr/cloud/OverseerStatusCmd.java | 122 ++
.../solr/cloud/OverseerTaskProcessor.java | 6 +-
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 166 ++
.../java/org/apache/solr/cloud/RestoreCmd.java | 243 +++
.../org/apache/solr/cloud/SplitShardCmd.java | 472 +++++
.../apache/solr/cloud/rule/ImplicitSnitch.java | 10 +-
.../org/apache/solr/core/CoreContainer.java | 3 +-
.../java/org/apache/solr/core/CoreSorter.java | 12 +-
.../org/apache/solr/core/RequestParams.java | 7 +-
.../java/org/apache/solr/core/SolrConfig.java | 29 +-
.../src/java/org/apache/solr/core/SolrCore.java | 28 +-
.../apache/solr/core/backup/BackupManager.java | 34 +-
.../backup/repository/BackupRepository.java | 14 +-
.../backup/repository/HdfsBackupRepository.java | 29 +-
.../repository/LocalFileSystemRepository.java | 27 +-
.../org/apache/solr/handler/BlobHandler.java | 2 +-
.../org/apache/solr/handler/CdcrParams.java | 10 +-
.../org/apache/solr/handler/CdcrReplicator.java | 8 +-
.../solr/handler/CdcrReplicatorManager.java | 242 ++-
.../solr/handler/CdcrReplicatorScheduler.java | 6 +-
.../solr/handler/CdcrReplicatorState.java | 23 +
.../apache/solr/handler/CdcrRequestHandler.java | 233 ++-
.../org/apache/solr/handler/IndexFetcher.java | 10 +-
.../solr/handler/MoreLikeThisHandler.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 29 +-
.../org/apache/solr/handler/RestoreCore.java | 6 +-
.../org/apache/solr/handler/SchemaHandler.java | 2 +-
.../org/apache/solr/handler/SnapShooter.java | 11 +-
.../apache/solr/handler/SolrConfigHandler.java | 25 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +
.../solr/handler/admin/CollectionsHandler.java | 27 +-
.../solr/handler/admin/CoreAdminOperation.java | 7 +-
.../solr/handler/component/ExpandComponent.java | 4 +-
.../solr/handler/component/FacetComponent.java | 31 +-
.../solr/handler/component/QueryComponent.java | 7 +-
.../handler/component/RealTimeGetComponent.java | 67 +-
.../handler/component/SpellCheckComponent.java | 3 +-
.../solr/handler/component/StatsField.java | 17 +-
.../org/apache/solr/request/IntervalFacets.java | 2 +-
.../org/apache/solr/request/NumericFacets.java | 3 +-
.../org/apache/solr/request/SimpleFacets.java | 73 +-
.../solr/request/macro/MacroExpander.java | 12 +
.../transform/ChildDocTransformerFactory.java | 4 +-
.../transform/SubQueryAugmenterFactory.java | 17 +
.../solr/rest/ManagedResourceStorage.java | 9 +-
.../java/org/apache/solr/schema/BBoxField.java | 7 +-
.../java/org/apache/solr/schema/EnumField.java | 17 +-
.../java/org/apache/solr/schema/FieldType.java | 3 +-
.../org/apache/solr/schema/IndexSchema.java | 6 +-
.../schema/SpatialPointVectorFieldType.java | 9 +-
.../org/apache/solr/schema/TrieDoubleField.java | 2 +-
.../java/org/apache/solr/schema/TrieField.java | 44 +-
.../org/apache/solr/schema/TrieFloatField.java | 2 +-
.../org/apache/solr/schema/TrieIntField.java | 2 +-
.../org/apache/solr/schema/TrieLongField.java | 2 +-
.../org/apache/solr/search/CacheConfig.java | 24 +-
.../solr/search/CollapsingQParserPlugin.java | 10 -
.../java/org/apache/solr/search/DocSetUtil.java | 33 +
.../java/org/apache/solr/search/Grouping.java | 2 +-
.../solr/search/IGainTermsQParserPlugin.java | 240 +++
.../apache/solr/search/JoinQParserPlugin.java | 2 +-
.../search/LegacyNumericRangeQueryBuilder.java | 136 ++
.../java/org/apache/solr/search/QParser.java | 11 +
.../org/apache/solr/search/QParserPlugin.java | 12 +-
.../org/apache/solr/search/QueryParsing.java | 2 +-
.../apache/solr/search/QueryWrapperFilter.java | 2 +-
.../apache/solr/search/ReRankQParserPlugin.java | 119 +-
.../org/apache/solr/search/ReRankWeight.java | 48 +
.../org/apache/solr/search/ReturnFields.java | 7 +
.../org/apache/solr/search/SolrCoreParser.java | 2 +-
.../apache/solr/search/SolrFieldCacheMBean.java | 6 +-
.../apache/solr/search/SolrIndexSearcher.java | 92 +-
.../apache/solr/search/SolrReturnFields.java | 11 +
.../TextLogisticRegressionQParserPlugin.java | 283 +++
.../apache/solr/search/facet/FacetField.java | 1062 +---------
.../solr/search/facet/FacetFieldMerger.java | 211 ++
.../solr/search/facet/FacetFieldProcessor.java | 501 +++++
.../facet/FacetFieldProcessorByArray.java | 95 +
.../facet/FacetFieldProcessorByArrayDV.java | 294 +++
.../facet/FacetFieldProcessorByArrayUIF.java | 71 +
.../FacetFieldProcessorByEnumTermsStream.java | 356 ++++
.../facet/FacetFieldProcessorByHashDV.java | 442 ++++
.../search/facet/FacetFieldProcessorDV.java | 291 ---
.../facet/FacetFieldProcessorNumeric.java | 443 ----
.../apache/solr/search/facet/FacetMerger.java | 126 +-
.../apache/solr/search/facet/FacetModule.java | 550 ++---
.../solr/search/facet/FacetProcessor.java | 203 +-
.../apache/solr/search/facet/FacetQuery.java | 5 -
.../apache/solr/search/facet/FacetRange.java | 13 +-
.../solr/search/facet/FacetRangeMerger.java | 123 ++
.../apache/solr/search/facet/FacetRequest.java | 71 +-
.../search/facet/FacetRequestSortedMerger.java | 234 +++
.../org/apache/solr/search/facet/HLLAgg.java | 2 +-
.../apache/solr/search/facet/PercentileAgg.java | 2 +-
.../org/apache/solr/search/facet/SlotAcc.java | 15 +-
.../solr/search/facet/UnInvertedField.java | 6 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 2 +-
.../distributed/command/QueryCommand.java | 2 +-
.../join/BlockJoinDocSetFacetComponent.java | 34 +-
.../search/join/BlockJoinFacetAccsHolder.java | 97 +
.../search/join/BlockJoinFacetCollector.java | 131 --
.../search/join/BlockJoinFacetComponent.java | 165 +-
.../join/BlockJoinFacetComponentSupport.java | 156 ++
.../search/join/ScoreJoinQParserPlugin.java | 2 +-
.../apache/solr/search/mlt/CloudMLTQParser.java | 2 +-
.../solr/search/mlt/SimpleMLTQParser.java | 2 +-
.../apache/solr/security/BasicAuthPlugin.java | 1 +
.../security/DelegationTokenKerberosFilter.java | 46 +-
.../apache/solr/security/KerberosPlugin.java | 205 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 6 +
.../solr/spelling/suggest/SolrSuggester.java | 20 +-
.../org/apache/solr/uninverting/FieldCache.java | 20 +-
.../solr/uninverting/UninvertingReader.java | 20 +-
.../org/apache/solr/update/CdcrUpdateLog.java | 7 +-
.../solr/update/DefaultSolrCoreState.java | 6 +-
.../solr/update/DirectUpdateHandler2.java | 2 +-
.../apache/solr/update/HdfsTransactionLog.java | 141 +-
.../org/apache/solr/update/HdfsUpdateLog.java | 9 +-
.../java/org/apache/solr/update/PeerSync.java | 27 +-
.../org/apache/solr/update/SolrCoreState.java | 2 +
.../org/apache/solr/update/TransactionLog.java | 7 +-
.../java/org/apache/solr/update/UpdateLog.java | 9 +-
.../org/apache/solr/update/VersionInfo.java | 2 +-
.../update/processor/CdcrUpdateProcessor.java | 10 +-
.../processor/DistributedUpdateProcessor.java | 34 +-
.../org/apache/solr/util/SolrPluginUtils.java | 4 +-
.../org/apache/solr/util/TestInjection.java | 115 +-
.../collection1/conf/schema-psuedo-fields.xml | 3 +
.../solr/collection1/conf/solrconfig-tlog.xml | 2 +-
.../configsets/cdcr-source-disabled/schema.xml | 29 +
.../cdcr-source-disabled/solrconfig.xml | 60 +
.../solr/configsets/cdcr-source/schema.xml | 29 +
.../solr/configsets/cdcr-source/solrconfig.xml | 76 +
.../solr/configsets/cdcr-target/schema.xml | 29 +
.../solr/configsets/cdcr-target/solrconfig.xml | 63 +
.../org/apache/solr/TestRandomFaceting.java | 261 ++-
.../TestReversedWildcardFilterFactory.java | 2 +-
.../AbstractCloudBackupRestoreTestCase.java | 12 +-
.../solr/cloud/BaseCdcrDistributedZkTest.java | 25 +
.../apache/solr/cloud/CdcrBootstrapTest.java | 396 ++++
.../cloud/CdcrReplicationDistributedZkTest.java | 31 +
.../org/apache/solr/cloud/DeleteNodeTest.java | 75 +
.../apache/solr/cloud/DeleteReplicaTest.java | 139 +-
.../apache/solr/cloud/KerberosTestServices.java | 7 +-
.../solr/cloud/PeerSyncReplicationTest.java | 360 ++++
.../org/apache/solr/cloud/ReplaceNodeTest.java | 104 +
.../org/apache/solr/cloud/ShardSplitTest.java | 54 +
.../solr/cloud/TestCloudPseudoReturnFields.java | 91 +-
.../cloud/TestLocalFSCloudBackupRestore.java | 12 +-
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 447 +++-
.../TestSolrCloudWithDelegationTokens.java | 9 +-
.../TestSolrCloudWithSecureImpersonation.java | 364 ++++
.../TestStressCloudBlindAtomicUpdates.java | 25 +-
.../org/apache/solr/cloud/rule/RulesTest.java | 7 +-
.../apache/solr/core/TestSolrConfigHandler.java | 68 +-
.../apache/solr/handler/TestReqParamsAPI.java | 73 +-
.../DistributedFacetExistsSmallTest.java | 236 +++
...DistributedQueryComponentCustomSortTest.java | 15 +-
.../apache/solr/request/SimpleFacetsTest.java | 286 ++-
.../solr/request/macro/TestMacroExpander.java | 116 +
.../apache/solr/search/QueryEqualityTest.java | 18 +
.../TestLegacyNumericRangeQueryBuilder.java | 179 ++
.../solr/search/TestMaxScoreQueryParser.java | 1 +
...OverriddenPrefixQueryForCustomFieldType.java | 2 +-
.../solr/search/TestPseudoReturnFields.java | 25 +-
.../apache/solr/search/TestRankQueryPlugin.java | 4 -
.../org/apache/solr/search/TestSearchPerf.java | 8 +-
.../apache/solr/search/TestSolrQueryParser.java | 4 +-
.../solr/search/TestStandardQParsers.java | 9 +
.../solr/search/facet/TestJsonFacets.java | 57 +-
.../solr/search/function/TestOrdValues.java | 4 +-
.../search/join/BlockJoinFacetSimpleTest.java | 24 +
.../search/join/TestScoreJoinQPNoScore.java | 4 +-
.../solr/search/join/TestScoreJoinQPScore.java | 2 +-
.../solr/security/BasicAuthIntegrationTest.java | 28 +-
...ramDelegationTokenAuthenticationHandler.java | 109 -
.../HttpParamDelegationTokenPlugin.java | 272 +++
.../solr/uninverting/TestDocTermOrds.java | 6 +-
.../TestFieldCacheSanityChecker.java | 8 +-
.../solr/uninverting/TestFieldCacheSort.java | 8 +-
.../solr/uninverting/TestLegacyFieldCache.java | 10 +-
.../solr/uninverting/TestNumericTerms32.java | 14 +-
.../solr/uninverting/TestNumericTerms64.java | 16 +-
.../solr/uninverting/TestUninvertingReader.java | 10 +-
.../org/apache/solr/util/TestTestInjection.java | 4 +
.../basic_configs/conf/managed-schema | 3 +-
.../conf/managed-schema | 3 +-
.../conf/managed-schema | 3 +-
solr/site/SYSTEM_REQUIREMENTS.mdtext | 2 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 1 +
.../client/solrj/impl/LBHttpSolrClient.java | 22 +-
.../solrj/io/ClassificationEvaluation.java | 85 +
.../io/stream/FeaturesSelectionStream.java | 436 ++++
.../client/solrj/io/stream/TextLogitStream.java | 656 ++++++
.../solrj/io/stream/expr/Explanation.java | 1 +
.../solrj/request/CollectionAdminRequest.java | 64 +-
.../apache/solr/common/cloud/ZkNodeProps.java | 12 +
.../apache/solr/common/cloud/ZkStateReader.java | 28 +-
.../common/params/CollectionAdminParams.java | 9 +-
.../solr/common/params/CollectionParams.java | 3 +
.../apache/solr/common/params/CommonParams.java | 10 +
.../apache/solr/common/params/FacetParams.java | 8 +
.../solr/common/util/JsonRecordReader.java | 27 +-
.../solrj/solr/configsets/ml/conf/schema.xml | 77 +
.../solr/configsets/ml/conf/solrconfig.xml | 51 +
.../client/solrj/impl/CloudSolrClientTest.java | 68 +-
.../solrj/io/stream/StreamExpressionTest.java | 180 +-
.../stream/StreamExpressionToExpessionTest.java | 37 +-
.../StreamExpressionToExplanationTest.java | 1 -
.../cloud/TestCollectionStateWatchers.java | 51 +-
.../solr/common/util/TestJavaBinCodec.java | 104 +-
.../src/java/org/apache/solr/JSONTestUtil.java | 13 +
solr/webapp/web/css/angular/index.css | 12 +-
.../web/js/angular/controllers/collections.js | 7 +-
solr/webapp/web/js/angular/controllers/cores.js | 10 +-
.../web/js/angular/controllers/dataimport.js | 58 +-
solr/webapp/web/js/angular/controllers/files.js | 6 +-
.../webapp/web/js/angular/controllers/schema.js | 4 +
solr/webapp/web/js/angular/services.js | 6 +-
solr/webapp/web/partials/dataimport.html | 8 +-
427 files changed, 23472 insertions(+), 17433 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/test/org/apache/solr/cloud/rule/RulesTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index db7508a,c182495..b27a5a9
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@@ -33,12 -34,14 +34,16 @@@ import com.google.common.collect.Immuta
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.common.util.PredicateWithErrMsg;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.Utils;
+ import org.apache.solr.handler.DumpRequestHandler;
import org.apache.solr.handler.TestBlobHandler;
import org.apache.solr.handler.TestSolrConfigHandlerConcurrent;
+import org.apache.solr.util.RESTfulServerProvider;
+ import org.apache.solr.request.SolrQueryRequest;
+ import org.apache.solr.response.SolrQueryResponse;
+ import org.apache.solr.search.SolrCache;
import org.apache.solr.util.RestTestBase;
import org.apache.solr.util.RestTestHarness;
import org.eclipse.jetty.servlet.ServletHolder;
@@@ -454,10 -451,59 +457,59 @@@ public class TestSolrConfigHandler exte
map = getRespMap("/dump100?wt=json&json.nl=arrmap&initArgs=true", writeHarness);
List initArgs = (List) map.get("initArgs");
- assertEquals(2, initArgs.size());
+ assertTrue(initArgs.size() >= 2);
assertTrue(((Map)initArgs.get(0)).containsKey("suggester"));
assertTrue(((Map)initArgs.get(1)).containsKey("suggester"));
- System.out.println(map);
+
+ payload = "{\n" +
+ "'add-requesthandler' : { 'name' : '/dump101', 'class': " +
+ "'" + CacheTest.class.getName() + "' " +
+ ", 'startup' : 'lazy'}\n" +
+ "}";
+ runConfigCommand(writeHarness, "/config?wt=json", payload);
+
+ testForResponseElement(writeHarness,
+ testServerBaseUrl,
+ "/config/overlay?wt=json",
+ cloudSolrClient,
+ Arrays.asList("overlay", "requestHandler", "/dump101", "startup"),
+ "lazy",
+ 10);
+
+ payload = "{\n" +
+ "'add-cache' : {name:'lfuCacheDecayFalse', class:'solr.search.LFUCache', size:10 ,initialSize:9 , timeDecay:false }," +
+ "'add-cache' : {name: 'perSegFilter', class: 'solr.search.LRUCache', size:10, initialSize:0 , autowarmCount:10}}";
+ runConfigCommand(writeHarness, "/config?wt=json", payload);
+
+ map = testForResponseElement(writeHarness,
+ testServerBaseUrl,
+ "/config/overlay?wt=json",
+ cloudSolrClient,
+ Arrays.asList("overlay", "cache", "lfuCacheDecayFalse", "class"),
+ "solr.search.LFUCache",
+ 10);
+ assertEquals("solr.search.LRUCache",getObjectByPath(map, true, ImmutableList.of("overlay", "cache", "perSegFilter", "class")));
+
+ map = getRespMap("/dump101?cacheNames=lfuCacheDecayFalse&cacheNames=perSegFilter&wt=json", writeHarness);
+ assertEquals("Actual output "+ Utils.toJSONString(map), "org.apache.solr.search.LRUCache",getObjectByPath(map, true, ImmutableList.of( "caches", "perSegFilter")));
+ assertEquals("Actual output "+ Utils.toJSONString(map), "org.apache.solr.search.LFUCache",getObjectByPath(map, true, ImmutableList.of( "caches", "lfuCacheDecayFalse")));
+
+ }
+
+ public static class CacheTest extends DumpRequestHandler {
+ @Override
+ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
+ super.handleRequestBody(req, rsp);
+ String[] caches = req.getParams().getParams("cacheNames");
+ if(caches != null && caches.length>0){
+ HashMap m = new HashMap();
+ rsp.add("caches", m);
+ for (String c : caches) {
+ SolrCache cache = req.getSearcher().getCache(c);
+ if(cache != null) m.put(c, cache.getClass().getName());
+ }
+ }
+ }
}
public static Map testForResponseElement(RestTestHarness harness,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index 580cf66,958cf14..43524b4
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@@ -84,13 -83,9 +84,14 @@@ import org.apache.zookeeper.KeeperExcep
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
-
+ import static org.apache.solr.common.params.CommonParams.ADMIN_PATHS;
+import static org.apache.solr.common.params.CommonParams.AUTHC_PATH;
+import static org.apache.solr.common.params.CommonParams.AUTHZ_PATH;
+import static org.apache.solr.common.params.CommonParams.COLLECTIONS_HANDLER_PATH;
+import static org.apache.solr.common.params.CommonParams.CONFIGSETS_HANDLER_PATH;
+import static org.apache.solr.common.params.CommonParams.CORES_HANDLER_PATH;
+
/**
* SolrJ client class to communicate with SolrCloud.
* Instances of this class communicate with Zookeeper to discover
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b49d9027/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------