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/03/07 18:20:03 UTC
[4/4] lucene-solr git commit: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c187c464
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c187c464
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c187c464
Branch: refs/heads/branch_6x
Commit: c187c46437538ae2b26a624cec60545fed62ad28
Parents: 5146e78 5429356
Author: Noble Paul <no...@apache.org>
Authored: Mon Mar 7 22:49:51 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Mon Mar 7 22:49:51 2016 +0530
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 2 +-
lucene/CHANGES.txt | 6 +
.../lucene/codecs/lucene50/Lucene50Codec.java | 6 +-
.../lucene/codecs/lucene53/Lucene53Codec.java | 8 +-
.../lucene/codecs/lucene54/Lucene54Codec.java | 8 +-
lucene/build.xml | 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 | 151 ---
.../org/apache/lucene/codecs/PointsFormat.java | 111 +++
.../org/apache/lucene/codecs/PointsReader.java | 51 +
.../org/apache/lucene/codecs/PointsWriter.java | 151 +++
.../lucene/codecs/lucene60/Lucene60Codec.java | 6 +-
.../codecs/lucene60/Lucene60PointFormat.java | 106 ---
.../codecs/lucene60/Lucene60PointReader.java | 241 -----
.../codecs/lucene60/Lucene60PointWriter.java | 225 -----
.../codecs/lucene60/Lucene60PointsFormat.java | 106 +++
.../codecs/lucene60/Lucene60PointsReader.java | 241 +++++
.../codecs/lucene60/Lucene60PointsWriter.java | 225 +++++
.../lucene/codecs/lucene60/package-info.java | 4 +-
.../org/apache/lucene/index/CheckIndex.java | 10 +-
.../org/apache/lucene/index/CodecReader.java | 18 +-
.../lucene/index/DefaultIndexingChain.java | 22 +-
.../java/org/apache/lucene/index/FieldInfo.java | 2 +-
.../apache/lucene/index/FilterCodecReader.java | 6 +-
.../org/apache/lucene/index/LeafReader.java | 2 +-
.../org/apache/lucene/index/MergeState.java | 12 +-
.../apache/lucene/index/PointValuesWriter.java | 8 +-
.../apache/lucene/index/SegmentCoreReaders.java | 10 +-
.../org/apache/lucene/index/SegmentMerger.java | 4 +-
.../org/apache/lucene/index/SegmentReader.java | 8 +-
.../lucene/index/SlowCodecReaderWrapper.java | 8 +-
.../apache/lucene/search/PointRangeQuery.java | 145 +--
.../lucene60/TestLucene60PointFormat.java | 83 --
.../lucene60/TestLucene60PointsFormat.java | 83 ++
.../apache/lucene/index/TestPointValues.java | 10 +-
.../apache/lucene/search/TestPointQueries.java | 71 +-
.../facet/range/TestRangeFacetCounts.java | 5 +-
.../document/TestLatLonPointDistanceQuery.java | 24 +-
.../apache/lucene/geo3d/BasePlanetObject.java | 5 +
.../org/apache/lucene/geo3d/Geo3DPoint.java | 43 +-
.../lucene/geo3d/PointInGeo3DShapeQuery.java | 30 +-
.../org/apache/lucene/geo3d/TestGeo3DPoint.java | 49 +-
.../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 ++++
.../lucene/index/BasePointFormatTestCase.java | 950 -------------------
.../lucene/index/BasePointsFormatTestCase.java | 950 +++++++++++++++++++
.../org/apache/lucene/index/RandomCodec.java | 24 +-
.../asserting/TestAssertingPointFormat.java | 30 -
.../asserting/TestAssertingPointsFormat.java | 30 +
solr/CHANGES.txt | 11 +
solr/build.xml | 2 +-
.../solr/hadoop/MorphlineGoLiveMiniMRTest.java | 1 -
.../org/apache/solr/cloud/ElectionContext.java | 2 +-
.../cloud/LeaderInitiatedRecoveryThread.java | 6 -
.../cloud/OverseerCollectionMessageHandler.java | 1 -
.../org/apache/solr/cloud/ZkController.java | 2 +-
.../apache/solr/handler/CdcrRequestHandler.java | 2 +-
.../org/apache/solr/handler/RestoreCore.java | 6 +-
.../solr/handler/admin/ClusterStatus.java | 3 -
.../solr/handler/admin/CollectionsHandler.java | 2 -
.../solr/handler/admin/CoreAdminOperation.java | 6 +-
.../solr/handler/admin/RebalanceLeaders.java | 2 +-
.../org/apache/solr/request/SimpleFacets.java | 12 +-
.../solr/search/facet/UnInvertedField.java | 9 +-
.../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 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 9 +-
.../apache/solr/cloud/CustomCollectionTest.java | 1 -
.../org/apache/solr/cloud/DeleteShardTest.java | 2 -
.../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 -
.../org/apache/solr/cloud/SyncSliceTest.java | 1 -
.../solr/cloud/TestCloudDeleteByQuery.java | 1 -
.../apache/solr/cloud/TestCollectionAPI.java | 4 +-
.../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 +-
.../apache/solr/handler/TestRestoreCore.java | 55 +-
.../apache/solr/request/SimpleFacetsTest.java | 12 +-
.../org/apache/solr/request/TestFaceting.java | 8 +-
.../solr/search/facet/TestJsonFacets.java | 21 +
.../apache/solr/common/cloud/ZkStateReader.java | 46 +
.../solr/cloud/AbstractDistribZkTestBase.java | 4 +-
.../cloud/AbstractFullDistribZkTestBase.java | 10 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 14 +-
122 files changed, 3575 insertions(+), 3500 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c187c464/solr/CHANGES.txt
----------------------------------------------------------------------