You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/04/07 02:00:24 UTC
[1/2] lucene-solr:branch_6_5: SOLR-10444: SQL interface does not use
client cache
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_5 bfa2d837c -> 16cf74190
SOLR-10444: SQL interface does not use client cache
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0fbd4944
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0fbd4944
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0fbd4944
Branch: refs/heads/branch_6_5
Commit: 0fbd4944fcef8ab076f668607e7e738e295231fc
Parents: bfa2d83
Author: Joel Bernstein <jb...@apache.org>
Authored: Thu Apr 6 21:17:02 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Thu Apr 6 21:48:57 2017 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/handler/StreamHandler.java | 4 ++++
solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java | 6 ++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0fbd4944/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
index 579057a..4edbace 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -94,6 +94,10 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
return PermissionNameProvider.Name.READ_PERM;
}
+ public static SolrClientCache getClientCache() {
+ return clientCache;
+ }
+
public void inform(SolrCore core) {
/* The stream factory will always contain the zkUrl for the given collection
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0fbd4944/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
index 03d054a..aa2b501 100644
--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
@@ -28,6 +28,7 @@ import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.schema.TranslatableTable;
import org.apache.calcite.schema.impl.AbstractTableQueryable;
import org.apache.calcite.util.Pair;
+import org.apache.solr.client.solrj.io.SolrClientCache;
import org.apache.solr.client.solrj.io.comp.ComparatorOrder;
import org.apache.solr.client.solrj.io.comp.FieldComparator;
import org.apache.solr.client.solrj.io.comp.MultipleFieldComparator;
@@ -51,6 +52,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.apache.solr.client.solrj.io.stream.metrics.*;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.handler.StreamHandler;
import java.io.IOException;
import java.util.*;
@@ -158,6 +160,10 @@ class SolrTable extends AbstractQueryableTable implements TranslatableTable {
throw new RuntimeException(e);
}
+ StreamContext streamContext = new StreamContext();
+ streamContext.setSolrClientCache(StreamHandler.getClientCache());
+ tupleStream.setStreamContext(streamContext);
+
final TupleStream finalStream = tupleStream;
return new AbstractEnumerable<Object>() {
[2/2] lucene-solr:branch_6_5: SOLR-10444: Fix precommit
Posted by jb...@apache.org.
SOLR-10444: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/16cf7419
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/16cf7419
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/16cf7419
Branch: refs/heads/branch_6_5
Commit: 16cf74190aff06173a1deafaa122d3443bc0529b
Parents: 0fbd494
Author: Joel Bernstein <jb...@apache.org>
Authored: Thu Apr 6 21:33:47 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Thu Apr 6 21:49:25 2017 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16cf7419/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
index aa2b501..87d4165 100644
--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrTable.java
@@ -28,7 +28,6 @@ import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.schema.TranslatableTable;
import org.apache.calcite.schema.impl.AbstractTableQueryable;
import org.apache.calcite.util.Pair;
-import org.apache.solr.client.solrj.io.SolrClientCache;
import org.apache.solr.client.solrj.io.comp.ComparatorOrder;
import org.apache.solr.client.solrj.io.comp.FieldComparator;
import org.apache.solr.client.solrj.io.comp.MultipleFieldComparator;