You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/12/14 22:15:25 UTC
[32/32] lucene-solr:jira/solr-5944: Merge branch 'master' into
jira/solr-5944
Merge branch 'master' into jira/solr-5944
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5d229fee
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5d229fee
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5d229fee
Branch: refs/heads/jira/solr-5944
Commit: 5d229fee1f2d07ec7db4201b42f4273824b5b4ee
Parents: 6642fd7 6525bb5
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed Dec 14 14:46:29 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Dec 14 14:46:29 2016 -0700
----------------------------------------------------------------------
.gitignore | 1 +
lucene/CHANGES.txt | 17 ++
.../classification/utils/DatasetSplitter.java | 3 +-
.../simpletext/SimpleTextPointsWriter.java | 2 +-
.../CompressingStoredFieldsWriter.java | 19 +-
.../CompressingTermVectorsWriter.java | 11 +-
.../GrowableByteArrayDataOutput.java | 83 ---------
.../org/apache/lucene/index/IndexWriter.java | 32 +++-
.../apache/lucene/index/IndexWriterConfig.java | 3 +
.../org/apache/lucene/index/LeafReader.java | 2 +-
.../lucene/index/LiveIndexWriterConfig.java | 13 ++
.../apache/lucene/index/SegmentCoreReaders.java | 8 +
.../store/GrowableByteArrayDataOutput.java | 103 +++++++++++
.../org/apache/lucene/store/MMapDirectory.java | 4 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 85 +++++----
.../apache/lucene/util/bkd/DocIdsWriter.java | 4 +-
.../TestGrowableByteArrayDataOutput.java | 80 --------
.../apache/lucene/index/TestIndexSorting.java | 30 ++-
.../index/TestTragicIndexWriterDeadlock.java | 69 ++++++-
.../store/TestGrowableByteArrayDataOutput.java | 80 ++++++++
.../apache/lucene/search/DocValuesStats.java | 165 +++++++++++++++++
.../lucene/search/DocValuesStatsCollector.java | 64 +++++++
.../search/TestDocValuesStatsCollector.java | 166 +++++++++++++++++
.../apache/lucene/document/RangeFieldQuery.java | 1 +
.../search/BaseRangeFieldQueryTestCase.java | 2 +-
solr/CHANGES.txt | 30 +++
.../TestPlainTextEntityProcessor.java | 106 +++++++++++
solr/contrib/ltr/README.md | 6 +-
.../java/org/apache/solr/ltr/FeatureLogger.java | 10 +-
.../org/apache/solr/ltr/LTRScoringQuery.java | 22 +--
.../org/apache/solr/ltr/LTRThreadModule.java | 29 +++
.../org/apache/solr/ltr/feature/Feature.java | 3 +-
.../solr/ltr/feature/FieldValueFeature.java | 18 +-
.../solr/ltr/feature/OriginalScoreFeature.java | 12 +-
.../apache/solr/ltr/feature/SolrFeature.java | 17 +-
.../ltr/store/rest/ManagedFeatureStore.java | 1 -
.../solr/ltr/store/rest/ManagedModelStore.java | 32 ++--
.../test-files/solr/collection1/conf/schema.xml | 2 +
.../solr/ltr/feature/TestFieldValueFeature.java | 48 ++++-
.../ltr/feature/TestOriginalScoreScorer.java | 47 +++++
.../model/TestMultipleAdditiveTreesModel.java | 44 +++--
.../solr/cloud/CloudConfigSetService.java | 24 ++-
.../org/apache/solr/cloud/CloudDescriptor.java | 2 +-
.../apache/solr/cloud/CreateCollectionCmd.java | 146 ++++++++++++++-
.../org/apache/solr/cloud/ElectionContext.java | 20 +-
.../org/apache/solr/cloud/LeaderElector.java | 9 +-
.../OverseerAutoReplicaFailoverThread.java | 9 +-
.../org/apache/solr/cloud/ZkController.java | 128 +------------
.../apache/solr/cloud/ZkSolrResourceLoader.java | 2 +-
.../org/apache/solr/core/ConfigSetService.java | 7 +-
.../org/apache/solr/core/CoreContainer.java | 2 +-
.../solr/handler/admin/CollectionsHandler.java | 2 +
.../solr/handler/admin/SystemInfoHandler.java | 51 +++++-
.../java/org/apache/solr/schema/BoolField.java | 4 +-
.../apache/solr/search/SolrFieldCacheMBean.java | 4 +-
.../facet/FacetFieldProcessorByArrayDV.java | 49 ++++-
.../org/apache/solr/search/facet/FieldUtil.java | 147 +++++++++++++++
.../apache/solr/servlet/SolrDispatchFilter.java | 15 ++
.../apache/solr/servlet/SolrRequestParsers.java | 31 ++--
.../org/apache/solr/uninverting/FieldCache.java | 16 +-
.../apache/solr/uninverting/FieldCacheImpl.java | 182 ++++++++++---------
.../uninverting/FieldCacheSanityChecker.java | 3 +-
.../solr/uninverting/UninvertingReader.java | 23 ++-
.../processor/DistributedUpdateProcessor.java | 8 +-
.../solr/util/SolrFileCleaningTracker.java | 147 +++++++++++++++
.../solr/cloud/DocValuesNotIndexedTest.java | 64 ++++---
.../apache/solr/cloud/LeaderElectionTest.java | 2 +
...verseerCollectionConfigSetProcessorTest.java | 33 +++-
.../cloud/SegmentTerminateEarlyTestState.java | 12 +-
.../solr/cloud/TestMiniSolrCloudCluster.java | 50 -----
.../apache/solr/cloud/TestSegmentSorting.java | 133 ++++++++++++++
.../org/apache/solr/cloud/ZkSolrClientTest.java | 54 ++++++
.../solr/search/TestSolrFieldCacheMBean.java | 2 +
.../apache/solr/common/cloud/SolrZkClient.java | 29 ++-
.../apache/solr/common/cloud/ZkCmdExecutor.java | 15 +-
.../apache/solr/client/solrj/SolrQueryTest.java | 2 +-
76 files changed, 2199 insertions(+), 702 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d229fee/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
----------------------------------------------------------------------
diff --cc lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index 331da1f,4789505..159f86b
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@@ -1617,9 -1617,11 +1617,12 @@@ public class IndexWriter implements Clo
public long updateNumericDocValue(Term term, String field, long value) throws IOException {
ensureOpen();
if (!globalFieldNumberMap.contains(field, DocValuesType.NUMERIC)) {
- throw new IllegalArgumentException("can only update existing numeric-docvalues fields!");
+ throw new IllegalArgumentException("can only update existing numeric-docvalues fields! Attempted"
+ + " to update field: " + field + "=" + value);
}
+ if (config.getIndexSortFields().contains(field)) {
+ throw new IllegalArgumentException("cannot update docvalues field involved in the index sort, field=" + field + ", sort=" + config.getIndexSort());
+ }
try {
long seqNo = docWriter.updateDocValues(new NumericDocValuesUpdate(term, field, value));
if (seqNo < 0) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d229fee/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------