You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2016/03/19 02:29:37 UTC
[2/3] lucene-solr:solr-5750: Merge branch 'master' into solr5750
Merge branch 'master' into solr5750
# Conflicts:
# solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/31a28f3d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/31a28f3d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/31a28f3d
Branch: refs/heads/solr-5750
Commit: 31a28f3da8e071b90f9856400394d17993df45d5
Parents: 1a3e752 a22099a
Author: David Smiley <ds...@apache.org>
Authored: Fri Mar 18 17:27:36 2016 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Fri Mar 18 17:27:36 2016 -0400
----------------------------------------------------------------------
dev-tools/idea/solr/core/src/java/solr-core.iml | 1 +
.../idea/solr/core/src/solr-core-tests.iml | 1 +
dev-tools/scripts/buildAndPushRelease.py | 2 +-
dev-tools/scripts/smokeTestRelease.py | 5 +-
lucene/CHANGES.txt | 46 +-
lucene/MIGRATE.txt | 14 +-
.../lucene/codecs/lucene50/Lucene50Codec.java | 6 +-
.../lucene/codecs/lucene53/Lucene53Codec.java | 8 +-
.../lucene/codecs/lucene54/Lucene54Codec.java | 8 +-
.../lucene50/TestLucene50DocValuesFormat.java | 2 +-
.../index/TestBackwardsCompatibility.java | 2 +-
.../lucene/benchmark/byTask/feeds/DocMaker.java | 44 +-
.../benchmark/byTask/tasks/ReadTokensTask.java | 13 +-
lucene/build.xml | 2 +-
.../classification/ClassificationTestBase.java | 7 +-
.../DocumentClassificationTestBase.java | 4 +-
.../classification/utils/DataSplitterTest.java | 5 +-
.../lucene/codecs/memory/FSTTermsWriter.java | 2 +-
.../codecs/simpletext/SimpleTextBKDReader.java | 6 +-
.../codecs/simpletext/SimpleTextCodec.java | 8 +-
.../simpletext/SimpleTextPointFormat.java | 53 -
.../simpletext/SimpleTextPointReader.java | 302 ----
.../simpletext/SimpleTextPointWriter.java | 241 ---
.../simpletext/SimpleTextPointsFormat.java | 53 +
.../simpletext/SimpleTextPointsReader.java | 302 ++++
.../simpletext/SimpleTextPointsWriter.java | 244 +++
.../simpletext/TestSimpleTextPointFormat.java | 33 -
.../simpletext/TestSimpleTextPointsFormat.java | 33 +
.../java/org/apache/lucene/codecs/Codec.java | 2 +-
.../org/apache/lucene/codecs/FilterCodec.java | 4 +-
.../org/apache/lucene/codecs/PointFormat.java | 111 --
.../org/apache/lucene/codecs/PointReader.java | 51 -
.../org/apache/lucene/codecs/PointWriter.java | 144 --
.../org/apache/lucene/codecs/PointsFormat.java | 111 ++
.../org/apache/lucene/codecs/PointsReader.java | 51 +
.../org/apache/lucene/codecs/PointsWriter.java | 169 ++
.../lucene54/Lucene54DocValuesConsumer.java | 21 +-
.../lucene/codecs/lucene60/Lucene60Codec.java | 6 +-
.../codecs/lucene60/Lucene60PointFormat.java | 106 --
.../codecs/lucene60/Lucene60PointReader.java | 241 ---
.../codecs/lucene60/Lucene60PointWriter.java | 220 ---
.../codecs/lucene60/Lucene60PointsFormat.java | 106 ++
.../codecs/lucene60/Lucene60PointsReader.java | 241 +++
.../codecs/lucene60/Lucene60PointsWriter.java | 241 +++
.../lucene/codecs/lucene60/package-info.java | 11 +-
.../org/apache/lucene/document/BinaryPoint.java | 2 +
.../org/apache/lucene/document/Document.java | 6 +-
.../org/apache/lucene/document/DoublePoint.java | 26 +-
.../java/org/apache/lucene/document/Field.java | 19 +-
.../org/apache/lucene/document/FieldType.java | 24 +-
.../org/apache/lucene/document/FloatPoint.java | 26 +-
.../org/apache/lucene/document/IntPoint.java | 26 +-
.../org/apache/lucene/document/LongPoint.java | 24 +-
.../document/SortedNumericDocValuesField.java | 4 +-
.../org/apache/lucene/index/CheckIndex.java | 17 +-
.../org/apache/lucene/index/CodecReader.java | 19 +-
.../apache/lucene/index/CompositeReader.java | 2 -
.../lucene/index/DefaultIndexingChain.java | 22 +-
.../java/org/apache/lucene/index/FieldInfo.java | 2 +-
.../apache/lucene/index/FilterCodecReader.java | 8 +-
.../apache/lucene/index/FilterLeafReader.java | 10 +-
.../org/apache/lucene/index/IndexReader.java | 2 -
.../org/apache/lucene/index/IndexWriter.java | 1 +
.../org/apache/lucene/index/LeafReader.java | 2 +-
.../org/apache/lucene/index/MergeState.java | 12 +-
.../org/apache/lucene/index/MultiDocValues.java | 6 +-
.../org/apache/lucene/index/PointValues.java | 142 +-
.../apache/lucene/index/PointValuesWriter.java | 24 +-
.../apache/lucene/index/SegmentCoreReaders.java | 10 +-
.../org/apache/lucene/index/SegmentMerger.java | 4 +-
.../org/apache/lucene/index/SegmentReader.java | 8 +-
.../index/SingletonSortedSetDocValues.java | 1 -
.../lucene/index/SlowCodecReaderWrapper.java | 8 +-
.../index/SlowCompositeReaderWrapper.java | 271 ---
.../apache/lucene/search/FilterCollector.java | 2 +-
.../lucene/search/FilterLeafCollector.java | 2 +-
.../lucene/search/LegacyNumericRangeQuery.java | 12 +-
.../apache/lucene/search/PointInSetQuery.java | 23 +-
.../apache/lucene/search/PointRangeQuery.java | 194 +-
.../apache/lucene/store/FilterDirectory.java | 2 +-
.../org/apache/lucene/util/ByteBlockPool.java | 22 +
.../org/apache/lucene/util/BytesRefArray.java | 41 +-
.../org/apache/lucene/util/IntroSorter.java | 6 +-
.../org/apache/lucene/util/OfflineSorter.java | 47 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 226 +--
.../apache/lucene/util/bkd/HeapPointReader.java | 17 +-
.../apache/lucene/util/bkd/HeapPointWriter.java | 47 +-
.../lucene/util/bkd/OfflinePointReader.java | 102 +-
.../lucene/util/bkd/OfflinePointWriter.java | 24 +-
.../org/apache/lucene/util/bkd/PointReader.java | 37 +-
.../lucene54/TestLucene54DocValuesFormat.java | 6 +-
.../lucene60/TestLucene60PointFormat.java | 83 -
.../lucene60/TestLucene60PointsFormat.java | 83 +
.../apache/lucene/document/TestDocument.java | 4 +-
.../apache/lucene/document/TestFieldType.java | 15 +-
.../org/apache/lucene/index/Test2BPoints.java | 148 ++
.../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 | 10 +-
.../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 | 166 +-
.../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 | 159 +-
.../lucene/search/TestPositionIncrement.java | 10 +-
.../lucene/search/TestSimilarityProvider.java | 11 +-
.../apache/lucene/search/TestTermScorer.java | 9 +-
.../TestUsageTrackingFilterCachingPolicy.java | 17 +-
.../search/spans/TestFieldMaskingSpanQuery.java | 11 +-
.../search/spans/TestNearSpansOrdered.java | 29 +-
.../lucene/search/spans/TestSpanCollection.java | 11 +-
.../search/spans/TestSpanContainQuery.java | 7 +-
.../apache/lucene/search/spans/TestSpans.java | 13 +-
.../lucene/store/TestFilterDirectory.java | 4 +-
.../lucene/store/TestNRTCachingDirectory.java | 2 +-
.../apache/lucene/util/TestOfflineSorter.java | 2 +-
.../apache/lucene/util/bkd/Test2BBKDPoints.java | 121 ++
.../org/apache/lucene/util/bkd/TestBKD.java | 22 +-
.../org/apache/lucene/util/fst/TestFSTs.java | 2 +-
.../apache/lucene/facet/range/DoubleRange.java | 3 +-
.../DefaultSortedSetDocValuesReaderState.java | 55 +-
.../facet/range/TestRangeFacetCounts.java | 194 +-
.../sortedset/TestSortedSetDocValuesFacets.java | 36 -
.../lucene/search/grouping/TestGrouping.java | 12 +-
lucene/ivy-versions.properties | 2 +-
.../lucene/search/join/TestBlockJoin.java | 87 +-
.../apache/lucene/search/join/TestJoinUtil.java | 8 +-
.../jetty-continuation-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-http-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.6.v20151106.jar.sha1 | 1 -
.../licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-server-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-servlet-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-util-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 +
.../apache/lucene/index/memory/MemoryIndex.java | 628 +++++--
.../lucene/index/memory/TestMemoryIndex.java | 293 ++++
.../memory/TestMemoryIndexAgainstRAMDir.java | 204 ++-
.../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 +-
.../queries/function/FunctionTestSetup.java | 8 +-
.../queries/function/TestFunctionQuerySort.java | 4 +-
.../function/TestSortedSetFieldSource.java | 2 +-
.../queries/function/TestValueSources.java | 16 -
.../lucene/queries/payloads/PayloadHelper.java | 3 +-
.../queries/payloads/TestPayloadSpans.java | 42 +-
.../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 +-
.../apache/lucene/document/BigIntegerPoint.java | 2 +
.../lucene/document/InetAddressPoint.java | 25 +-
.../org/apache/lucene/document/LatLonPoint.java | 80 +-
.../document/LatLonPointDistanceComparator.java | 213 +++
.../document/LatLonPointDistanceQuery.java | 150 +-
.../document/LatLonPointInPolygonQuery.java | 65 +-
.../lucene/document/LatLonPointSortField.java | 106 ++
.../lucene/document/TestBigIntegerPoint.java | 19 +-
.../lucene/document/TestInetAddressPoint.java | 25 +-
.../apache/lucene/document/TestLatLonPoint.java | 35 +-
.../document/TestLatLonPointDistanceQuery.java | 28 +-
.../document/TestLatLonPointDistanceSort.java | 289 +++
.../document/TestLatLonPointInPolygonQuery.java | 49 +
.../lucene/search/TestLatLonPointQueries.java | 86 +-
.../lucene/spatial/spatial4j/Geo3dShape.java | 12 +-
.../apache/lucene/spatial/SpatialTestCase.java | 4 +-
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 14 +-
.../Geo3dShapeRectRelationTestCase.java | 18 +-
.../Geo3dShapeSphereModelRectRelationTest.java | 16 +-
.../Geo3dShapeWGS84ModelRectRelationTest.java | 16 +-
.../spatial/spatial4j/geo3d/GeoPointTest.java | 80 -
.../org/apache/lucene/spatial/util/GeoRect.java | 5 +
.../org/apache/lucene/geo3d/ArcDistance.java | 56 -
.../apache/lucene/geo3d/BasePlanetObject.java | 52 -
.../org/apache/lucene/geo3d/BaseXYZSolid.java | 167 --
.../java/org/apache/lucene/geo3d/Bounds.java | 113 --
.../org/apache/lucene/geo3d/DistanceStyle.java | 83 -
.../org/apache/lucene/geo3d/Geo3DPoint.java | 117 --
.../java/org/apache/lucene/geo3d/Geo3DUtil.java | 59 -
.../java/org/apache/lucene/geo3d/GeoArea.java | 67 -
.../org/apache/lucene/geo3d/GeoAreaFactory.java | 55 -
.../java/org/apache/lucene/geo3d/GeoBBox.java | 36 -
.../org/apache/lucene/geo3d/GeoBBoxFactory.java | 111 --
.../org/apache/lucene/geo3d/GeoBaseBBox.java | 72 -
.../org/apache/lucene/geo3d/GeoBaseCircle.java | 34 -
.../lucene/geo3d/GeoBaseDistanceShape.java | 56 -
.../lucene/geo3d/GeoBaseMembershipShape.java | 56 -
.../org/apache/lucene/geo3d/GeoBasePolygon.java | 34 -
.../org/apache/lucene/geo3d/GeoBaseShape.java | 59 -
.../java/org/apache/lucene/geo3d/GeoCircle.java | 25 -
.../apache/lucene/geo3d/GeoCircleFactory.java | 43 -
.../geo3d/GeoCompositeMembershipShape.java | 117 --
.../lucene/geo3d/GeoCompositePolygon.java | 31 -
.../apache/lucene/geo3d/GeoConvexPolygon.java | 288 ---
.../geo3d/GeoDegenerateHorizontalLine.java | 215 ---
.../lucene/geo3d/GeoDegenerateLatitudeZone.java | 138 --
.../geo3d/GeoDegenerateLongitudeSlice.java | 153 --
.../apache/lucene/geo3d/GeoDegeneratePoint.java | 135 --
.../lucene/geo3d/GeoDegenerateVerticalLine.java | 205 ---
.../org/apache/lucene/geo3d/GeoDistance.java | 59 -
.../apache/lucene/geo3d/GeoDistanceShape.java | 27 -
.../apache/lucene/geo3d/GeoLatitudeZone.java | 198 ---
.../apache/lucene/geo3d/GeoLongitudeSlice.java | 204 ---
.../apache/lucene/geo3d/GeoMembershipShape.java | 27 -
.../lucene/geo3d/GeoNorthLatitudeZone.java | 165 --
.../apache/lucene/geo3d/GeoNorthRectangle.java | 263 ---
.../apache/lucene/geo3d/GeoOutsideDistance.java | 55 -
.../java/org/apache/lucene/geo3d/GeoPath.java | 797 ---------
.../java/org/apache/lucene/geo3d/GeoPoint.java | 193 --
.../org/apache/lucene/geo3d/GeoPolygon.java | 26 -
.../apache/lucene/geo3d/GeoPolygonFactory.java | 187 --
.../org/apache/lucene/geo3d/GeoRectangle.java | 288 ---
.../java/org/apache/lucene/geo3d/GeoShape.java | 63 -
.../org/apache/lucene/geo3d/GeoSizeable.java | 40 -
.../lucene/geo3d/GeoSouthLatitudeZone.java | 168 --
.../apache/lucene/geo3d/GeoSouthRectangle.java | 259 ---
.../apache/lucene/geo3d/GeoStandardCircle.java | 168 --
.../geo3d/GeoWideDegenerateHorizontalLine.java | 238 ---
.../lucene/geo3d/GeoWideLongitudeSlice.java | 208 ---
.../lucene/geo3d/GeoWideNorthRectangle.java | 286 ---
.../apache/lucene/geo3d/GeoWideRectangle.java | 319 ----
.../lucene/geo3d/GeoWideSouthRectangle.java | 284 ---
.../java/org/apache/lucene/geo3d/GeoWorld.java | 106 --
.../org/apache/lucene/geo3d/LatLonBounds.java | 322 ----
.../org/apache/lucene/geo3d/LinearDistance.java | 56 -
.../lucene/geo3d/LinearSquaredDistance.java | 56 -
.../org/apache/lucene/geo3d/Membership.java | 46 -
.../org/apache/lucene/geo3d/NormalDistance.java | 56 -
.../lucene/geo3d/NormalSquaredDistance.java | 56 -
.../src/java/org/apache/lucene/geo3d/Plane.java | 1657 ------------------
.../org/apache/lucene/geo3d/PlanetModel.java | 277 ---
.../lucene/geo3d/PointInGeo3DShapeQuery.java | 212 ---
.../org/apache/lucene/geo3d/SidedPlane.java | 175 --
.../apache/lucene/geo3d/StandardXYZSolid.java | 417 -----
.../src/java/org/apache/lucene/geo3d/Tools.java | 41 -
.../java/org/apache/lucene/geo3d/Vector.java | 378 ----
.../java/org/apache/lucene/geo3d/XYZBounds.java | 267 ---
.../java/org/apache/lucene/geo3d/XYZSolid.java | 26 -
.../apache/lucene/geo3d/XYZSolidFactory.java | 67 -
.../java/org/apache/lucene/geo3d/XYdZSolid.java | 213 ---
.../java/org/apache/lucene/geo3d/XdYZSolid.java | 212 ---
.../org/apache/lucene/geo3d/XdYdZSolid.java | 138 --
.../java/org/apache/lucene/geo3d/dXYZSolid.java | 216 ---
.../org/apache/lucene/geo3d/dXYdZSolid.java | 138 --
.../org/apache/lucene/geo3d/dXdYZSolid.java | 138 --
.../org/apache/lucene/geo3d/dXdYdZSolid.java | 146 --
.../org/apache/lucene/geo3d/package-info.java | 21 -
.../org/apache/lucene/spatial3d/Geo3DPoint.java | 115 ++
.../org/apache/lucene/spatial3d/Geo3DUtil.java | 59 +
.../spatial3d/PointInGeo3DShapeQuery.java | 215 +++
.../lucene/spatial3d/geom/ArcDistance.java | 56 +
.../lucene/spatial3d/geom/BasePlanetObject.java | 57 +
.../lucene/spatial3d/geom/BaseXYZSolid.java | 167 ++
.../apache/lucene/spatial3d/geom/Bounds.java | 113 ++
.../lucene/spatial3d/geom/DistanceStyle.java | 83 +
.../apache/lucene/spatial3d/geom/GeoArea.java | 67 +
.../lucene/spatial3d/geom/GeoAreaFactory.java | 55 +
.../apache/lucene/spatial3d/geom/GeoBBox.java | 36 +
.../lucene/spatial3d/geom/GeoBBoxFactory.java | 111 ++
.../lucene/spatial3d/geom/GeoBaseBBox.java | 72 +
.../lucene/spatial3d/geom/GeoBaseCircle.java | 34 +
.../spatial3d/geom/GeoBaseDistanceShape.java | 56 +
.../spatial3d/geom/GeoBaseMembershipShape.java | 56 +
.../lucene/spatial3d/geom/GeoBasePolygon.java | 34 +
.../lucene/spatial3d/geom/GeoBaseShape.java | 59 +
.../apache/lucene/spatial3d/geom/GeoCircle.java | 25 +
.../lucene/spatial3d/geom/GeoCircleFactory.java | 43 +
.../geom/GeoCompositeMembershipShape.java | 117 ++
.../spatial3d/geom/GeoCompositePolygon.java | 31 +
.../lucene/spatial3d/geom/GeoConvexPolygon.java | 288 +++
.../geom/GeoDegenerateHorizontalLine.java | 215 +++
.../geom/GeoDegenerateLatitudeZone.java | 138 ++
.../geom/GeoDegenerateLongitudeSlice.java | 153 ++
.../spatial3d/geom/GeoDegeneratePoint.java | 135 ++
.../geom/GeoDegenerateVerticalLine.java | 205 +++
.../lucene/spatial3d/geom/GeoDistance.java | 59 +
.../lucene/spatial3d/geom/GeoDistanceShape.java | 27 +
.../lucene/spatial3d/geom/GeoLatitudeZone.java | 198 +++
.../spatial3d/geom/GeoLongitudeSlice.java | 204 +++
.../spatial3d/geom/GeoMembershipShape.java | 27 +
.../spatial3d/geom/GeoNorthLatitudeZone.java | 165 ++
.../spatial3d/geom/GeoNorthRectangle.java | 263 +++
.../spatial3d/geom/GeoOutsideDistance.java | 55 +
.../apache/lucene/spatial3d/geom/GeoPath.java | 797 +++++++++
.../apache/lucene/spatial3d/geom/GeoPoint.java | 193 ++
.../lucene/spatial3d/geom/GeoPolygon.java | 26 +
.../spatial3d/geom/GeoPolygonFactory.java | 187 ++
.../lucene/spatial3d/geom/GeoRectangle.java | 288 +++
.../apache/lucene/spatial3d/geom/GeoShape.java | 63 +
.../lucene/spatial3d/geom/GeoSizeable.java | 40 +
.../spatial3d/geom/GeoSouthLatitudeZone.java | 168 ++
.../spatial3d/geom/GeoSouthRectangle.java | 259 +++
.../spatial3d/geom/GeoStandardCircle.java | 168 ++
.../geom/GeoWideDegenerateHorizontalLine.java | 238 +++
.../spatial3d/geom/GeoWideLongitudeSlice.java | 208 +++
.../spatial3d/geom/GeoWideNorthRectangle.java | 286 +++
.../lucene/spatial3d/geom/GeoWideRectangle.java | 319 ++++
.../spatial3d/geom/GeoWideSouthRectangle.java | 284 +++
.../apache/lucene/spatial3d/geom/GeoWorld.java | 106 ++
.../lucene/spatial3d/geom/LatLonBounds.java | 322 ++++
.../lucene/spatial3d/geom/LinearDistance.java | 56 +
.../spatial3d/geom/LinearSquaredDistance.java | 56 +
.../lucene/spatial3d/geom/Membership.java | 46 +
.../lucene/spatial3d/geom/NormalDistance.java | 56 +
.../spatial3d/geom/NormalSquaredDistance.java | 56 +
.../org/apache/lucene/spatial3d/geom/Plane.java | 1657 ++++++++++++++++++
.../lucene/spatial3d/geom/PlanetModel.java | 277 +++
.../lucene/spatial3d/geom/SidedPlane.java | 175 ++
.../lucene/spatial3d/geom/StandardXYZSolid.java | 417 +++++
.../org/apache/lucene/spatial3d/geom/Tools.java | 41 +
.../apache/lucene/spatial3d/geom/Vector.java | 378 ++++
.../apache/lucene/spatial3d/geom/XYZBounds.java | 267 +++
.../apache/lucene/spatial3d/geom/XYZSolid.java | 26 +
.../lucene/spatial3d/geom/XYZSolidFactory.java | 67 +
.../apache/lucene/spatial3d/geom/XYdZSolid.java | 213 +++
.../apache/lucene/spatial3d/geom/XdYZSolid.java | 212 +++
.../lucene/spatial3d/geom/XdYdZSolid.java | 138 ++
.../apache/lucene/spatial3d/geom/dXYZSolid.java | 216 +++
.../lucene/spatial3d/geom/dXYdZSolid.java | 138 ++
.../lucene/spatial3d/geom/dXdYZSolid.java | 138 ++
.../lucene/spatial3d/geom/dXdYdZSolid.java | 146 ++
.../lucene/spatial3d/geom/package-info.java | 22 +
.../apache/lucene/spatial3d/package-info.java | 21 +
lucene/spatial3d/src/java/overview.html | 3 +-
.../org/apache/lucene/geo3d/GeoBBoxTest.java | 364 ----
.../org/apache/lucene/geo3d/GeoCircleTest.java | 415 -----
.../lucene/geo3d/GeoConvexPolygonTest.java | 91 -
.../org/apache/lucene/geo3d/GeoModelTest.java | 110 --
.../org/apache/lucene/geo3d/GeoPathTest.java | 270 ---
.../org/apache/lucene/geo3d/GeoPolygonTest.java | 165 --
.../test/org/apache/lucene/geo3d/PlaneTest.java | 64 -
.../org/apache/lucene/geo3d/TestGeo3DPoint.java | 804 ---------
.../org/apache/lucene/geo3d/XYZSolidTest.java | 220 ---
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 824 +++++++++
.../lucene/spatial3d/geom/GeoBBoxTest.java | 364 ++++
.../lucene/spatial3d/geom/GeoCircleTest.java | 410 +++++
.../spatial3d/geom/GeoConvexPolygonTest.java | 91 +
.../lucene/spatial3d/geom/GeoModelTest.java | 110 ++
.../lucene/spatial3d/geom/GeoPathTest.java | 270 +++
.../lucene/spatial3d/geom/GeoPointTest.java | 77 +
.../lucene/spatial3d/geom/GeoPolygonTest.java | 165 ++
.../apache/lucene/spatial3d/geom/PlaneTest.java | 64 +
.../lucene/spatial3d/geom/XYZSolidTest.java | 220 +++
.../search/suggest/SortedInputIterator.java | 16 +-
.../analyzing/TestFreeTextSuggester.java | 2 +-
.../lucene/codecs/asserting/AssertingCodec.java | 8 +-
.../codecs/asserting/AssertingPointFormat.java | 276 ---
.../codecs/asserting/AssertingPointsFormat.java | 276 +++
.../lucene/codecs/cranky/CrankyCodec.java | 6 +-
.../lucene/codecs/cranky/CrankyPointFormat.java | 185 --
.../codecs/cranky/CrankyPointsFormat.java | 185 ++
.../index/BaseDocValuesFormatTestCase.java | 64 +-
.../index/BaseIndexFileFormatTestCase.java | 6 +-
.../lucene/index/BasePointFormatTestCase.java | 950 ----------
.../lucene/index/BasePointsFormatTestCase.java | 950 ++++++++++
.../index/BasePostingsFormatTestCase.java | 66 +-
.../index/BaseStoredFieldsFormatTestCase.java | 55 +-
.../index/BaseTermVectorsFormatTestCase.java | 12 +-
.../lucene/index/MockRandomMergePolicy.java | 2 +-
.../org/apache/lucene/index/RandomCodec.java | 24 +-
.../ThreadedIndexingAndSearchingTestCase.java | 4 +-
.../lucene/mockfile/FilterFileChannel.java | 2 +-
.../apache/lucene/mockfile/FilterFileStore.java | 2 +-
.../lucene/mockfile/FilterFileSystem.java | 2 +-
.../mockfile/FilterFileSystemProvider.java | 2 +-
.../lucene/mockfile/FilterOutputStream2.java | 2 +-
.../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 | 37 +-
.../lucene/analysis/TestMockAnalyzer.java | 2 +-
.../asserting/TestAssertingPointFormat.java | 30 -
.../asserting/TestAssertingPointsFormat.java | 30 +
.../TestCompressingStoredFieldsFormat.java | 5 +-
.../TestCompressingTermVectorsFormat.java | 8 +-
.../lucene/index/TestAssertingLeafReader.java | 5 +-
lucene/tools/javadoc/ecj.javadocs.prefs | 4 +-
lucene/tools/junit4/cached-timehints.txt | 2 +-
solr/CHANGES.txt | 84 +-
solr/build.xml | 16 +-
solr/common-build.xml | 4 +-
.../solr/hadoop/MorphlineGoLiveMiniMRTest.java | 1 -
.../solr/collection1/conf/solrconfig.xml | 6 -
.../test-files/solr/minimr/conf/solrconfig.xml | 6 -
.../test-files/solr/mrunit/conf/solrconfig.xml | 7 -
.../collection1/conf/solrconfig.xml | 6 -
.../solr/solrcloud/conf/solrconfig.xml | 6 -
.../org/apache/solr/cloud/ElectionContext.java | 2 +-
.../cloud/LeaderInitiatedRecoveryThread.java | 6 -
.../cloud/OverseerCollectionMessageHandler.java | 9 +-
.../org/apache/solr/cloud/ZkController.java | 2 +-
.../org/apache/solr/core/CoreContainer.java | 15 +-
.../src/java/org/apache/solr/core/SolrCore.java | 64 +-
.../apache/solr/handler/CdcrRequestHandler.java | 2 +-
.../org/apache/solr/handler/RestoreCore.java | 6 +-
.../org/apache/solr/handler/SchemaHandler.java | 78 +-
.../solr/handler/admin/ClusterStatus.java | 19 +-
.../solr/handler/admin/CollectionsHandler.java | 105 +-
.../solr/handler/admin/CoreAdminOperation.java | 4 +-
.../solr/handler/admin/LukeRequestHandler.java | 12 +-
.../solr/handler/admin/RebalanceLeaders.java | 2 +-
.../apache/solr/handler/loader/JsonLoader.java | 6 +-
.../org/apache/solr/request/SimpleFacets.java | 12 +-
.../solr/response/GeoJSONResponseWriter.java | 345 ++++
.../solr/response/JSONResponseWriter.java | 2 +-
.../transform/GeoTransformerFactory.java | 224 +++
.../response/transform/TransformerFactory.java | 1 +
.../response/transform/WriteableGeoJSON.java | 55 +
.../org/apache/solr/rest/SolrSchemaRestApi.java | 56 +-
.../solr/rest/schema/BaseFieldResource.java | 146 --
.../solr/rest/schema/BaseFieldTypeResource.java | 98 --
.../schema/CopyFieldCollectionResource.java | 198 ---
.../schema/DynamicFieldCollectionResource.java | 207 ---
.../solr/rest/schema/DynamicFieldResource.java | 197 ---
.../rest/schema/FieldCollectionResource.java | 225 ---
.../apache/solr/rest/schema/FieldResource.java | 201 ---
.../schema/FieldTypeCollectionResource.java | 197 ---
.../solr/rest/schema/FieldTypeResource.java | 203 ---
.../solr/schema/AbstractSpatialFieldType.java | 87 +-
.../org/apache/solr/schema/DateRangeField.java | 4 +-
.../java/org/apache/solr/schema/EnumField.java | 2 +-
.../org/apache/solr/schema/IndexSchema.java | 11 +-
.../java/org/apache/solr/schema/TrieField.java | 8 +-
.../apache/solr/search/SolrIndexSearcher.java | 4 +-
.../apache/solr/search/facet/FacetField.java | 13 +-
.../solr/search/facet/UnInvertedField.java | 9 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 3 +
.../org/apache/solr/update/SolrCoreState.java | 8 +-
.../org/apache/solr/update/TransactionLog.java | 4 +-
.../org/apache/solr/update/VersionInfo.java | 8 +-
.../ClassificationUpdateProcessor.java | 102 ++
.../ClassificationUpdateProcessorFactory.java | 223 +++
.../collection1/conf/schema-classification.xml | 43 +
.../conf/schema-non-stored-docvalues.xml | 131 +-
.../solr/collection1/conf/schema-spatial.xml | 1 +
.../conf/solrconfig-classification.xml | 53 +
.../configsets/cloud-minimal/conf/schema.xml | 32 +
.../cloud-minimal/conf/solrconfig.xml | 48 +
.../org/apache/solr/TestRandomDVFaceting.java | 3 -
.../solr/cloud/BaseCdcrDistributedZkTest.java | 1 -
.../solr/cloud/BasicDistributedZkTest.java | 4 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 2 +-
.../solr/cloud/ChaosMonkeyShardSplitTest.java | 2 +-
.../apache/solr/cloud/CollectionReloadTest.java | 2 +-
.../cloud/CollectionTooManyReplicasTest.java | 6 +-
.../CollectionsAPIAsyncDistributedZkTest.java | 174 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 9 +-
.../solr/cloud/CollectionsAPISolrJTest.java | 474 +++++
.../solr/cloud/CollectionsAPISolrJTests.java | 472 -----
.../apache/solr/cloud/CustomCollectionTest.java | 1 -
.../org/apache/solr/cloud/DeleteShardTest.java | 2 -
.../org/apache/solr/cloud/DeleteStatusTest.java | 172 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 11 +-
.../apache/solr/cloud/HttpPartitionTest.java | 9 +-
.../cloud/LeaderFailoverAfterPartitionTest.java | 2 -
.../LeaderInitiatedRecoveryOnCommitTest.java | 4 +-
.../apache/solr/cloud/MigrateRouteKeyTest.java | 4 +-
.../org/apache/solr/cloud/OverseerTest.java | 12 +-
.../solr/cloud/ReplicaPropertiesBase.java | 3 -
.../org/apache/solr/cloud/ShardSplitTest.java | 1 -
.../apache/solr/cloud/SolrCloudExampleTest.java | 1 -
.../org/apache/solr/cloud/SyncSliceTest.java | 1 -
.../solr/cloud/TestCloudDeleteByQuery.java | 1 -
.../apache/solr/cloud/TestCollectionAPI.java | 23 +-
.../TestLeaderInitiatedRecoveryThread.java | 1 -
.../solr/cloud/TestMiniSolrCloudCluster.java | 47 +-
.../cloud/TestMiniSolrCloudClusterBase.java | 3 +-
.../cloud/TestRandomRequestDistribution.java | 4 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 1 -
.../solr/cloud/TestReplicaProperties.java | 1 -
.../cloud/TestSolrCloudWithKerberosAlt.java | 1 +
.../solr/cloud/UnloadDistributedZkTest.java | 4 +-
.../org/apache/solr/cloud/ZkControllerTest.java | 2 +-
.../apache/solr/cloud/hdfs/StressHdfsTest.java | 3 +-
.../solr/cloud/overseer/ZkStateReaderTest.java | 6 +-
.../solr/cloud/overseer/ZkStateWriterTest.java | 10 +-
.../org/apache/solr/handler/JsonLoaderTest.java | 20 +
.../apache/solr/handler/TestRestoreCore.java | 55 +-
.../apache/solr/request/SimpleFacetsTest.java | 12 +-
.../org/apache/solr/request/TestFaceting.java | 8 +-
.../response/TestGeoJSONResponseWriter.java | 279 +++
.../rest/schema/TestClassNameShortening.java | 3 +-
.../schema/TestCopyFieldCollectionResource.java | 96 +-
.../TestDynamicFieldCollectionResource.java | 29 -
.../rest/schema/TestDynamicFieldResource.java | 7 -
.../schema/TestFieldCollectionResource.java | 45 -
.../solr/rest/schema/TestFieldResource.java | 23 +-
.../schema/TestFieldTypeCollectionResource.java | 1 +
.../solr/rest/schema/TestFieldTypeResource.java | 17 +-
.../TestManagedSchemaDynamicFieldResource.java | 366 ----
.../schema/TestManagedSchemaFieldResource.java | 369 ----
.../TestManagedSchemaFieldTypeResource.java | 350 ----
.../schema/TestRemoveLastDynamicCopyField.java | 80 -
.../schema/TestSchemaSimilarityResource.java | 1 -
.../analysis/TestManagedStopFilterFactory.java | 2 +-
.../TestManagedSynonymFilterFactory.java | 6 +-
.../solr/schema/SpatialRPTFieldTypeTest.java | 38 +-
.../TestCloudManagedSchemaConcurrent.java | 3 +-
.../solr/schema/TestUseDocValuesAsStored.java | 217 ++-
.../solr/search/facet/TestJsonFacets.java | 71 +-
.../solr/security/BasicAuthIntegrationTest.java | 2 +-
.../solr/update/DirectUpdateHandlerTest.java | 2 +-
.../test/org/apache/solr/update/TestUpdate.java | 21 +
...lassificationUpdateProcessorFactoryTest.java | 234 +++
.../example-DIH/solr/db/conf/solrconfig.xml | 6 -
.../example-DIH/solr/mail/conf/solrconfig.xml | 6 -
.../example-DIH/solr/rss/conf/solrconfig.xml | 6 -
.../example-DIH/solr/solr/conf/solrconfig.xml | 6 -
.../example-DIH/solr/tika/conf/solrconfig.xml | 7 -
solr/example/files/conf/solrconfig.xml | 6 -
.../jetty-continuation-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-deploy-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-deploy-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-http-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 +
solr/licenses/jetty-io-9.3.6.v20151106.jar.sha1 | 1 -
solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 +
.../licenses/jetty-jmx-9.3.6.v20151106.jar.sha1 | 1 -
.../licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-rewrite-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-rewrite-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-security-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-security-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-server-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-servlet-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-servlets-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-servlets-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-util-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-webapp-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-webapp-9.3.8.v20160314.jar.sha1 | 1 +
.../licenses/jetty-xml-9.3.6.v20151106.jar.sha1 | 1 -
.../licenses/jetty-xml-9.3.8.v20160314.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
.../basic_configs/conf/managed-schema | 32 +-
.../basic_configs/conf/solrconfig.xml | 5 -
.../conf/managed-schema | 53 +-
.../conf/solrconfig.xml | 7 -
.../conf/managed-schema | 43 +-
.../conf/solrconfig.xml | 6 -
.../solr/client/solrj/io/sql/ResultSetImpl.java | 2 +-
.../client/solrj/io/stream/DaemonStream.java | 6 +-
.../solrj/request/CollectionAdminRequest.java | 1211 ++++++++++---
.../client/solrj/request/CoreAdminRequest.java | 23 +-
.../solrj/util/SolrIdentifierValidator.java | 28 +-
.../apache/solr/common/cloud/ClusterState.java | 4 +-
.../org/apache/solr/common/cloud/DocRouter.java | 27 +-
.../apache/solr/common/cloud/ZkStateReader.java | 46 +
.../common/params/CollectionAdminParams.java | 2 +
.../apache/solr/common/util/JavaBinCodec.java | 4 +-
.../solr/client/solrj/io/sql/JdbcTest.java | 15 +
.../solrj/io/stream/StreamExpressionTest.java | 8 +-
.../solr/client/solrj/request/SchemaTest.java | 4 -
.../request/TestCollectionAdminRequest.java | 9 +-
.../client/solrj/request/TestCoreAdmin.java | 13 +-
.../solr/cloud/AbstractDistribZkTestBase.java | 4 +-
.../cloud/AbstractFullDistribZkTestBase.java | 10 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 114 +-
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 +-
660 files changed, 31728 insertions(+), 26640 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31a28f3d/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31a28f3d/solr/core/src/java/org/apache/solr/handler/RestoreCore.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/RestoreCore.java
index a8ee719,9949d3f..fcda176
--- a/solr/core/src/java/org/apache/solr/handler/RestoreCore.java
+++ b/solr/core/src/java/org/apache/solr/handler/RestoreCore.java
@@@ -52,10 -55,11 +55,11 @@@ public class RestoreCore implements Cal
return doRestore();
}
- private boolean doRestore() throws Exception {
+ public boolean doRestore() throws Exception {
Path backupPath = Paths.get(backupLocation).resolve(backupName);
- String restoreIndexName = "restore." + backupName;
+ SimpleDateFormat dateFormat = new SimpleDateFormat(SnapShooter.DATE_FMT, Locale.ROOT);
+ String restoreIndexName = "restore." + dateFormat.format(new Date());
String restoreIndexPath = core.getDataDir() + restoreIndexName;
Directory restoreIndexDir = null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31a28f3d/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31a28f3d/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31a28f3d/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index 053c417,0c25e09..f01bede
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@@ -410,84 -527,16 +527,92 @@@ public abstract class CollectionAdminRe
}
}
+ // BACKUP request
+ public static class Backup extends AsyncCollectionAdminRequest<Backup> {
+ protected String location;
+ protected String name;
+ protected String collection;
+
+ public String getLocation() {
+ return location;
+ }
+
+ public Backup setLocation(String location) {
+ this.location = location;
+ return this;
+ }
+
+ public Backup(String name, String collection) {
+ this.name = name;
+ this.collection = collection;
+ action = CollectionAction.BACKUP;
+ }
+
+ @Override
+ public SolrParams getParams() {
+ ModifiableSolrParams params = (ModifiableSolrParams) super.getParams();
+ params.set(CoreAdminParams.COLLECTION, collection);
+ params.set(CoreAdminParams.NAME, name);
+ if (location != null) {
+ params.set("location", location);
+ }
+ return params;
+ }
+
+ @Override
+ protected Backup getThis() {
+ return this;
+ }
+ }
+
+ // RESTORE request
+ public static class Restore extends AsyncCollectionAdminRequest<Restore> {
+ protected String location;
+ protected String name;
+ protected String collection;
+
+ public String getLocation() {
+ return location;
+ }
+
+ public Restore setLocation(String location) {
+ this.location = location;
+ return this;
+ }
+
+ public Restore(String name, String collection) {
+ this.name = name;
+ this.collection = collection;
+ action = CollectionAction.RESTORE;
+ }
+
+ @Override
+ public SolrParams getParams() {
+ ModifiableSolrParams params = (ModifiableSolrParams) super.getParams();
+ params.set(CoreAdminParams.COLLECTION, collection);
+ params.set(CoreAdminParams.NAME, name);
+ if (location != null) {
+ params.set("location", location);
+ }
+ return params;
+ }
+
+ @Override
+ protected Restore getThis() {
+ return this;
+ }
+ }
+
+ /**
+ * Returns a SolrRequest to create a new shard in a collection
+ */
+ public static CreateShard createShard(String collection, String shard) {
+ return new CreateShard(collection, shard);
+ }
+
// CREATESHARD request
- public static class CreateShard extends CollectionShardAsyncAdminRequest<CreateShard> {
+ public static class CreateShard extends AsyncShardSpecificAdminRequest {
+
protected String nodeSet;
protected Properties properties;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31a28f3d/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------