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 2017/04/07 15:47:52 UTC
[15/24] lucene-solr:jira/solr-6203: SOLR-10444: SQL interface does
not use client cache
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/865f9b2b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/865f9b2b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/865f9b2b
Branch: refs/heads/jira/solr-6203
Commit: 865f9b2b0155ed7b9326c1a79000fde935ee00d2
Parents: 6e5f6fa
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:19:45 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/865f9b2b/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 8f123ec..6f373f6 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -115,6 +115,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/865f9b2b/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 b7f552b..aa873cc 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>() {