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 2016/02/02 19:14:34 UTC
lucene-solr git commit: SOLR-8510: Implement
DatabaseMetaDataImpl.getSchemas()
Repository: lucene-solr
Updated Branches:
refs/heads/master a48ba5090 -> 2419a3873
SOLR-8510: Implement DatabaseMetaDataImpl.getSchemas()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2419a387
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2419a387
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2419a387
Branch: refs/heads/master
Commit: 2419a3873ae0fc7d51bc80a10950743f45762679
Parents: a48ba50
Author: jbernste <jb...@apache.org>
Authored: Tue Feb 2 13:18:06 2016 -0500
Committer: jbernste <jb...@apache.org>
Committed: Tue Feb 2 13:19:06 2016 -0500
----------------------------------------------------------------------
.../org/apache/solr/handler/SQLHandler.java | 57 +++++++++++++++++++-
.../solrj/io/sql/DatabaseMetaDataImpl.java | 2 +-
.../solr/client/solrj/io/sql/JdbcTest.java | 16 ++++++
3 files changed, 73 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2419a387/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
index ec0ec77..49178bd 100644
--- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
@@ -20,6 +20,7 @@ package org.apache.solr.handler;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
@@ -29,6 +30,7 @@ import com.facebook.presto.sql.tree.*;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.comp.ComparatorOrder;
import org.apache.solr.client.solrj.io.comp.FieldComparator;
@@ -170,6 +172,12 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware {
}
sqlStream = new CatalogsStream(defaultZkhost);
+ } else if(sqlVistor.table.toUpperCase(Locale.getDefault()).contains("_SCHEMAS_")) {
+ if (!sqlVistor.fields.contains("TABLE_SCHEM") || !sqlVistor.fields.contains("TABLE_CATALOG")) {
+ throw new IOException("When querying _SCHEMAS_, fields must contain both TABLE_SCHEM and TABLE_CATALOG");
+ }
+
+ sqlStream = new SchemasStream(defaultZkhost);
} else if(sqlVistor.groupByQuery) {
if(aggregationMode == AggregationMode.FACET) {
sqlStream = doGroupByWithAggregatesFacets(sqlVistor);
@@ -1383,8 +1391,55 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware {
public Tuple read() throws IOException {
Map fields = new HashMap<>();
if (this.currentIndex < this.catalogs.size()) {
+ fields.put("TABLE_CAT", this.catalogs.get(this.currentIndex));
+ this.currentIndex += 1;
+ } else {
+ fields.put("EOF", "true");
+ }
+ return new Tuple(fields);
+ }
+
+ public StreamComparator getStreamSort() {
+ return null;
+ }
+
+ public void close() throws IOException {
+
+ }
+
+ public void setStreamContext(StreamContext context) {
+ this.context = context;
+ }
+ }
+
+ private static class SchemasStream extends TupleStream {
+ private final String zkHost;
+ private StreamContext context;
+ private int currentIndex = 0;
+ private List<String> schemas;
+
+ public SchemasStream(String zkHost) {
+ this.zkHost = zkHost;
+ }
+
+ public List<TupleStream> children() {
+ return new ArrayList<>();
+ }
+
+ public void open() throws IOException {
+ this.schemas = new ArrayList<>();
+
+ CloudSolrClient cloudSolrClient = this.context.getSolrClientCache().getCloudSolrClient(this.zkHost);
+ this.schemas.addAll(cloudSolrClient.getZkStateReader().getClusterState().getCollections());
+ Collections.sort(this.schemas);
+ }
+
+ public Tuple read() throws IOException {
+ Map fields = new HashMap<>();
+ if (this.currentIndex < this.schemas.size()) {
+ fields.put("TABLE_SCHEM", this.schemas.get(this.currentIndex));
+ fields.put("TABLE_CATALOG", this.zkHost);
this.currentIndex += 1;
- fields.put("TABLE_CAT", this.zkHost);
} else {
fields.put("EOF", "true");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2419a387/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java
index 4700f2f..3ed9e37 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java
@@ -640,7 +640,7 @@ class DatabaseMetaDataImpl implements DatabaseMetaData {
@Override
public ResultSet getSchemas() throws SQLException {
- return null;
+ return this.connectionStatement.executeQuery("select TABLE_SCHEM, TABLE_CATALOG from _SCHEMAS_");
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2419a387/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
index 7f9e98f..b8922a4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
@@ -25,7 +25,11 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.Statement;
import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import java.util.Properties;
+import java.util.Set;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
@@ -393,6 +397,18 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
assertFalse(rs.next());
}
+ List<String> collections = new ArrayList<>();
+ collections.addAll(cloudClient.getZkStateReader().getClusterState().getCollections());
+ Collections.sort(collections);
+ try(ResultSet rs = databaseMetaData.getSchemas()) {
+ for(String acollection : collections) {
+ assertTrue(rs.next());
+ assertEquals(acollection, rs.getString("TABLE_SCHEM"));
+ assertEquals(zkServer.getZkAddress(), rs.getString("TABLE_CATALOG"));
+ }
+ assertFalse(rs.next());
+ }
+
assertNull(con.getWarnings());
con.clearWarnings();
assertNull(con.getWarnings());