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/04/07 22:30:22 UTC
[50/50] [abbrv] lucene-solr:apiv2: Merge branch 'master' into apiv2
Merge branch '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/ed702f5e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ed702f5e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ed702f5e
Branch: refs/heads/apiv2
Commit: ed702f5e1203957542b1f431eea79618f6cde6e3
Parents: 283c648 ee98f6a
Author: Noble Paul <no...@apache.org>
Authored: Fri Apr 8 01:58:11 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Fri Apr 8 01:58:11 2016 +0530
----------------------------------------------------------------------
dev-tools/maven/solr/pom.xml.template | 9 +
dev-tools/scripts/buildAndPushRelease.py | 6 +-
dev-tools/scripts/scriptutil.py | 4 +-
lucene/CHANGES.txt | 66 +
.../DictionaryCompoundWordTokenFilter.java | 4 +-
.../lucene/analysis/hunspell/Dictionary.java | 19 +-
.../payloads/NumericPayloadTokenFilter.java | 2 +-
.../utils/ConfusionMatrixGenerator.java | 41 +-
.../utils/ConfusionMatrixGeneratorTest.java | 75 +-
.../simpletext/SimpleTextPointsWriter.java | 5 +-
lucene/common-build.xml | 4 +-
.../org/apache/lucene/codecs/CodecUtil.java | 4 +-
.../org/apache/lucene/codecs/PointsWriter.java | 5 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 21 +-
.../org/apache/lucene/codecs/package-info.java | 1 +
.../org/apache/lucene/document/BinaryPoint.java | 18 +-
.../org/apache/lucene/document/DoublePoint.java | 16 +-
.../java/org/apache/lucene/document/Field.java | 26 +-
.../org/apache/lucene/document/FieldType.java | 4 +-
.../org/apache/lucene/document/FloatPoint.java | 16 +-
.../org/apache/lucene/document/IntPoint.java | 16 +-
.../org/apache/lucene/document/LongPoint.java | 16 +-
.../java/org/apache/lucene/geo/GeoUtils.java | 94 ++
.../src/java/org/apache/lucene/geo/Polygon.java | 358 +++++
.../java/org/apache/lucene/geo/Rectangle.java | 189 +++
.../org/apache/lucene/geo/package-info.java | 21 +
.../lucene/index/DefaultIndexingChain.java | 2 +-
.../lucene/index/DocValuesFieldUpdates.java | 2 +-
.../java/org/apache/lucene/index/FieldInfo.java | 8 +-
.../org/apache/lucene/index/FieldInfos.java | 2 +-
.../apache/lucene/index/FilterLeafReader.java | 10 +-
.../org/apache/lucene/index/IndexWriter.java | 2 +-
.../apache/lucene/index/IndexWriterConfig.java | 6 +-
.../apache/lucene/index/PointValuesWriter.java | 10 +-
.../apache/lucene/search/PointInSetQuery.java | 4 +-
.../apache/lucene/search/PointRangeQuery.java | 98 +-
.../org/apache/lucene/search/PrefixQuery.java | 2 +-
.../apache/lucene/search/ReferenceManager.java | 4 +-
.../org/apache/lucene/store/BaseDirectory.java | 2 +-
.../org/apache/lucene/util/BytesRefArray.java | 15 +-
.../org/apache/lucene/util/CommandLineUtil.java | 2 +-
.../lucene/util/FixedLengthBytesRefArray.java | 189 +++
.../org/apache/lucene/util/OfflineSorter.java | 164 ++-
.../java/org/apache/lucene/util/SloppyMath.java | 122 +-
.../lucene/util/SortableBytesRefArray.java | 31 +
.../org/apache/lucene/util/UnicodeUtil.java | 2 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 235 ++--
.../apache/lucene/util/bkd/HeapPointReader.java | 8 +-
.../apache/lucene/util/bkd/HeapPointWriter.java | 64 +-
.../lucene/util/bkd/OfflinePointReader.java | 119 +-
.../lucene/util/bkd/OfflinePointWriter.java | 82 +-
.../org/apache/lucene/util/bkd/PointReader.java | 12 +
.../org/apache/lucene/util/bkd/PointWriter.java | 6 +-
.../org/apache/lucene/geo/TestGeoUtils.java | 338 +++++
.../test/org/apache/lucene/geo/TestPolygon.java | 248 ++++
.../apache/lucene/search/TestPointQueries.java | 159 ++-
.../search/spans/TestFieldMaskingSpanQuery.java | 2 +-
.../util/TestFixedLengthBytesRefArray.java | 84 ++
.../apache/lucene/util/TestOfflineSorter.java | 265 +++-
.../org/apache/lucene/util/TestSloppyMath.java | 97 +-
.../apache/lucene/util/bkd/Test2BBKDPoints.java | 21 +-
.../org/apache/lucene/util/bkd/TestBKD.java | 267 +++-
.../demo/facet/DistanceFacetsExample.java | 8 +-
.../js/JavascriptCompiler.properties | 2 +-
.../lucene/expressions/TestDemoExpressions.java | 6 +-
.../expressions/js/TestJavascriptFunction.java | 2 +-
.../org/apache/lucene/facet/range/Range.java | 2 +-
.../directory/DirectoryTaxonomyReader.java | 2 +-
.../highlight/WeightedSpanTermExtractor.java | 7 +-
.../postingshighlight/PostingsHighlighter.java | 4 +-
.../custom/HighlightCustomQueryTest.java | 15 +
lucene/ivy-versions.properties | 2 +-
.../org/apache/lucene/search/join/JoinUtil.java | 274 +++-
.../join/PointInSetIncludingScoreQuery.java | 340 +++++
.../apache/lucene/search/join/TestJoinUtil.java | 54 +-
.../randomizedtesting-runner-2.3.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.3.4.jar.sha1 | 1 +
.../apache/lucene/store/WindowsDirectory.cpp | 4 +-
.../apache/lucene/uninverting/DocTermOrds.java | 6 +-
.../apache/lucene/uninverting/FieldCache.java | 2 +-
.../apache/lucene/queries/mlt/MoreLikeThis.java | 129 +-
.../lucene/queries/mlt/TestMoreLikeThis.java | 82 ++
.../queryparser/classic/QueryParserBase.java | 4 +-
.../core/config/AbstractQueryConfig.java | 8 +-
.../flexible/core/config/FieldConfig.java | 4 +-
.../standard/config/LegacyNumericConfig.java | 6 +-
.../LegacyNumericFieldConfigListener.java | 2 +-
.../flexible/standard/config/PointsConfig.java | 6 +-
.../standard/config/PointsConfigListener.java | 2 +-
.../nodes/LegacyNumericRangeQueryNode.java | 2 +-
.../standard/nodes/PointRangeQueryNode.java | 2 +-
.../flexible/standard/TestPointQueryParser.java | 2 +-
.../apache/lucene/replicator/RevisionFile.java | 2 +-
lucene/sandbox/build.xml | 10 +
.../apache/lucene/document/BigIntegerPoint.java | 16 +-
.../lucene/document/InetAddressPoint.java | 10 +-
.../org/apache/lucene/document/LatLonGrid.java | 155 +++
.../org/apache/lucene/document/LatLonPoint.java | 122 +-
.../document/LatLonPointDistanceComparator.java | 27 +-
.../document/LatLonPointDistanceQuery.java | 61 +-
.../document/LatLonPointInPolygonQuery.java | 210 ++-
.../lucene/document/LatLonPointSortField.java | 12 +-
.../lucene/search/DocValuesRangeQuery.java | 8 +-
.../lucene/document/TestBigIntegerPoint.java | 26 +-
.../lucene/document/TestInetAddressPoint.java | 36 +-
.../apache/lucene/document/TestLatLonGrid.java | 50 +
.../apache/lucene/document/TestLatLonPoint.java | 253 ++--
.../document/TestLatLonPointDistanceQuery.java | 190 ---
.../document/TestLatLonPointDistanceSort.java | 66 +-
.../document/TestLatLonPointInPolygonQuery.java | 49 -
.../lucene/search/TestDocValuesRangeQuery.java | 34 +
.../lucene/search/TestLatLonPointQueries.java | 188 +--
.../lucene/spatial/bbox/BBoxStrategy.java | 318 +++--
.../spatial/vector/PointVectorStrategy.java | 177 ++-
.../lucene/spatial/DistanceStrategyTest.java | 40 +-
.../apache/lucene/spatial/PortedSolr3Test.java | 13 +-
.../lucene/spatial/QueryEqualsHashCodeTest.java | 10 +-
.../apache/lucene/spatial/SpatialTestCase.java | 42 +-
.../lucene/spatial/bbox/TestBBoxStrategy.java | 68 +-
.../composite/CompositeStrategyTest.java | 17 +-
.../serialized/SerializedStrategyTest.java | 7 +-
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 43 +-
.../Geo3dShapeRectRelationTestCase.java | 22 +-
.../Geo3dShapeSphereModelRectRelationTest.java | 4 +-
.../Geo3dShapeWGS84ModelRectRelationTest.java | 19 +-
.../spatial/vector/TestPointVectorStrategy.java | 55 +-
.../geopoint/document/GeoPointField.java | 46 +-
.../geopoint/document/GeoPointTokenStream.java | 10 +-
.../spatial/geopoint/search/GeoBoundingBox.java | 53 -
.../geopoint/search/GeoPointDistanceQuery.java | 79 +-
.../search/GeoPointDistanceQueryImpl.java | 79 +-
.../search/GeoPointDistanceRangeQuery.java | 122 --
.../geopoint/search/GeoPointInBBoxQuery.java | 80 +-
.../search/GeoPointInBBoxQueryImpl.java | 51 +-
.../geopoint/search/GeoPointInPolygonQuery.java | 128 +-
.../search/GeoPointInPolygonQueryImpl.java | 58 +-
.../geopoint/search/GeoPointMultiTermQuery.java | 56 +-
.../search/GeoPointNumericTermsEnum.java | 6 +-
.../search/GeoPointPrefixTermsEnum.java | 16 +-
.../GeoPointTermQueryConstantScoreWrapper.java | 2 +-
.../geopoint/search/GeoPointTermsEnum.java | 4 +-
.../lucene/spatial/util/GeoDistanceUtils.java | 223 ---
.../lucene/spatial/util/GeoEncodingUtils.java | 17 +-
.../lucene/spatial/util/GeoHashUtils.java | 283 ----
.../lucene/spatial/util/GeoProjectionUtils.java | 465 -------
.../org/apache/lucene/spatial/util/GeoRect.java | 78 --
.../lucene/spatial/util/GeoRelationUtils.java | 485 +------
.../apache/lucene/spatial/util/GeoUtils.java | 187 ---
.../geopoint/search/TestGeoPointQuery.java | 367 +----
.../search/TestLegacyGeoPointQuery.java | 81 ++
.../spatial/util/BaseGeoPointTestCase.java | 1277 ++++++++++++++----
.../spatial/util/TestGeoEncodingUtils.java | 101 ++
.../lucene/spatial/util/TestGeoUtils.java | 565 --------
.../org/apache/lucene/spatial3d/Geo3DPoint.java | 164 ++-
.../spatial3d/PointInGeo3DShapeQuery.java | 4 +
.../lucene/spatial3d/geom/BaseXYZSolid.java | 2 +-
.../lucene/spatial3d/geom/GeoBaseBBox.java | 2 +-
.../lucene/spatial3d/geom/GeoBaseCircle.java | 4 +-
.../lucene/spatial3d/geom/GeoBasePath.java | 34 +
.../lucene/spatial3d/geom/GeoBasePolygon.java | 4 +-
.../spatial3d/geom/GeoConcavePolygon.java | 394 ++++++
.../lucene/spatial3d/geom/GeoConvexPolygon.java | 180 ++-
.../geom/GeoDegenerateHorizontalLine.java | 2 +-
.../geom/GeoDegenerateLatitudeZone.java | 2 +-
.../geom/GeoDegenerateLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoDegeneratePoint.java | 2 +-
.../lucene/spatial3d/geom/GeoLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoNorthLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoNorthRectangle.java | 2 +-
.../apache/lucene/spatial3d/geom/GeoPath.java | 776 +----------
.../lucene/spatial3d/geom/GeoPathFactory.java | 39 +
.../spatial3d/geom/GeoPolygonFactory.java | 983 ++++++++++++--
.../lucene/spatial3d/geom/GeoRectangle.java | 2 +-
.../spatial3d/geom/GeoSouthLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoSouthRectangle.java | 2 +-
.../spatial3d/geom/GeoStandardCircle.java | 2 +-
.../lucene/spatial3d/geom/GeoStandardPath.java | 797 +++++++++++
.../geom/GeoWideDegenerateHorizontalLine.java | 2 +-
.../spatial3d/geom/GeoWideLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoWideNorthRectangle.java | 2 +-
.../lucene/spatial3d/geom/GeoWideRectangle.java | 2 +-
.../spatial3d/geom/GeoWideSouthRectangle.java | 2 +-
.../apache/lucene/spatial3d/geom/GeoWorld.java | 2 +-
.../lucene/spatial3d/geom/PlanetModel.java | 123 +-
.../lucene/spatial3d/geom/SidedPlane.java | 20 +-
.../lucene/spatial3d/geom/StandardXYZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/XYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/XdYZSolid.java | 2 +-
.../lucene/spatial3d/geom/XdYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/dXYZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXYdZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXdYZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXdYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 34 +-
.../lucene/spatial3d/geom/GeoCircleTest.java | 15 -
.../lucene/spatial3d/geom/GeoPathTest.java | 36 +-
.../lucene/spatial3d/geom/GeoPointTest.java | 33 +
.../lucene/spatial3d/geom/GeoPolygonTest.java | 176 ++-
.../search/suggest/SortedInputIterator.java | 33 +-
.../suggest/analyzing/AnalyzingSuggester.java | 26 +-
.../search/suggest/fst/ExternalRefSorter.java | 23 +-
.../search/suggest/fst/FSTCompletionLookup.java | 22 +-
.../search/suggest/fst/BytesRefSortersTest.java | 11 +-
.../java/org/apache/lucene/geo/GeoTestUtil.java | 512 +++++++
.../src/java/org/apache/lucene/geo/package.html | 26 +
.../lucene/index/BasePointsFormatTestCase.java | 2 +-
.../org/apache/lucene/index/RandomCodec.java | 90 +-
.../lucene/store/CorruptingIndexOutput.java | 101 ++
.../org/apache/lucene/util/LuceneTestCase.java | 9 +-
solr/CHANGES.txt | 102 +-
solr/common-build.xml | 7 +-
.../analytics/accumulator/BasicAccumulator.java | 6 +-
.../accumulator/FacetingAccumulator.java | 8 +-
.../solr/analytics/expression/Expression.java | 14 +-
.../analytics/expression/ExpressionFactory.java | 9 +-
.../StatsCollectorSupplierFactory.java | 21 +-
.../solr/analytics/util/AnalyticsParsers.java | 7 +-
.../analytics/util/RangeEndpointCalculator.java | 5 +-
.../util/valuesource/ConstDateSource.java | 9 +-
.../util/valuesource/DateFieldSource.java | 6 +-
.../util/valuesource/FilterFieldSource.java | 3 +-
.../analytics/expression/ExpressionTest.java | 27 +-
.../extraction/ExtractingRequestHandler.java | 23 +-
.../handler/extraction/ExtractionDateUtil.java | 178 +++
.../handler/extraction/SolrContentHandler.java | 12 +-
.../extraction/TestExtractionDateUtil.java | 61 +
.../src/java/org/apache/solr/hadoop/GoLive.java | 27 +-
.../solr/hadoop/MapReduceIndexerTool.java | 7 +-
.../apache/solr/hadoop/ZooKeeperInspector.java | 9 +-
.../test/org/apache/solr/hadoop/MRUnitBase.java | 2 +
.../MapReduceIndexerToolArgumentParserTest.java | 1 +
.../solr/hadoop/MorphlineBasicMiniMRTest.java | 1 +
.../solr/morphlines/cell/SolrCellBuilder.java | 18 +-
.../morphlines/cell/SolrCellMorphlineTest.java | 7 +-
.../solr/AbstractSolrMorphlineTestBase.java | 3 +
.../solr/AbstractSolrMorphlineZkTestBase.java | 3 +
.../solr/SolrMorphlineZkAvroTest.java | 14 +-
.../morphlines/solr/SolrMorphlineZkTest.java | 5 -
.../client/solrj/embedded/JettySolrRunner.java | 25 +-
.../org/apache/solr/cloud/LeaderElector.java | 5 +-
.../OverseerAutoReplicaFailoverThread.java | 8 +-
.../org/apache/solr/core/BlobRepository.java | 3 +-
.../solr/core/CachingDirectoryFactory.java | 20 +-
.../org/apache/solr/core/ConfigSetService.java | 9 +-
.../org/apache/solr/core/CoreContainer.java | 113 +-
.../org/apache/solr/core/DirectoryFactory.java | 6 +
.../apache/solr/core/HdfsDirectoryFactory.java | 33 +-
.../solr/core/ShutdownAwareDirectory.java | 30 +
.../src/java/org/apache/solr/core/SolrCore.java | 87 +-
.../java/org/apache/solr/core/SolrCores.java | 25 +-
.../apache/solr/core/SolrDeletionPolicy.java | 16 +-
.../solr/handler/CdcrReplicatorScheduler.java | 19 +-
.../solr/handler/CdcrReplicatorState.java | 21 +-
.../org/apache/solr/handler/IndexFetcher.java | 44 +-
.../solr/handler/MoreLikeThisHandler.java | 12 +-
.../apache/solr/handler/PingRequestHandler.java | 6 +-
.../apache/solr/handler/ReplicationHandler.java | 23 +-
.../org/apache/solr/handler/SQLHandler.java | 79 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +
.../solr/handler/component/DebugComponent.java | 1 +
.../handler/component/HighlightComponent.java | 1 +
.../handler/component/HttpShardHandler.java | 97 +-
.../component/HttpShardHandlerFactory.java | 45 +-
.../component/IterativeMergeStrategy.java | 3 -
.../component/MoreLikeThisComponent.java | 3 +
.../solr/handler/component/PivotFacetValue.java | 3 +-
.../solr/handler/component/QueryComponent.java | 2 +-
.../handler/component/RangeFacetRequest.java | 50 +-
.../handler/component/RealTimeGetComponent.java | 13 +-
.../request/PerSegmentSingleValuedFaceting.java | 9 +-
.../org/apache/solr/request/SimpleFacets.java | 35 +-
.../solr/response/BinaryResponseWriter.java | 11 +-
.../apache/solr/response/CSVResponseWriter.java | 10 +-
.../apache/solr/response/SolrQueryResponse.java | 4 +
.../solr/response/TextResponseWriter.java | 3 +-
.../transform/ValueAugmenterFactory.java | 4 +-
.../org/apache/solr/rest/ManagedResource.java | 24 +-
.../solr/schema/AbstractSpatialFieldType.java | 7 +-
.../java/org/apache/solr/schema/BBoxField.java | 6 +-
.../org/apache/solr/schema/DateRangeField.java | 15 +-
.../java/org/apache/solr/schema/FieldType.java | 7 +-
.../schema/SpatialPointVectorFieldType.java | 23 +-
.../java/org/apache/solr/schema/StrField.java | 26 +-
.../org/apache/solr/schema/TrieDateField.java | 5 +-
.../java/org/apache/solr/schema/TrieField.java | 129 +-
.../apache/solr/search/SolrFieldCacheMBean.java | 8 +-
.../apache/solr/search/SolrReturnFields.java | 17 +-
.../apache/solr/search/ValueSourceParser.java | 37 +-
.../apache/solr/search/facet/FacetRange.java | 5 +-
.../search/function/ValueSourceRangeFilter.java | 6 +-
.../solr/security/AuthenticationPlugin.java | 3 -
.../solr/security/HttpClientBuilderPlugin.java | 37 +
.../security/HttpClientInterceptorPlugin.java | 30 -
.../apache/solr/security/KerberosPlugin.java | 17 +-
.../solr/security/PKIAuthenticationPlugin.java | 45 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 3 +-
.../solr/store/blockcache/BlockDirectory.java | 32 +-
.../org/apache/solr/update/HdfsUpdateLog.java | 13 +-
.../apache/solr/update/SolrCmdDistributor.java | 42 +-
.../apache/solr/update/UpdateShardHandler.java | 57 +-
.../processor/DistributedUpdateProcessor.java | 135 +-
.../DistributedUpdateProcessorFactory.java | 20 +
.../DocExpirationUpdateProcessorFactory.java | 42 +-
.../processor/TolerantUpdateProcessor.java | 415 ++++++
.../TolerantUpdateProcessorFactory.java | 142 ++
.../org/apache/solr/util/DateFormatUtil.java | 245 ----
.../org/apache/solr/util/DateMathParser.java | 88 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 23 +-
solr/core/src/test-files/log4j.properties | 4 +-
.../solr/collection1/conf/schema-docValues.xml | 13 +-
.../solr/collection1/conf/schema15.xml | 1 +
.../solr/collection1/conf/schema_latest.xml | 51 +-
...lrconfig-distrib-update-processor-chains.xml | 85 ++
.../conf/solrconfig-tolerant-update-minimal.xml | 40 +
.../conf/solrconfig-update-processor-chains.xml | 17 +
.../org/apache/solr/BasicFunctionalityTest.java | 29 +-
.../org/apache/solr/TestDistributedSearch.java | 12 +-
.../core/src/test/org/apache/solr/TestTrie.java | 13 +-
.../solr/client/solrj/ConnectionReuseTest.java | 195 +--
.../solrj/embedded/TestJettySolrRunner.java | 12 +-
.../solr/cloud/BaseCdcrDistributedZkTest.java | 9 +-
.../solr/cloud/BasicDistributedZkTest.java | 107 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 8 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 12 +-
.../solr/cloud/ConnectionManagerTest.java | 40 +-
.../apache/solr/cloud/HttpPartitionTest.java | 10 +-
.../cloud/LeaderFailoverAfterPartitionTest.java | 9 +-
.../org/apache/solr/cloud/SSLMigrationTest.java | 2 +-
.../solr/cloud/SaslZkACLProviderTest.java | 2 +
.../cloud/SegmentTerminateEarlyTestState.java | 6 +-
.../org/apache/solr/cloud/ShardSplitTest.java | 1 -
.../solr/cloud/TestAuthenticationFramework.java | 52 +-
.../solr/cloud/TestCloudDeleteByQuery.java | 18 +-
.../apache/solr/cloud/TestCloudPivotFacet.java | 23 +-
.../cloud/TestMiniSolrCloudClusterBase.java | 2 +-
.../cloud/TestRandomRequestDistribution.java | 104 +-
.../cloud/TestSolrCloudWithKerberosAlt.java | 13 +-
.../cloud/TestTolerantUpdateProcessorCloud.java | 1081 +++++++++++++++
.../TestTolerantUpdateProcessorRandomCloud.java | 392 ++++++
.../org/apache/solr/cloud/ZkControllerTest.java | 9 +-
.../solr/cloud/overseer/ZkStateReaderTest.java | 5 +-
.../solr/core/OpenCloseCoreStressTest.java | 2 -
.../org/apache/solr/core/TestBadConfig.java | 5 +
.../org/apache/solr/core/TestCoreContainer.java | 1 -
.../solr/core/TestImplicitCoreProperties.java | 4 +-
.../solr/handler/TestReplicationHandler.java | 2 -
.../handler/TestReplicationHandlerBackup.java | 2 -
.../apache/solr/handler/TestRestoreCore.java | 2 -
.../org/apache/solr/handler/TestSQLHandler.java | 73 +-
.../admin/CoreAdminCreateDiscoverTest.java | 1 +
.../DistributedFacetPivotLargeTest.java | 3 +-
.../DistributedQueryElevationComponentTest.java | 1 +
.../apache/solr/request/SimpleFacetsTest.java | 9 +-
.../solr/response/TestCSVResponseWriter.java | 14 +-
.../org/apache/solr/schema/DateFieldTest.java | 148 +-
.../apache/solr/schema/DocValuesMultiTest.java | 71 +-
.../org/apache/solr/schema/DocValuesTest.java | 437 +++++-
.../solr/schema/TestUseDocValuesAsStored.java | 9 +-
.../solr/search/AnalyticsMergeStrategyTest.java | 2 +
.../apache/solr/search/ReturnFieldsTest.java | 8 +
.../org/apache/solr/search/TestRealTimeGet.java | 49 +-
.../org/apache/solr/search/TestRecovery.java | 7 +-
.../apache/solr/search/TestRecoveryHdfs.java | 13 +-
.../solr/search/TestSolrFieldCacheMBean.java | 61 +
.../solr/search/stats/TestDistribIDF.java | 82 +-
.../solr/security/BasicAuthIntegrationTest.java | 41 +-
.../PKIAuthenticationIntegrationTest.java | 2 -
.../security/TestAuthorizationFramework.java | 3 +-
.../apache/solr/update/AddBlockUpdateTest.java | 20 +-
.../org/apache/solr/update/AutoCommitTest.java | 2 +-
.../test/org/apache/solr/update/TestUpdate.java | 16 +-
.../update/processor/AtomicUpdatesTest.java | 48 +-
.../processor/TolerantUpdateProcessorTest.java | 447 ++++++
.../apache/solr/util/DateMathParserTest.java | 125 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 7 +
.../org/apache/solr/util/TestTestInjection.java | 2 +-
solr/licenses/junit4-ant-2.3.2.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.3.4.jar.sha1 | 1 +
.../randomizedtesting-runner-2.3.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.3.4.jar.sha1 | 1 +
solr/server/etc/jetty-http.xml | 2 +-
solr/server/etc/jetty-https.xml | 2 +-
solr/server/etc/jetty.xml | 2 +-
.../org/apache/solr/client/solrj/SolrQuery.java | 21 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 82 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 20 +-
.../client/solrj/impl/HttpClientConfigurer.java | 100 --
.../solr/client/solrj/impl/HttpClientUtil.java | 438 +++---
.../solr/client/solrj/impl/HttpSolrClient.java | 129 +-
.../solrj/impl/Krb5HttpClientBuilder.java | 178 +++
.../solrj/impl/Krb5HttpClientConfigurer.java | 153 ---
.../client/solrj/impl/LBHttpSolrClient.java | 33 +-
.../solrj/impl/SolrHttpClientBuilder.java | 91 ++
.../impl/SolrHttpClientContextBuilder.java | 96 ++
.../client/solrj/impl/XMLResponseParser.java | 27 +-
.../client/solrj/io/comp/FieldComparator.java | 42 +-
.../solrj/io/graph/ShortestPathStream.java | 490 +++++++
.../client/solrj/io/graph/package-info.java | 22 +
.../client/solrj/io/sql/ConnectionImpl.java | 12 +-
.../solrj/io/sql/DatabaseMetaDataImpl.java | 2 +-
.../solr/client/solrj/io/sql/ResultSetImpl.java | 2 +-
.../solr/client/solrj/io/sql/StatementImpl.java | 9 +-
.../client/solrj/io/stream/DaemonStream.java | 33 +-
.../client/solrj/io/stream/TopicStream.java | 16 +-
.../client/solrj/io/stream/metrics/Bucket.java | 11 +-
.../solr/client/solrj/util/ClientUtils.java | 20 +-
.../solr/common/ToleratedUpdateError.java | 197 +++
.../solr/common/cloud/ConnectionManager.java | 8 +-
.../org/apache/solr/common/util/DateUtil.java | 259 ----
solr/solrj/src/test-files/log4j.properties | 2 +
.../client/solrj/SolrExampleBinaryTest.java | 2 -
.../solr/client/solrj/SolrExampleXMLTest.java | 2 -
.../solr/client/solrj/SolrExceptionTest.java | 9 +-
.../apache/solr/client/solrj/SolrQueryTest.java | 18 +-
.../client/solrj/SolrSchemalessExampleTest.java | 7 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 15 +-
.../client/solrj/embedded/JettyWebappTest.java | 3 +-
.../solrj/embedded/SolrExampleJettyTest.java | 3 +-
.../solrj/impl/BasicHttpSolrClientTest.java | 87 +-
.../client/solrj/impl/CloudSolrClientTest.java | 10 +-
.../solrj/impl/ExternalHttpClientTest.java | 75 -
.../client/solrj/impl/HttpClientUtilTest.java | 162 ---
.../client/solrj/impl/LBHttpSolrClientTest.java | 17 +-
.../solrj/io/graph/GraphExpressionTest.java | 404 ++++++
.../solr/client/solrj/io/graph/GraphTest.java | 387 ++++++
.../solr/client/solrj/io/sql/JdbcTest.java | 31 +-
.../client/solrj/io/stream/StreamingTest.java | 124 +-
.../solr/client/solrj/request/SchemaTest.java | 9 +-
.../solrj/response/QueryResponseTest.java | 7 +-
.../solr/common/TestToleratedUpdateError.java | 193 +++
.../apache/solr/common/util/TestDateUtil.java | 35 -
.../solr/BaseDistributedSearchTestCase.java | 61 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 18 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 24 +-
.../cloud/AbstractFullDistribZkTestBase.java | 4 -
.../apache/solr/cloud/MiniSolrCloudCluster.java | 14 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 4 +-
.../org/apache/solr/util/RestTestHarness.java | 4 +-
.../org/apache/solr/util/SSLTestConfig.java | 79 +-
solr/webapp/web/js/angular/controllers/query.js | 9 +-
solr/webapp/web/js/angular/services.js | 4 +-
442 files changed, 18620 insertions(+), 9690 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed702f5e/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/core/CoreContainer.java
index cbef143,e1ea6fb..977dc97
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@@ -16,10 -16,19 +16,21 @@@
*/
package org.apache.solr.core;
+ import static com.google.common.base.Preconditions.checkNotNull;
+ import static java.util.Collections.EMPTY_MAP;
+ 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;
+ import static org.apache.solr.common.params.CommonParams.INFO_HANDLER_PATH;
+ import static org.apache.solr.common.params.CommonParams.ZK_PATH;
+ import static org.apache.solr.security.AuthenticationPlugin.AUTHENTICATION_PLUGIN_PROP;
+
import java.io.IOException;
+import java.io.InputStream;
import java.lang.invoke.MethodHandles;
+import java.nio.ByteBuffer;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed702f5e/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed702f5e/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 8573c99,4687154..6f1a78d
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@@ -60,9 -57,8 +60,10 @@@ import org.apache.http.client.methods.H
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.util.EntityUtils;
+import org.apache.solr.api.ApiBag;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
+ import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.cloud.Aliases;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed702f5e/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed702f5e/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed702f5e/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
index 466f131,d8347ce..cc2a501
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
@@@ -72,10 -73,10 +73,10 @@@ public class SolrExampleJettyTest exten
// two docs, one with uniqueKey, another without it
String json = "{\"id\":\"abc1\", \"name\": \"name1\"} {\"name\" : \"name2\"}";
HttpClient httpClient = client.getHttpClient();
- HttpPost post = new HttpPost(client.getBaseURL() + "/update/json/docs");
+ HttpPost post = new HttpPost(getUri(client));
post.setHeader("Content-Type", "application/json");
post.setEntity(new InputStreamEntity(new ByteArrayInputStream(json.getBytes("UTF-8")), -1));
- HttpResponse response = httpClient.execute(post);
+ HttpResponse response = httpClient.execute(post, HttpClientUtil.createNewHttpClientRequestContext());
assertEquals(200, response.getStatusLine().getStatusCode());
client.commit();
QueryResponse rsp = getSolrClient().query(new SolrQuery("*:*"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed702f5e/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java
----------------------------------------------------------------------