You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/11/04 00:04:41 UTC
[1/3] lucene-solr:jira/solr-8593: Remove spurious imports
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8593 4275bc712 -> 1489fb936
Remove spurious imports
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/84171eca
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/84171eca
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/84171eca
Branch: refs/heads/jira/solr-8593
Commit: 84171ecada5c59aebb8e44e96d8150d5572e6f58
Parents: 78b768f
Author: Joel Bernstein <jb...@apache.org>
Authored: Thu Nov 3 18:47:50 2016 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Thu Nov 3 18:47:50 2016 -0400
----------------------------------------------------------------------
.../core/src/java/org/apache/solr/response/JSONResponseWriter.java | 1 -
solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java | 2 --
2 files changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84171eca/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
index 7090348..206bbd6 100644
--- a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84171eca/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
index ca23e80..a419fbb 100644
--- a/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
@@ -18,8 +18,6 @@ package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.solr.common.util.NamedList;
[2/3] lucene-solr:jira/solr-8593: Improve rules for Sort and Filter
Posted by kr...@apache.org.
Improve rules for Sort and Filter
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cd9a3183
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cd9a3183
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cd9a3183
Branch: refs/heads/jira/solr-8593
Commit: cd9a3183184e6a88a05d4d5b7842be006ed79264
Parents: 4275bc7
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Nov 3 19:03:20 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Nov 3 19:03:20 2016 -0500
----------------------------------------------------------------------
.../org/apache/solr/handler/sql/SolrRules.java | 60 ++++++--------------
1 file changed, 18 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cd9a3183/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java
index 7d1aa59..bd39620 100644
--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java
+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java
@@ -26,6 +26,7 @@ import org.apache.calcite.rel.core.Sort;
import org.apache.calcite.rel.logical.LogicalAggregate;
import org.apache.calcite.rel.logical.LogicalFilter;
import org.apache.calcite.rel.logical.LogicalProject;
+import org.apache.calcite.rel.logical.LogicalSort;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rex.RexCall;
import org.apache.calcite.rex.RexInputRef;
@@ -47,9 +48,8 @@ import java.util.function.Predicate;
class SolrRules {
static final RelOptRule[] RULES = {
SolrFilterRule.FILTER_RULE,
- SolrFilterRule.FILTER_PROJECT_RULE,
SolrProjectRule.PROJECT_RULE,
-// SolrSortRule.SORT_RULE,
+ SolrSortRule.SORT_RULE,
// SolrAggregateRule.AGGREGATE_RULE,
};
@@ -117,45 +117,23 @@ class SolrRules {
}
}
- abstract static class SolrRule extends RelOptRule {
- final Convention out;
-
- <R extends RelNode> SolrRule(RelOptRuleOperand rule, String description) {
- super(rule, description);
- this.out = SolrRel.CONVENTION;
- }
-
- abstract public RelNode convert(RelNode rel);
-
- /**
- * @see ConverterRule
- */
- @Override
- public void onMatch(RelOptRuleCall call) {
- RelNode rel = call.rel(0);
- if (rel.getTraitSet().contains(Convention.NONE)) {
- final RelNode converted = convert(rel);
- if (converted != null) {
- call.transformTo(converted);
- }
- }
- }
- }
-
/**
* Rule to convert a {@link LogicalFilter} to a {@link SolrFilter}.
*/
- private static class SolrFilterRule extends SolrRule {
-
- private static final SolrFilterRule FILTER_RULE =
- new SolrFilterRule(operand(LogicalFilter.class, operand(SolrTableScan.class, none())), "SolrFilterRule");
+ private static class SolrFilterRule extends SolrConverterRule {
+ private static final Predicate<RelNode> FILTER_PREDICATE = relNode -> {
+ List<RexNode> filterOperands = ((RexCall) ((LogicalFilter) relNode).getCondition()).getOperands();
+ return filterOperands.size() == 2 &&
+ ((!filterOperands.get(0).getKind().equals(SqlKind.LITERAL)
+ && filterOperands.get(1).getKind().equals(SqlKind.LITERAL))
+ || (filterOperands.get(0).getKind().equals(SqlKind.LITERAL)
+ && !filterOperands.get(1).getKind().equals(SqlKind.LITERAL)));
+ };
- private static final SolrFilterRule FILTER_PROJECT_RULE =
- new SolrFilterRule(operand(LogicalFilter.class, operand(
- LogicalProject.class, operand(SolrTableScan.class, none()))), "SolrFilterProjectRule");
+ private static final SolrFilterRule FILTER_RULE = new SolrFilterRule();
- <R extends RelNode> SolrFilterRule(RelOptRuleOperand rule, String description) {
- super(rule, description);
+ private SolrFilterRule() {
+ super(LogicalFilter.class, FILTER_PREDICATE, "SolrFilterRule");
}
public RelNode convert(RelNode rel) {
@@ -194,14 +172,12 @@ class SolrRules {
/**
* Rule to convert a {@link Sort} to a {@link SolrSort}.
*/
- private static class SolrSortRule extends SolrRule {
-// static final SolrSortRule SORT_RULE = new SolrSortRule(operand(Sort.class, any()), "SolrSortRule");
+ private static class SolrSortRule extends SolrConverterRule {
- static final SolrSortRule SORT_RULE = new SolrSortRule(
- operand(Sort.class, operand(SolrTableScan.class, none())), "SolrSortRule");
+ static final SolrSortRule SORT_RULE = new SolrSortRule();
- <R extends RelNode> SolrSortRule(RelOptRuleOperand rule, String description) {
- super(rule, description);
+ private SolrSortRule() {
+ super(LogicalSort.class, relNode -> true, "SolrSortRule");
}
public RelNode convert(RelNode rel) {
[3/3] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master'
into jira/solr-8593
Posted by kr...@apache.org.
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1489fb93
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1489fb93
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1489fb93
Branch: refs/heads/jira/solr-8593
Commit: 1489fb936ff57628ef6531b049f63247302127f3
Parents: cd9a318 84171ec
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Nov 3 19:04:31 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Nov 3 19:04:31 2016 -0500
----------------------------------------------------------------------
.../core/src/java/org/apache/solr/response/JSONResponseWriter.java | 1 -
solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java | 2 --
2 files changed, 3 deletions(-)
----------------------------------------------------------------------