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/08/18 11:02:05 UTC
[1/2] lucene-solr:branch_6x: SOLR-8995: reverting the previous change
due to compile error
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 29494f3cc -> 20a6818f1
SOLR-8995: reverting the previous change due to compile error
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8b382265
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8b382265
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8b382265
Branch: refs/heads/branch_6x
Commit: 8b3822658d628d83ab1785dd304ea4229140e1a7
Parents: 74b470a
Author: Noble Paul <no...@apache.org>
Authored: Thu Aug 18 16:17:53 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Aug 18 16:31:24 2016 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/update/TransactionLog.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8b382265/solr/core/src/java/org/apache/solr/update/TransactionLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/TransactionLog.java b/solr/core/src/java/org/apache/solr/update/TransactionLog.java
index 673d683..f7213ed 100644
--- a/solr/core/src/java/org/apache/solr/update/TransactionLog.java
+++ b/solr/core/src/java/org/apache/solr/update/TransactionLog.java
@@ -87,7 +87,7 @@ public class TransactionLog implements Closeable {
int snapshot_numRecords;
// write a BytesRef as a byte array
- JavaBinCodec.ObjectResolver resolver = new JavaBinCodec.ObjectResolver() {
+ static final JavaBinCodec.ObjectResolver resolver = new JavaBinCodec.ObjectResolver() {
@Override
public Object resolve(Object o, JavaBinCodec codec) throws IOException {
if (o instanceof BytesRef) {
[2/2] lucene-solr:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Conflicts:
solr/core/src/java/org/apache/solr/update/TransactionLog.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/20a6818f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/20a6818f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/20a6818f
Branch: refs/heads/branch_6x
Commit: 20a6818f1b90bd16229a2429369a0b508e4c913d
Parents: 8b38226 29494f3
Author: Noble Paul <no...@apache.org>
Authored: Thu Aug 18 16:31:41 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Aug 18 16:31:41 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 13 +
.../apache/lucene/analysis/ja/util/CSVUtil.java | 2 +-
.../apache/lucene/analysis/ja/TestCSVUtil.java | 52 +
.../java/org/apache/lucene/geo/Rectangle.java | 29 +
.../apache/lucene/store/ByteBufferGuard.java | 136 +++
.../lucene/store/ByteBufferIndexInput.java | 104 +-
.../org/apache/lucene/store/MMapDirectory.java | 8 +-
.../TestGrowableByteArrayDataOutput.java | 2 +-
.../org/apache/lucene/geo/TestGeoUtils.java | 11 +-
.../org/apache/lucene/geo/TestPolygon2D.java | 9 +-
.../apache/lucene/index/TestIndexSorting.java | 2 +-
.../index/TestIndexingSequenceNumbers.java | 4 +
.../org/apache/lucene/search/TestBoolean2.java | 13 +-
.../TestSimpleExplanationsWithFillerDocs.java | 2 +
.../apache/lucene/store/TestMmapDirectory.java | 38 +
.../lucene/queries/mlt/TestMoreLikeThis.java | 1 +
.../apache/lucene/document/FloatRangeField.java | 262 +++++
.../apache/lucene/document/IntRangeField.java | 262 +++++
.../apache/lucene/document/LongRangeField.java | 260 +++++
.../search/BaseRangeFieldQueryTestCase.java | 238 ++---
.../search/TestDoubleRangeFieldQueries.java | 154 ++-
.../search/TestFloatRangeFieldQueries.java | 240 +++++
.../lucene/search/TestIntRangeFieldQueries.java | 240 +++++
.../search/TestLongRangeFieldQueries.java | 240 +++++
.../java/org/apache/lucene/util/TestUtil.java | 13 +-
lucene/tools/junit4/tests.policy | 4 -
solr/CHANGES.txt | 28 +
.../org/apache/solr/cloud/DeleteNodeCmd.java | 90 ++
.../OverseerCollectionConfigSetProcessor.java | 22 +-
.../cloud/OverseerCollectionMessageHandler.java | 163 +++-
.../solr/cloud/OverseerTaskProcessor.java | 6 +-
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 163 ++++
.../solr/handler/admin/CollectionsHandler.java | 5 +-
.../apache/solr/search/CacheRegenerator.java | 2 +-
.../apache/solr/search/ReRankQParserPlugin.java | 35 +-
.../org/apache/solr/search/ReRankWeight.java | 48 +
.../apache/solr/search/SolrIndexSearcher.java | 78 +-
.../apache/solr/search/facet/FacetField.java | 952 +------------------
.../solr/search/facet/FacetFieldProcessor.java | 369 +++++++
.../facet/FacetFieldProcessorByArray.java | 213 +++++
.../facet/FacetFieldProcessorByArrayDV.java | 294 ++++++
.../facet/FacetFieldProcessorByArrayUIF.java | 71 ++
.../FacetFieldProcessorByEnumTermsStream.java | 356 +++++++
.../facet/FacetFieldProcessorByHashNumeric.java | 439 +++++++++
.../search/facet/FacetFieldProcessorDV.java | 291 ------
.../facet/FacetFieldProcessorNumeric.java | 443 ---------
.../solr/search/facet/FacetProcessor.java | 203 ++--
.../apache/solr/search/facet/FacetQuery.java | 5 -
.../apache/solr/search/facet/FacetRange.java | 5 -
.../solr/search/facet/UnInvertedField.java | 6 +-
.../org/apache/solr/cloud/DeleteNodeTest.java | 75 ++
.../org/apache/solr/cloud/ReplaceNodeTest.java | 104 ++
.../solr/search/facet/TestJsonFacets.java | 10 +-
solr/site/SYSTEM_REQUIREMENTS.mdtext | 2 +-
.../solrj/request/CollectionAdminRequest.java | 52 +-
.../apache/solr/common/cloud/ZkNodeProps.java | 12 +
.../apache/solr/common/cloud/ZkStateReader.java | 14 +-
.../solr/common/params/CollectionParams.java | 3 +
.../cloud/TestCollectionStateWatchers.java | 51 +-
solr/webapp/web/css/angular/index.css | 12 +-
.../web/js/angular/controllers/collections.js | 7 +-
solr/webapp/web/js/angular/controllers/cores.js | 10 +-
.../web/js/angular/controllers/dataimport.js | 40 +-
solr/webapp/web/js/angular/controllers/files.js | 6 +-
.../webapp/web/js/angular/controllers/schema.js | 4 +
solr/webapp/web/js/angular/services.js | 6 +-
66 files changed, 4789 insertions(+), 2245 deletions(-)
----------------------------------------------------------------------