You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/02/16 13:47:25 UTC
[35/50] lucene-solr:jira/solr-9858: Fix two test issues an NPE and
ordering issue
Fix two test issues an NPE and ordering issue
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/63eecedb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/63eecedb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/63eecedb
Branch: refs/heads/jira/solr-9858
Commit: 63eecedbc16fb22c824a31b2d8a92ab250b5e2cb
Parents: 7a3dd46
Author: Kevin Risden <kr...@apache.org>
Authored: Wed Feb 1 12:27:59 2017 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Feb 1 12:27:59 2017 -0500
----------------------------------------------------------------------
.../solr/client/solrj/io/sql/JdbcTest.java | 35 ++++++++++++++++----
1 file changed, 28 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/63eecedb/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 9461725..927856a 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,6 +25,10 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.SortedSet;
@@ -32,10 +36,12 @@ import java.util.TreeSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.cloud.AbstractDistribZkTestBase;
import org.apache.solr.cloud.SolrCloudTestCase;
+import org.apache.solr.common.cloud.Aliases;
import org.apache.solr.common.cloud.ZkStateReader;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -499,14 +505,19 @@ public class JdbcTest extends SolrCloudTestCase {
// assertEquals(0, databaseMetaData.getDriverMajorVersion());
// assertEquals(0, databaseMetaData.getDriverMinorVersion());
+
+ List<String> tableSchemas = new ArrayList<>(Arrays.asList(zkHost, "metadata"));
try(ResultSet rs = databaseMetaData.getSchemas()) {
assertTrue(rs.next());
- assertEquals(zkHost, rs.getString("tableSchem"));
+ assertTrue(tableSchemas.contains(rs.getString("tableSchem")));
+ tableSchemas.remove(rs.getString("tableSchem"));
assertNull(rs.getString("tableCat"));
assertTrue(rs.next());
- assertEquals("metadata", rs.getString("tableSchem"));
+ assertTrue(tableSchemas.contains(rs.getString("tableSchem")));
+ tableSchemas.remove(rs.getString("tableSchem"));
assertNull(rs.getString("tableCat"));
assertFalse(rs.next());
+ assertTrue(tableSchemas.isEmpty());
}
try(ResultSet rs = databaseMetaData.getCatalogs()) {
@@ -515,13 +526,23 @@ public class JdbcTest extends SolrCloudTestCase {
assertFalse(rs.next());
}
- ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
+ CloudSolrClient solrClient = cluster.getSolrClient();
+ solrClient.connect();
+ ZkStateReader zkStateReader = solrClient.getZkStateReader();
SortedSet<String> tables = new TreeSet<>();
- Set<String> collections = zkStateReader.getClusterState().getCollectionsMap().keySet();
- Set<String> aliases = zkStateReader.getAliases().getCollectionAliasMap().keySet();
- tables.addAll(collections);
- tables.addAll(aliases);
+
+ Set<String> collectionsSet = zkStateReader.getClusterState().getCollectionsMap().keySet();
+ tables.addAll(collectionsSet);
+
+ Aliases aliases = zkStateReader.getAliases();
+ if(aliases != null) {
+ Map<String, String> collectionAliasMap = aliases.getCollectionAliasMap();
+ if(collectionAliasMap != null) {
+ Set<String> aliasesSet = collectionAliasMap.keySet();
+ tables.addAll(aliasesSet);
+ }
+ }
try(ResultSet rs = databaseMetaData.getTables(null, zkHost, "%", null)) {
for(String table : tables) {