You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2019/04/02 18:57:17 UTC

[lucene-solr] branch branch_8x updated (9591052 -> c19dc7b)

This is an automated email from the ASF dual-hosted git repository.

cpoerschke pushed a change to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


    from 9591052  LUCENE-8730: WordDelimiterGraphFilter always emits its original token first
     new 9cab626  s/reduce/rollup wording correction in stream-decorator-reference.adoc
     new 4a2ea61  minor stream-decorator-reference.adoc tweak w.r.t. parallel function's partitionKeys
     new c19dc7b  LUCENE-8742: add 'missing slop attribute' test coverage for SpanNearBuilder

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ...oostingTermQuery.xml => SpanNearQueryWithoutSlop.xml} |  5 ++++-
 .../apache/lucene/queryparser/xml/TestCoreParser.java    | 16 ++++++++++++++++
 solr/solr-ref-guide/src/stream-decorator-reference.adoc  |  4 ++--
 3 files changed, 22 insertions(+), 3 deletions(-)
 copy lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/{BoostingTermQuery.xml => SpanNearQueryWithoutSlop.xml} (87%)


[lucene-solr] 03/03: LUCENE-8742: add 'missing slop attribute' test coverage for SpanNearBuilder

Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit c19dc7b451d3053855216b98c543f266f6665344
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Apr 2 19:31:03 2019 +0100

    LUCENE-8742: add 'missing slop attribute' test coverage for SpanNearBuilder
---
 .../queryparser/xml/SpanNearQueryWithoutSlop.xml    | 21 +++++++++++++++++++++
 .../lucene/queryparser/xml/TestCoreParser.java      | 16 ++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanNearQueryWithoutSlop.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanNearQueryWithoutSlop.xml
new file mode 100644
index 0000000..977ac4b
--- /dev/null
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanNearQueryWithoutSlop.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<SpanNear fieldName="contents" inOrder="false">    
+  <SpanTerm>foo</SpanTerm>
+  <SpanTerm>bar</SpanTerm>
+</SpanNear>  
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java
index 1b434bb..3fe3ccb 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java
@@ -135,6 +135,22 @@ public class TestCoreParser extends LuceneTestCase {
     assertEquals(q, sq);
   }
 
+  public void testSpanNearQueryWithoutSlopXML() throws Exception {
+    Exception expectedException = new NumberFormatException("For input string: \"\"");
+    try {
+      Query q = parse("SpanNearQueryWithoutSlop.xml");
+      fail("got query "+q+" instead of expected exception "+expectedException);
+    } catch (Exception e) {
+      assertEquals(expectedException.toString(), e.toString());
+    }
+    try {
+      SpanQuery sq = parseAsSpan("SpanNearQueryWithoutSlop.xml");
+      fail("got span query "+sq+" instead of expected exception "+expectedException);
+    } catch (Exception e) {
+      assertEquals(expectedException.toString(), e.toString());
+    }
+  }
+
   public void testConstantScoreQueryXML() throws Exception {
     Query q = parse("ConstantScoreQuery.xml");
     dumpResults("ConstantScoreQuery", q, 5);


[lucene-solr] 02/03: minor stream-decorator-reference.adoc tweak w.r.t. parallel function's partitionKeys

Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 4a2ea61c95c909c590522b146d5ab227dc14bac5
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Apr 2 19:28:54 2019 +0100

    minor stream-decorator-reference.adoc tweak w.r.t. parallel function's partitionKeys
---
 solr/solr-ref-guide/src/stream-decorator-reference.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solr-ref-guide/src/stream-decorator-reference.adoc b/solr/solr-ref-guide/src/stream-decorator-reference.adoc
index dc8d8a9..ae3ad3f 100644
--- a/solr/solr-ref-guide/src/stream-decorator-reference.adoc
+++ b/solr/solr-ref-guide/src/stream-decorator-reference.adoc
@@ -995,7 +995,7 @@ outerHashJoin(
 
 The `parallel` function wraps a streaming expression and sends it to N worker nodes to be processed in parallel.
 
-The `parallel` function requires that the `partitionKeys` parameter be provided to the underlying searches. The `partitionKeys` parameter will partition the search results (tuples) across the worker nodes. Tuples with the same values in for `partitionKeys` will be shuffled to the same worker nodes.
+The `parallel` function requires that the `partitionKeys` parameter be provided to the underlying searches. The `partitionKeys` parameter will partition the search results (tuples) across the worker nodes. Tuples with the same values as `partitionKeys` will be shuffled to the same worker nodes.
 
 The `parallel` function maintains the sort order of the tuples returned by the worker nodes, so the sort criteria must incorporate the sort order of the tuples returned by the workers.
 


[lucene-solr] 01/03: s/reduce/rollup wording correction in stream-decorator-reference.adoc

Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 9cab6266ef1d48ddd4f791b5e496c6ef2fbaa39d
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Apr 2 19:25:52 2019 +0100

    s/reduce/rollup wording correction in stream-decorator-reference.adoc
---
 solr/solr-ref-guide/src/stream-decorator-reference.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solr-ref-guide/src/stream-decorator-reference.adoc b/solr/solr-ref-guide/src/stream-decorator-reference.adoc
index 1465b83..dc8d8a9 100644
--- a/solr/solr-ref-guide/src/stream-decorator-reference.adoc
+++ b/solr/solr-ref-guide/src/stream-decorator-reference.adoc
@@ -1031,7 +1031,7 @@ The worker nodes can be from the same collection as the data, or they can be a d
           sort="year_i desc")
 ----
 
-The expression above shows a `parallel` function wrapping a `reduce` function. This will cause the `reduce` function to be run in parallel across 20 worker nodes.
+The expression above shows a `parallel` function wrapping a `rollup` function. This will cause the `rollup` function to be run in parallel across 20 worker nodes.
 
 .Warmup
 [TIP]