You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2016/04/14 01:22:06 UTC
[50/50] lucene-solr:jira/SOLR-8908: Merge branch 'master' into
jira/SOLR-8908
Merge branch 'master' into jira/SOLR-8908
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c948a905
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c948a905
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c948a905
Branch: refs/heads/jira/SOLR-8908
Commit: c948a9058336b20e7eac60669683661bcdf49161
Parents: 146f00c 2335a45
Author: Timothy Potter <th...@gmail.com>
Authored: Wed Apr 13 16:20:36 2016 -0700
Committer: Timothy Potter <th...@gmail.com>
Committed: Wed Apr 13 16:20:36 2016 -0700
----------------------------------------------------------------------
dev-tools/idea/.idea/libraries/JUnit.xml | 4 +-
.../lucene/classification/classification.iml | 2 +
dev-tools/scripts/addVersion.py | 19 +-
dev-tools/scripts/buildAndPushRelease.py | 6 +-
dev-tools/scripts/scriptutil.py | 20 +-
lucene/CHANGES.txt | 65 +-
.../DictionaryCompoundWordTokenFilter.java | 4 +-
.../payloads/NumericPayloadTokenFilter.java | 2 +-
.../index/TestBackwardsCompatibility.java | 5 +-
.../org/apache/lucene/index/index.6.0.0-cfs.zip | Bin 0 -> 13744 bytes
.../apache/lucene/index/index.6.0.0-nocfs.zip | Bin 0 -> 13749 bytes
lucene/classification/build.xml | 8 +-
.../utils/ConfusionMatrixGenerator.java | 80 +-
.../classification/utils/DatasetSplitter.java | 126 +-
.../BooleanPerceptronClassifierTest.java | 2 +-
.../CachingNaiveBayesClassifierTest.java | 2 +-
.../KNearestNeighborClassifierTest.java | 2 +-
.../SimpleNaiveBayesClassifierTest.java | 2 +-
.../utils/ConfusionMatrixGeneratorTest.java | 105 +-
.../classification/utils/DataSplitterTest.java | 33 +-
.../org/apache/lucene/codecs/package-info.java | 1 +
.../org/apache/lucene/document/BinaryPoint.java | 16 +-
.../org/apache/lucene/document/DoublePoint.java | 4 +-
.../java/org/apache/lucene/document/Field.java | 26 +-
.../org/apache/lucene/document/FieldType.java | 4 +-
.../org/apache/lucene/document/FloatPoint.java | 4 +-
.../org/apache/lucene/document/IntPoint.java | 4 +-
.../org/apache/lucene/document/LongPoint.java | 4 +-
.../org/apache/lucene/geo/GeoEncodingUtils.java | 147 ++
.../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 | 2 +-
.../org/apache/lucene/search/PrefixQuery.java | 2 +-
.../apache/lucene/search/ReferenceManager.java | 4 +-
.../org/apache/lucene/store/BaseDirectory.java | 2 +-
.../lucene/store/NRTCachingDirectory.java | 5 +-
.../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 | 75 +-
.../java/org/apache/lucene/util/SloppyMath.java | 14 +-
.../lucene/util/SortableBytesRefArray.java | 31 +
.../org/apache/lucene/util/UnicodeUtil.java | 2 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 17 +-
.../lucene/util/bkd/OfflinePointWriter.java | 15 +-
.../apache/lucene/geo/TestGeoEncodingUtils.java | 151 ++
.../org/apache/lucene/geo/TestGeoUtils.java | 341 +++++
.../test/org/apache/lucene/geo/TestPolygon.java | 248 ++++
.../search/spans/TestFieldMaskingSpanQuery.java | 2 +-
.../apache/lucene/store/TestRateLimiter.java | 2 +-
.../util/TestFixedLengthBytesRefArray.java | 84 ++
.../apache/lucene/util/TestOfflineSorter.java | 68 +-
.../org/apache/lucene/util/TestSloppyMath.java | 65 +-
.../demo/facet/DistanceFacetsExample.java | 5 +-
lucene/demo/src/java/overview.html | 2 +-
.../lucene/expressions/TestDemoExpressions.java | 6 +-
.../expressions/js/TestJavascriptFunction.java | 2 +-
.../org/apache/lucene/facet/range/Range.java | 2 +-
.../directory/DirectoryTaxonomyReader.java | 2 +-
.../facet/range/TestRangeFacetCounts.java | 13 +-
.../postingshighlight/PostingsHighlighter.java | 4 +-
lucene/ivy-versions.properties | 2 +-
.../search/join/ToChildBlockJoinQuery.java | 4 +-
.../search/join/ToParentBlockJoinQuery.java | 6 +-
.../lucene/search/join/TestBlockJoin.java | 32 +-
.../randomizedtesting-runner-2.3.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.3.4.jar.sha1 | 1 +
.../apache/lucene/store/WindowsDirectory.cpp | 4 +-
.../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 +-
.../xml/builders/BooleanQueryBuilder.java | 3 +-
.../builders/DisjunctionMaxQueryBuilder.java | 3 +-
.../xml/builders/FuzzyLikeThisQueryBuilder.java | 3 +-
.../lucene/queryparser/xml/TestCoreParser.java | 15 +-
.../apache/lucene/replicator/RevisionFile.java | 2 +-
lucene/sandbox/build.xml | 10 +
.../apache/lucene/document/BigIntegerPoint.java | 4 +-
.../lucene/document/InetAddressPoint.java | 4 +-
.../org/apache/lucene/document/LatLonGrid.java | 168 +++
.../org/apache/lucene/document/LatLonPoint.java | 151 +-
.../document/LatLonPointDistanceComparator.java | 30 +-
.../document/LatLonPointDistanceQuery.java | 172 ++-
.../document/LatLonPointInPolygonQuery.java | 221 ++-
.../lucene/document/LatLonPointSortField.java | 4 +-
.../lucene/search/DocValuesRangeQuery.java | 2 +-
.../apache/lucene/document/TestLatLonGrid.java | 106 ++
.../apache/lucene/document/TestLatLonPoint.java | 60 +-
.../document/TestLatLonPointDistanceSort.java | 35 +-
.../lucene/search/TestLatLonPointQueries.java | 15 +-
.../lucene/spatial/bbox/BBoxStrategy.java | 318 +++--
.../prefix/IntersectsPrefixTreeQuery.java | 13 +-
.../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 | 2 +-
.../geopoint/search/GeoPointDistanceQuery.java | 19 +-
.../search/GeoPointDistanceQueryImpl.java | 19 +-
.../search/GeoPointDistanceRangeQuery.java | 122 --
.../geopoint/search/GeoPointInBBoxQuery.java | 8 +-
.../geopoint/search/GeoPointInPolygonQuery.java | 125 +-
.../search/GeoPointInPolygonQueryImpl.java | 46 +-
.../geopoint/search/GeoPointMultiTermQuery.java | 14 +-
.../lucene/spatial/util/GeoEncodingUtils.java | 24 +-
.../org/apache/lucene/spatial/util/GeoRect.java | 70 -
.../lucene/spatial/util/GeoRelationUtils.java | 203 ---
.../apache/lucene/spatial/util/GeoUtils.java | 155 ---
.../geopoint/search/GeoPointTestUtil.java | 287 ++++
.../geopoint/search/TestGeoPointQuery.java | 48 +-
.../search/TestLegacyGeoPointQuery.java | 60 +-
.../spatial/util/BaseGeoPointTestCase.java | 877 +++++++-----
.../spatial/util/TestGeoEncodingUtils.java | 102 ++
.../lucene/spatial/util/TestGeoUtils.java | 324 -----
.../org/apache/lucene/spatial3d/Geo3DPoint.java | 169 ++-
.../org/apache/lucene/spatial3d/Geo3DUtil.java | 64 +-
.../spatial3d/PointInGeo3DShapeQuery.java | 71 +-
.../spatial3d/PointInShapeIntersectVisitor.java | 97 ++
.../lucene/spatial3d/geom/BaseXYZSolid.java | 2 +-
.../lucene/spatial3d/geom/GeoBBoxFactory.java | 3 +-
.../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 | 411 ++++++
.../lucene/spatial3d/geom/GeoConvexPolygon.java | 209 ++-
.../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 +
.../apache/lucene/spatial3d/geom/GeoPoint.java | 2 +-
.../spatial3d/geom/GeoPolygonFactory.java | 1295 ++++++++++++++++--
.../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/LatLonBounds.java | 18 +-
.../org/apache/lucene/spatial3d/geom/Plane.java | 44 +-
.../lucene/spatial3d/geom/PlanetModel.java | 28 +-
.../lucene/spatial3d/geom/SidedPlane.java | 20 +-
.../lucene/spatial3d/geom/StandardXYZSolid.java | 20 +-
.../apache/lucene/spatial3d/geom/XYZBounds.java | 20 +-
.../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 | 995 +++++++++++---
.../lucene/spatial3d/geom/GeoCircleTest.java | 15 -
.../lucene/spatial3d/geom/GeoPathTest.java | 36 +-
.../lucene/spatial3d/geom/GeoPolygonTest.java | 266 +++-
.../org/apache/lucene/geo/EarthDebugger.java | 288 ++++
.../java/org/apache/lucene/geo/GeoTestUtil.java | 407 ++++++
.../src/java/org/apache/lucene/geo/package.html | 26 +
.../apache/lucene/index/PointsStackTracker.java | 79 ++
solr/CHANGES.txt | 81 +-
.../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 +-
.../handler/dataimport/SolrEntityProcessor.java | 10 +-
.../dataimport/TestContentStreamDataSource.java | 4 +-
.../TestSolrEntityProcessorEndToEnd.java | 2 +-
.../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 | 31 +-
.../solr/hadoop/MapReduceIndexerTool.java | 7 +-
.../apache/solr/hadoop/ZooKeeperInspector.java | 9 +-
.../solr/hadoop/MorphlineGoLiveMiniMRTest.java | 4 +-
.../solr/morphlines/cell/SolrCellBuilder.java | 18 +-
.../morphlines/cell/SolrCellMorphlineTest.java | 4 +-
.../solr/SafeConcurrentUpdateSolrClient.java | 2 +-
.../solr/morphlines/solr/SolrLocator.java | 5 +-
.../solr/AbstractSolrMorphlineTestBase.java | 2 +-
.../solr/SolrMorphlineZkAvroTest.java | 14 +-
.../client/solrj/embedded/JettySolrRunner.java | 25 +-
.../cloud/LeaderInitiatedRecoveryThread.java | 2 +-
.../java/org/apache/solr/cloud/Overseer.java | 1 +
.../OverseerAutoReplicaFailoverThread.java | 40 +-
.../cloud/OverseerCollectionMessageHandler.java | 2 +-
.../apache/solr/cloud/OverseerTaskQueue.java | 21 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 5 +-
.../org/apache/solr/cloud/SyncStrategy.java | 2 +-
.../src/java/org/apache/solr/cloud/ZkCLI.java | 13 +-
.../org/apache/solr/cloud/ZkController.java | 3 +-
.../solr/cloud/overseer/ZkStateWriter.java | 4 +-
.../apache/solr/cloud/rule/SnitchContext.java | 3 +-
.../org/apache/solr/core/BlobRepository.java | 3 +-
.../org/apache/solr/core/ConfigSetService.java | 9 +-
.../org/apache/solr/core/CoreContainer.java | 113 +-
.../apache/solr/core/HdfsDirectoryFactory.java | 21 +-
.../org/apache/solr/core/JmxMonitoredMap.java | 23 +-
.../src/java/org/apache/solr/core/SolrCore.java | 83 +-
.../java/org/apache/solr/core/SolrCores.java | 25 +-
.../apache/solr/core/SolrDeletionPolicy.java | 16 +-
.../apache/solr/core/SolrInfoMBeanWrapper.java | 62 +
.../solr/handler/CdcrReplicatorManager.java | 18 +-
.../solr/handler/CdcrReplicatorScheduler.java | 19 +-
.../solr/handler/CdcrReplicatorState.java | 21 +-
.../apache/solr/handler/CdcrRequestHandler.java | 2 +-
.../solr/handler/CdcrUpdateLogSynchronizer.java | 2 +-
.../org/apache/solr/handler/IndexFetcher.java | 56 +-
.../solr/handler/MoreLikeThisHandler.java | 12 +-
.../apache/solr/handler/PingRequestHandler.java | 6 +-
.../apache/solr/handler/ReplicationHandler.java | 23 +-
.../apache/solr/handler/SolrConfigHandler.java | 3 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +
.../solr/handler/admin/CollectionsHandler.java | 3 +-
.../handler/component/HttpShardHandler.java | 100 +-
.../component/HttpShardHandlerFactory.java | 48 +-
.../component/IterativeMergeStrategy.java | 10 +-
.../solr/handler/component/PivotFacetValue.java | 3 +-
.../handler/component/RangeFacetRequest.java | 50 +-
.../request/PerSegmentSingleValuedFaceting.java | 9 +-
.../org/apache/solr/request/SimpleFacets.java | 35 +-
.../apache/solr/response/CSVResponseWriter.java | 10 +-
.../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 +-
.../apache/solr/schema/ManagedIndexSchema.java | 2 +-
.../schema/SpatialPointVectorFieldType.java | 23 +-
.../org/apache/solr/schema/TrieDateField.java | 5 +-
.../java/org/apache/solr/schema/TrieField.java | 32 +-
.../org/apache/solr/search/DocSetCollector.java | 84 +-
.../apache/solr/search/SolrFieldCacheMBean.java | 15 +-
.../apache/solr/search/ValueSourceParser.java | 37 +-
.../apache/solr/search/facet/FacetRange.java | 5 +-
.../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 +-
.../apache/solr/update/SolrCmdDistributor.java | 14 +-
.../solr/update/StreamingSolrClients.java | 66 +-
.../apache/solr/update/UpdateShardHandler.java | 57 +-
.../DocExpirationUpdateProcessorFactory.java | 42 +-
.../org/apache/solr/util/DateFormatUtil.java | 245 ----
.../org/apache/solr/util/DateMathParser.java | 88 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 44 +-
solr/core/src/test-files/log4j.properties | 4 +-
.../org/apache/solr/BasicFunctionalityTest.java | 29 +-
.../org/apache/solr/TestDistributedSearch.java | 12 +-
.../org/apache/solr/TestTolerantSearch.java | 6 +-
.../core/src/test/org/apache/solr/TestTrie.java | 13 +-
.../solr/client/solrj/ConnectionReuseTest.java | 195 +--
.../solrj/embedded/TestJettySolrRunner.java | 13 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 14 +-
.../solr/cloud/AsyncMigrateRouteKeyTest.java | 2 +-
.../solr/cloud/BaseCdcrDistributedZkTest.java | 13 +-
.../solr/cloud/BasicDistributedZk2Test.java | 6 +-
.../solr/cloud/BasicDistributedZkTest.java | 115 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 54 +-
.../apache/solr/cloud/CollectionReloadTest.java | 2 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 22 +-
.../solr/cloud/CollectionsAPISolrJTest.java | 2 +-
...ConcurrentDeleteAndCreateCollectionTest.java | 6 +-
.../apache/solr/cloud/CustomCollectionTest.java | 12 +-
.../solr/cloud/DeleteInactiveReplicaTest.java | 2 +-
.../apache/solr/cloud/DeleteReplicaTest.java | 4 +-
.../org/apache/solr/cloud/DeleteShardTest.java | 6 +-
.../solr/cloud/DistributedVersionInfoTest.java | 8 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 2 +-
.../cloud/FullSolrCloudDistribCmdsTest.java | 2 +-
.../apache/solr/cloud/HttpPartitionTest.java | 12 +-
.../cloud/LeaderFailoverAfterPartitionTest.java | 9 +-
.../LeaderInitiatedRecoveryOnCommitTest.java | 2 +-
...aderInitiatedRecoveryOnShardRestartTest.java | 2 +-
.../apache/solr/cloud/MigrateRouteKeyTest.java | 4 +-
.../solr/cloud/OverseerTaskQueueTest.java | 67 +
.../solr/cloud/ReplicationFactorTest.java | 2 +-
.../org/apache/solr/cloud/SSLMigrationTest.java | 4 +-
.../cloud/SegmentTerminateEarlyTestState.java | 6 +-
.../org/apache/solr/cloud/ShardSplitTest.java | 34 +-
.../org/apache/solr/cloud/SyncSliceTest.java | 2 +-
.../solr/cloud/TestAuthenticationFramework.java | 52 +-
.../solr/cloud/TestCloudDeleteByQuery.java | 22 +-
.../apache/solr/cloud/TestCloudPivotFacet.java | 23 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 20 +-
.../cloud/TestConfigSetsAPIExclusivity.java | 4 +-
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 4 +-
.../org/apache/solr/cloud/TestCryptoKeys.java | 2 +-
.../cloud/TestMiniSolrCloudClusterBase.java | 2 +-
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 +-
.../cloud/TestRandomRequestDistribution.java | 104 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 18 +-
.../cloud/TestRequestStatusCollectionAPI.java | 2 +-
.../cloud/TestSolrCloudWithKerberosAlt.java | 13 +-
.../apache/solr/cloud/TestStressLiveNodes.java | 252 ++++
.../cloud/TestTolerantUpdateProcessorCloud.java | 28 +-
.../TestTolerantUpdateProcessorRandomCloud.java | 65 +-
.../solr/cloud/UnloadDistributedZkTest.java | 30 +-
.../test/org/apache/solr/cloud/ZkCLITest.java | 41 +-
.../org/apache/solr/cloud/ZkControllerTest.java | 9 +-
.../HdfsWriteToMultipleCollectionsTest.java | 2 +-
.../apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +-
.../solr/cloud/overseer/ZkStateReaderTest.java | 5 +-
.../solr/core/OpenCloseCoreStressTest.java | 6 +-
.../org/apache/solr/core/TestCoreContainer.java | 1 -
.../apache/solr/core/TestDynamicLoading.java | 2 +-
.../apache/solr/core/TestJmxMonitoredMap.java | 37 +
.../solr/handler/TestReplicationHandler.java | 7 +-
.../handler/TestReplicationHandlerBackup.java | 5 +-
.../apache/solr/handler/TestRestoreCore.java | 5 +-
.../handler/admin/CoreAdminHandlerTest.java | 4 +-
.../DistributedDebugComponentTest.java | 6 +-
.../DistributedFacetPivotLargeTest.java | 3 +-
.../DistributedQueryElevationComponentTest.java | 4 +-
.../apache/solr/request/SimpleFacetsTest.java | 9 +-
.../solr/response/TestCSVResponseWriter.java | 14 +-
.../org/apache/solr/schema/DateFieldTest.java | 148 +-
.../solr/schema/TestUseDocValuesAsStored.java | 9 +-
.../solr/search/AnalyticsMergeStrategyTest.java | 7 +-
.../test/org/apache/solr/search/TestDocSet.java | 27 +-
.../org/apache/solr/search/TestRecovery.java | 7 +-
.../apache/solr/search/TestRecoveryHdfs.java | 13 +-
.../solr/search/TestSolrFieldCacheMBean.java | 36 +-
.../test/org/apache/solr/search/TestSolrJ.java | 4 +-
.../solr/search/stats/TestDistribIDF.java | 82 +-
.../solr/security/BasicAuthIntegrationTest.java | 42 +-
.../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/TestNamedUpdateProcessors.java | 3 +-
.../apache/solr/util/DateMathParserTest.java | 125 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 4 +-
.../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 | 244 +++-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 229 +++-
.../client/solrj/impl/HttpClientConfigurer.java | 100 --
.../solr/client/solrj/impl/HttpClientUtil.java | 438 +++---
.../solr/client/solrj/impl/HttpSolrClient.java | 196 +--
.../solrj/impl/Krb5HttpClientBuilder.java | 178 +++
.../solrj/impl/Krb5HttpClientConfigurer.java | 153 ---
.../client/solrj/impl/LBHttpSolrClient.java | 159 ++-
.../solrj/impl/SolrHttpClientBuilder.java | 91 ++
.../impl/SolrHttpClientContextBuilder.java | 96 ++
.../client/solrj/impl/XMLResponseParser.java | 27 +-
.../solr/client/solrj/io/SolrClientCache.java | 9 +-
.../client/solrj/io/comp/FieldComparator.java | 42 +-
.../solrj/io/graph/ShortestPathStream.java | 490 +++++++
.../client/solrj/io/graph/package-info.java | 22 +
.../solrj/io/sql/DatabaseMetaDataImpl.java | 4 +-
.../client/solrj/io/stream/CloudSolrStream.java | 7 +-
.../client/solrj/io/stream/FacetStream.java | 8 +-
.../solr/client/solrj/io/stream/SolrStream.java | 4 +-
.../client/solrj/io/stream/StatsStream.java | 7 +-
.../client/solrj/io/stream/TopicStream.java | 8 +-
.../client/solrj/io/stream/UpdateStream.java | 5 +-
.../client/solrj/io/stream/metrics/Bucket.java | 11 +-
.../solrj/request/CollectionAdminRequest.java | 61 +
.../solr/client/solrj/util/ClientUtils.java | 20 +-
.../solr/common/cloud/ZkConfigManager.java | 27 +-
.../apache/solr/common/cloud/ZkStateReader.java | 85 +-
.../org/apache/solr/common/util/DateUtil.java | 259 ----
solr/solrj/src/test-files/log4j.properties | 2 +
.../client/solrj/SolrExampleBinaryTest.java | 4 +-
.../solr/client/solrj/SolrExampleTests.java | 2 +-
.../solr/client/solrj/SolrExampleXMLTest.java | 4 +-
.../solr/client/solrj/SolrExceptionTest.java | 11 +-
.../apache/solr/client/solrj/SolrQueryTest.java | 18 +-
.../client/solrj/SolrSchemalessExampleTest.java | 9 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 23 +-
.../client/solrj/embedded/JettyWebappTest.java | 3 +-
.../solrj/embedded/SolrExampleJettyTest.java | 5 +-
.../embedded/SolrExampleStreamingTest.java | 23 +-
.../solrj/impl/BasicHttpSolrClientTest.java | 112 +-
.../solrj/impl/CloudSolrClientBuilderTest.java | 90 ++
.../client/solrj/impl/CloudSolrClientTest.java | 29 +-
.../ConcurrentUpdateSolrClientBuilderTest.java | 33 +
.../impl/ConcurrentUpdateSolrClientTest.java | 115 +-
.../solrj/impl/ExternalHttpClientTest.java | 75 -
.../client/solrj/impl/HttpClientUtilTest.java | 162 ---
.../solrj/impl/HttpSolrClientBuilderTest.java | 76 +
.../solrj/impl/LBHttpSolrClientBuilderTest.java | 65 +
.../client/solrj/impl/LBHttpSolrClientTest.java | 17 +-
.../solrj/io/graph/GraphExpressionTest.java | 404 ++++++
.../solr/client/solrj/io/graph/GraphTest.java | 387 ++++++
.../client/solrj/io/stream/StreamingTest.java | 48 +-
.../solr/client/solrj/request/SchemaTest.java | 9 +-
.../solrj/response/QueryResponseTest.java | 7 +-
.../solr/common/cloud/TestZkConfigManager.java | 7 +
.../apache/solr/common/util/TestDateUtil.java | 35 -
.../solr/BaseDistributedSearchTestCase.java | 63 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 20 +-
.../java/org/apache/solr/SolrTestCaseHS.java | 40 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 165 ++-
.../cloud/AbstractFullDistribZkTestBase.java | 22 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 19 +-
.../org/apache/solr/util/RestTestHarness.java | 4 +-
.../org/apache/solr/util/SSLTestConfig.java | 79 +-
solr/webapp/web/index.html | 2 +-
solr/webapp/web/js/angular/controllers/query.js | 9 +-
solr/webapp/web/js/angular/services.js | 4 +-
458 files changed, 16079 insertions(+), 7382 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c948a905/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------