branch develop updated (77e372e -> 26bcdf5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git from 77e372e fixes #3735: containsOne and containsAll with an empty collection returns all objects but no object should have been returned new 26bcdf5 fixes #3735: containsOne and containsAll with an empty collection returns all objects but no object should have been returned use expression with better performance (x4) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 26bcdf57dca3ec9a4d97faca49ea0580a3710514 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 01:29:23 2015 +0200 fixes #3735: containsOne and containsAll with an empty collection returns all objects but no object should have been returned use expression with better performance (x4) Summary of changes: .../main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java | 6 ++++-- .../org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java | 2 +- .../java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit 26bcdf57dca3ec9a4d97faca49ea0580a3710514 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 01:29:23 2015 +0200 fixes #3735: containsOne and containsAll with an empty collection returns all objects but no object should have been returned use expression with better performance (x4) --- .../main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java | 6 ++++-- .../org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java | 2 +- .../java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java index 3f0e80b..f4ecb21 100644 --- a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java +++ b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java @@ -217,7 +217,8 @@ public class Restriction2Solr { if (not.getRestriction() == null) { throw new WikittyException( "not.restriction" ); } - return "( *:* - " + toSolr(not.getRestriction(), solr) + " )"; + // no space after '-' !!! + return "( -" + toSolr(not.getRestriction(), solr) + " )"; } private String and2solr(And and, SolrServer solr) throws WikittyException { @@ -351,7 +352,8 @@ public class Restriction2Solr { } private String false2solr() { - return "( *:* - *:* )"; + // no space after '-' !!! + return "( -*:* )"; } private String keyword2solr(Keyword keyword) { diff --git a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java index 52b8e40..13410d6 100644 --- a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java +++ b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java @@ -720,7 +720,7 @@ public class WikittyQueryVisitorToSolr extends WikittyQueryVisitor { @Override public void visit(False o) { - solrQuery += "NOT(*:*)"; + solrQuery += WikittySolrConstant.SOLR_FALSE; } @Override diff --git a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java index c31a473..455d57b 100644 --- a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java +++ b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java @@ -93,6 +93,6 @@ public interface WikittySolrConstant { static final public String SUFFIX_STRING_LOWERCASE = SOLR_WIKITTY_SUFFIX + "c"; static final public String SUFFIX_STRING_FULLTEXT = SOLR_WIKITTY_SUFFIX + "t"; - // expression always false. (#id:* -#id:*) /!\ no space between '-' and '#id' - static final public String SOLR_FALSE = "(" + SOLR_ID + ":* -" + SOLR_ID + ":*)"; + // expression always false. (-*:*) /!\ no space between '-' and '*:*' + static final public String SOLR_FALSE = "(-*:*)"; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm