backport to 4.10 branch

[DmitryKey]

@tokee : a ground check. I'm merging 4_9_sparse to 4_10 branch from the original project.

Should I manually review all of these merge conflicts or only some and "accept theirs" on the rest?

[DmitryKey]

guessing, the following are clear:

lucene-solr/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java Text Modified Modified lucene-solr/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java Text Modified Modified lucene-solr/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Text Modified Modified lucene-solr/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Text Modified Modified lucene-solr/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java Text Modified Modified lucene-solr/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java Text Modified Modified lucene-solr/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Text Modified Modified lucene-solr/lucene/core/src/java/org/apache/lucene/util/fst/ByteSequenceOutputs.java Text Modified Modified lucene-solr/lucene/core/src/java/org/apache/lucene/util/fst/FST.java Text Modified Modified lucene-solr/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Text Modified Modified lucene-solr/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java Text Modified Modified lucene-solr/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java Text Modified Modified

need manual merging / review: lucene-solr/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java Text Modified Modified lucene-solr/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java Text Modified Modified lucene-solr/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Text Modified Modified lucene-solr/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java Text Modified Modified lucene-solr/solr/CHANGES.txt Text Modified Modified

[tokee]

Could this be 4.10.1 instead of 4.10?

I am afraid that all merge conflicts has to be merged by hand. I seem to remember that there has been some cleanup of the SimpleFacet code in 4.10+.

[DmitryKey]

the original repo does not list the 4.10.1 yet. Once it is there, I will re-merge it against 4_10_sparse. And 4_10_sparse will contain most of the changes anyway.

Merging by hand now. Will benefit from your review!

[tokee]

I do not understand your status update: Have you pushed a 4_10_sparse-branch? If so, I cannot find it.

[DmitryKey]

this in progress. I have not pushed the branch yet.

I just wanted to say, that your review of it, when pushed, is essential as you are the knowledge possessor!

[DmitryKey]

@tokee I have completed back-porting. I have not run tests, no full compilation yet. Currently having compile errors in the DocValuesFacets.

Could you please have a look? Branch lucene_solr_4_10_sparse

[tokee]

Sure, I'll take over. Hopefully tomorrow, but failing that it will probably be Monday or Tuesday before I have any real time again.

[DmitryKey]

Logging the steps taken to backport:

How to backport forked repo's branch to upstream main repo in local [1]:

• add the upstream repo

git remote add upstream https://github.com/apache/lucene-solr.git

• fetch it

git fetch upstream

1. check the list of branches and choose the target one. In this example it is lucene_solr_4_10_sparse. Then check it out:

git checkout -b lucene_solr_4_10_sparse

1. start merging with your merge tool of preference or manually.
2. push the merged branch to this repo (fork):

git push -u origin lucene_solr_4_10_sparse

[1] http://stackoverflow.com/questions/7244321/how-to-update-github-forked-repository

[tokee]

The 4.10 branch is now the default branch. 4.8 and 4.9 are no longer updated.