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/05/31 17:45:30 UTC
[1/2] lucene-solr:branch_6x: fixing typos in javadocs
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 979af2720 -> 6662cdc07
fixing typos in javadocs
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d100dcdc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d100dcdc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d100dcdc
Branch: refs/heads/branch_6x
Commit: d100dcdc56bb2e0291cd06b022a3774c3818a15d
Parents: 8276a62
Author: Noble Paul <no...@apache.org>
Authored: Tue May 31 23:12:09 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue May 31 23:14:37 2016 +0530
----------------------------------------------------------------------
.../solr/common/util/JsonRecordReader.java | 38 ++++++++++----------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d100dcdc/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
index 6777a49..5470446 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
@@ -94,9 +94,9 @@ public class JsonRecordReader {
List<String> paths = splitEscapeQuote(path);
if (paths.size() == 0) {
if (isRecord) rootNode.isRecord = true;
- return;//the patrh is "/"
+ return;//the path is "/"
}
- // deal with how split behaves when seperator starts a string!
+ // deal with how split behaves when separator starts with an empty string!
if ("".equals(paths.get(0).trim()))
paths.remove(0);
rootNode.build(paths, fieldName, multiValued, isRecord, path);
@@ -136,7 +136,7 @@ public class JsonRecordReader {
public void streamRecords(JSONParser parser, Handler handler) throws IOException {
rootNode.parse(parser, handler,
- new LinkedHashMap<String, Object>());
+ new LinkedHashMap<>());
}
@@ -178,7 +178,7 @@ public class JsonRecordReader {
/**
- * Walk the Node tree propagating any wildDescentant information to
+ * Walk the Node tree propagating any wild Descendant information to
* child nodes.
*/
private void buildOptimize() {
@@ -191,7 +191,7 @@ public class JsonRecordReader {
static final String RECURSIVE_WILDCARD_PATH = "**";
/**
- * Build a Node tree structure representing all paths of intrest to us.
+ * Build a Node tree structure representing all paths of interest to us.
* This must be done before parsing of the JSON stream starts. Each node
* holds one portion of an path. Taking each path segment in turn this
* method walks the Node tree and finds where the new segment should be
@@ -214,7 +214,7 @@ public class JsonRecordReader {
if (paths.isEmpty()) {
// We have emptied paths, we are for the moment a leaf of the tree.
// When parsing the actual input we have traversed to a position
- // where we actutally have to do something. getOrAddNode() will
+ // where we actually have to do something. getOrAddNode() will
// have created and returned a new minimal Node with name and
// pathName already populated. We need to add more information.
if (record) {
@@ -284,13 +284,13 @@ public class JsonRecordReader {
event = parser.nextEvent();
if (event == EOF) break;
if (event == OBJECT_START) {
- handleObjectStart(parser, handler, values, new Stack<Set<String>>(), recordStarted, null);
+ handleObjectStart(parser, handler, values, new Stack<>(), recordStarted, null);
} else if (event == ARRAY_START) {
for (; ; ) {
event = parser.nextEvent();
if (event == ARRAY_END) break;
if (event == OBJECT_START) {
- handleObjectStart(parser, handler, values, new Stack<Set<String>>(), recordStarted, null);
+ handleObjectStart(parser, handler, values, new Stack<>(), recordStarted, null);
}
}
}
@@ -300,14 +300,14 @@ public class JsonRecordReader {
/**
* If a new tag is encountered, check if it is of interest or not by seeing
- * if it matches against our node tree. If we have deperted from the node
+ * if it matches against our node tree. If we have departed from the node
* tree then walk back though the tree's ancestor nodes checking to see if
* any // expressions exist for the node and compare them against the new
* tag. If matched then "jump" to that node, otherwise ignore the tag.
* <p>
* Note, the list of // expressions found while walking back up the tree
- * is chached in the HashMap decends. Then if the new tag is to be skipped,
- * any inner chil tags are compared against the cache and jumped to if
+ * is cached in the HashMap descendants. Then if the new tag is to be skipped,
+ * any inner child tags are compared against the cache and jumped to if
* matched.
*/
private void handleObjectStart(final JSONParser parser,
@@ -320,7 +320,7 @@ public class JsonRecordReader {
Set<String> valuesAddedinThisFrame = null;
if (isRecord || !recordStarted) {
// This Node is a match for an PATH from a forEach attribute,
- // prepare for the clean up that will occurr when the record
+ // prepare for the clean up that will occur when the record
// is emitted after its END_ELEMENT is matched
valuesAddedinThisFrame = new HashSet<>();
stack.push(valuesAddedinThisFrame);
@@ -390,7 +390,7 @@ public class JsonRecordReader {
new Wrapper(node, frameWrapper, name).walk(event);
}
} else {
- //this is not something we are interested in . skip it
+ //this is not something we are interested in. Skip it
event = parser.nextEvent();
if (event == STRING ||
event == LONG ||
@@ -459,19 +459,19 @@ public class JsonRecordReader {
/**
- * The path is split into segments using the '/' as a seperator. However
+ * The path is split into segments using the '/' as a separator. However
* this method deals with special cases where there is a slash '/' character
* inside the attribute value e.g. x/@html='text/html'. We split by '/' but
* then reassemble things were the '/' appears within a quoted sub-string.
* <p>
- * We have already enforced that the string must begin with a seperator. This
+ * We have already enforced that the string must begin with a separator. This
* method depends heavily on how split behaves if the string starts with the
- * seperator or if a sequence of multiple seperator's appear.
+ * seperator or if a sequence of multiple separators appear.
*/
private static List<String> splitEscapeQuote(String str) {
List<String> result = new LinkedList<>();
String[] ss = str.split("/");
- for (int i = 0; i < ss.length; i++) { // i=1: skip seperator at start of string
+ for (int i = 0; i < ss.length; i++) { // i=1: skip separator at start of string
StringBuilder sb = new StringBuilder();
int quoteCount = 0;
while (true) {
@@ -493,7 +493,7 @@ public class JsonRecordReader {
/**
* Implement this interface to stream records as and when one is found.
*/
- public static interface Handler {
+ public interface Handler {
/**
* @param record The record map. The key is the field name as provided in
* the addField() methods. The value can be a single String (for single
@@ -502,7 +502,7 @@ public class JsonRecordReader {
* If there is any change all parsing will be aborted and the Exception
* is propagated up
*/
- public void handle(Map<String, Object> record, String path);
+ void handle(Map<String, Object> record, String path);
}
public static Object parseSingleFieldValue(int ev, JSONParser parser, MethodFrameWrapper runnable) throws IOException {
[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
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6662cdc0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6662cdc0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6662cdc0
Branch: refs/heads/branch_6x
Commit: 6662cdc07ffaefd858e76fc2df70ed975cf02dc4
Parents: d100dcd 979af27
Author: Noble Paul <no...@apache.org>
Authored: Tue May 31 23:15:07 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue May 31 23:15:07 2016 +0530
----------------------------------------------------------------------
dev-tools/scripts/smokeTestRelease.py | 19 +-
lucene/CHANGES.txt | 9 +-
.../index/TestBackwardsCompatibility.java | 4 +-
.../org/apache/lucene/index/index.6.0.1-cfs.zip | Bin 0 -> 13731 bytes
.../apache/lucene/index/index.6.0.1-nocfs.zip | Bin 0 -> 13733 bytes
.../SimpleNaiveBayesClassifier.java | 28 +-
.../SimpleNaiveBayesDocumentClassifier.java | 22 -
.../utils/ConfusionMatrixGenerator.java | 49 +-
.../org/apache/lucene/index/MultiDocValues.java | 2 +-
.../apache/lucene/util/BytesRefComparator.java | 55 +
.../lucene/util/FixedLengthBytesRefArray.java | 29 +
.../apache/lucene/util/InPlaceMergeSorter.java | 2 +-
.../org/apache/lucene/util/IntroSorter.java | 2 +-
.../org/apache/lucene/util/MSBRadixSorter.java | 219 +++
.../src/java/org/apache/lucene/util/Sorter.java | 2 +-
.../lucene/util/StringMSBRadixSorter.java | 155 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 113 +-
.../apache/lucene/util/TestMSBRadixSorter.java | 117 ++
.../org/apache/lucene/misc/IndexMergeTool.java | 4 +-
.../store/HardlinkCopyDirectoryWrapper.java | 95 +
.../store/TestHardLinkCopyDirectoryWrapper.java | 84 +
.../lucene/document/TestHalfFloatPoint.java | 2 +-
.../prefix/tree/DateRangePrefixTreeTest.java | 7 +-
lucene/tools/junit4/tests.policy | 4 +-
solr/CHANGES.txt | 17 +
.../apache/solr/schema/ICUCollationField.java | 4 +-
.../apache/solr/handler/RequestHandlerBase.java | 29 +-
.../solr/handler/component/ExpandComponent.java | 24 +-
.../solr/highlight/DefaultSolrHighlighter.java | 103 +-
.../solr/index/SlowCompositeReaderWrapper.java | 296 +++
.../apache/solr/index/SortingMergePolicy.java | 65 +
.../solr/schema/AbstractSpatialFieldType.java | 17 +-
.../org/apache/solr/schema/BinaryField.java | 2 +-
.../java/org/apache/solr/schema/BoolField.java | 6 +-
.../org/apache/solr/schema/CollationField.java | 4 +-
.../org/apache/solr/schema/CurrencyField.java | 2 +-
.../java/org/apache/solr/schema/EnumField.java | 14 +-
.../apache/solr/schema/ExternalFileField.java | 8 +-
.../java/org/apache/solr/schema/FieldType.java | 2 +-
.../org/apache/solr/schema/GeoHashField.java | 10 +-
.../org/apache/solr/schema/IndexSchema.java | 2 +-
.../java/org/apache/solr/schema/LatLonType.java | 5 +-
.../java/org/apache/solr/schema/PointType.java | 4 +-
.../apache/solr/schema/PreAnalyzedField.java | 4 +-
.../org/apache/solr/schema/RandomSortField.java | 4 +-
.../java/org/apache/solr/schema/StrField.java | 2 +-
.../java/org/apache/solr/schema/TextField.java | 14 +-
.../java/org/apache/solr/schema/TrieField.java | 4 +-
.../solr/search/CollapsingQParserPlugin.java | 21 +-
.../java/org/apache/solr/search/Insanity.java | 6 +-
.../apache/solr/search/SolrFieldCacheMBean.java | 5 +-
.../apache/solr/search/SolrIndexSearcher.java | 4 +-
.../solr/search/facet/UnInvertedField.java | 4 +-
.../solr/search/function/OrdFieldSource.java | 6 +-
.../search/function/ReverseOrdFieldSource.java | 6 +-
.../search/join/ScoreJoinQParserPlugin.java | 2 +-
.../solr/spelling/SpellCheckCollator.java | 3 +
.../apache/solr/uninverting/DocTermOrds.java | 887 +++++++++
.../org/apache/solr/uninverting/FieldCache.java | 466 +++++
.../apache/solr/uninverting/FieldCacheImpl.java | 1085 +++++++++++
.../uninverting/FieldCacheSanityChecker.java | 425 ++++
.../solr/uninverting/UninvertingReader.java | 391 ++++
.../apache/solr/uninverting/package-info.java | 21 +
.../solr/update/DeleteByQueryWrapper.java | 3 +-
.../org/apache/solr/update/VersionInfo.java | 2 +-
.../cloud/DistribJoinFromCollectionTest.java | 144 +-
.../apache/solr/highlight/HighlighterTest.java | 82 +-
.../index/TestSlowCompositeReaderWrapper.java | 95 +
.../org/apache/solr/request/TestFaceting.java | 2 +-
.../TestSubQueryTransformerDistrib.java | 69 +-
.../test/org/apache/solr/search/TestSort.java | 4 +-
.../search/join/BlockJoinFacetDistribTest.java | 97 +-
.../solr/spelling/SpellCheckCollatorTest.java | 30 +
.../solr/uninverting/TestDocTermOrds.java | 681 +++++++
.../apache/solr/uninverting/TestFieldCache.java | 731 +++++++
.../solr/uninverting/TestFieldCacheReopen.java | 70 +
.../TestFieldCacheSanityChecker.java | 164 ++
.../solr/uninverting/TestFieldCacheSort.java | 1814 ++++++++++++++++++
.../uninverting/TestFieldCacheSortRandom.java | 318 +++
.../uninverting/TestFieldCacheVsDocValues.java | 592 ++++++
.../uninverting/TestFieldCacheWithThreads.java | 228 +++
.../solr/uninverting/TestLegacyFieldCache.java | 497 +++++
.../solr/uninverting/TestNumericTerms32.java | 156 ++
.../solr/uninverting/TestNumericTerms64.java | 166 ++
.../solr/uninverting/TestUninvertingReader.java | 395 ++++
.../apache/solr/update/DocumentBuilderTest.java | 13 +-
.../client/solrj/io/stream/FacetStream.java | 2 +-
.../solr/common/params/HighlightParams.java | 1 +
.../client/solrj/io/stream/StreamingTest.java | 48 +-
89 files changed, 10831 insertions(+), 570 deletions(-)
----------------------------------------------------------------------