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 2017/01/06 21:33:08 UTC
[1/2] lucene-solr:jira/solr-8593: Upgrade to Calcite 1.11.0
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8593 82350229c -> 5f6548765
Upgrade to Calcite 1.11.0
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7a53e9a1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a53e9a1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a53e9a1
Branch: refs/heads/jira/solr-8593
Commit: 7a53e9a152657aa553dc674f6468a0c0b4396213
Parents: 8235022
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Jan 6 15:32:18 2017 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Fri Jan 6 15:32:18 2017 -0600
----------------------------------------------------------------------
lucene/default-nested-ivy-settings.xml | 2 --
lucene/ivy-versions.properties | 7 ++++---
solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1 | 1 -
solr/licenses/calcite-core-1.11.0.jar.sha1 | 1 +
solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1 | 1 -
solr/licenses/calcite-linq4j-1.11.0.jar.sha1 | 1 +
6 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a53e9a1/lucene/default-nested-ivy-settings.xml
----------------------------------------------------------------------
diff --git a/lucene/default-nested-ivy-settings.xml b/lucene/default-nested-ivy-settings.xml
index 908a380..522fd29 100644
--- a/lucene/default-nested-ivy-settings.xml
+++ b/lucene/default-nested-ivy-settings.xml
@@ -32,7 +32,6 @@
<caches lockStrategy="${ivy.lock-strategy}" resolutionCacheDir="${ivy.resolution-cache.dir}" />
<resolvers>
- <ibiblio name="apache-snapshot" root="https://repository.apache.org/content/repositories/snapshots" m2compatible="true" />
<ibiblio name="sonatype-releases" root="https://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
<ibiblio name="maven.restlet.org" root="http://maven.restlet.org" m2compatible="true" />
<ibiblio name="releases.cloudera.com" root="http://repository.cloudera.com/content/repositories/releases" m2compatible="true" />
@@ -51,7 +50,6 @@
<resolver ref="local"/>
<!-- <resolver ref="local-maven-2" /> -->
<resolver ref="main"/>
- <resolver ref="apache-snapshot" />
<resolver ref="maven.restlet.org" />
<resolver ref="sonatype-releases" />
<resolver ref="releases.cloudera.com"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a53e9a1/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a0ab1f4..2b53454 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -105,12 +105,13 @@ io.netty.netty-all.version = 4.0.36.Final
/org.apache.ant/ant = 1.8.2
/org.apache.avro/avro = 1.7.5
-org.apache.calcite.version = 1.11.0-SNAPSHOT
-org.apache.calcite.avatica.version = 1.9.0
-/org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
+org.apache.calcite.version = 1.11.0
/org.apache.calcite/calcite-core = ${org.apache.calcite.version}
/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
+org.apache.calcite.avatica.version = 1.9.0
+/org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
+
/org.apache.commons/commons-compress = 1.11
/org.apache.commons/commons-exec = 1.3
/org.apache.commons/commons-math3 = 3.4.1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a53e9a1/solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1 b/solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1
deleted file mode 100644
index f00eb05..0000000
--- a/solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e4602dbaac8a35f922e63a7f207ca1272479159
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a53e9a1/solr/licenses/calcite-core-1.11.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-core-1.11.0.jar.sha1 b/solr/licenses/calcite-core-1.11.0.jar.sha1
new file mode 100644
index 0000000..980c772
--- /dev/null
+++ b/solr/licenses/calcite-core-1.11.0.jar.sha1
@@ -0,0 +1 @@
+d0f90841119f1ec02a64ef029ff525171a320cff
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a53e9a1/solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1 b/solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1
deleted file mode 100644
index 9c06c41..0000000
--- a/solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ceeb60b30b113dc2e64d393724b56b06e5db332
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a53e9a1/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-linq4j-1.11.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
new file mode 100644
index 0000000..9839632
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
@@ -0,0 +1 @@
+b09e988f64c69c21cc61aa734e9955736a07e016
[2/2] lucene-solr:jira/solr-8593: Add collection alias support for
Calcite
Posted by kr...@apache.org.
Add collection alias support for Calcite
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5f654876
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5f654876
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5f654876
Branch: refs/heads/jira/solr-8593
Commit: 5f6548765822d72ef6cea873b9df60bc1ee4bc6a
Parents: 7a53e9a
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Jan 6 15:32:41 2017 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Fri Jan 6 15:32:41 2017 -0600
----------------------------------------------------------------------
.../org/apache/solr/handler/sql/SolrSchema.java | 13 ++++++++++--
.../solr/client/solrj/io/sql/JdbcTest.java | 21 ++++++++++++--------
2 files changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5f654876/solr/core/src/java/org/apache/solr/handler/sql/SolrSchema.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrSchema.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrSchema.java
index 8c3eaa9..221ddf8 100644
--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrSchema.java
+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrSchema.java
@@ -25,6 +25,8 @@ import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.LukeRequest;
import org.apache.solr.client.solrj.response.LukeResponse;
+import org.apache.solr.common.cloud.ClusterState;
+import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.luke.FieldFlag;
import java.io.IOException;
@@ -46,12 +48,19 @@ class SolrSchema extends AbstractSchema {
String zk = this.properties.getProperty("zk");
try(CloudSolrClient cloudSolrClient = new CloudSolrClient.Builder().withZkHost(zk).build()) {
cloudSolrClient.connect();
- Set<String> collections = cloudSolrClient.getZkStateReader().getClusterState().getCollectionsMap().keySet();
+ ZkStateReader zkStateReader = cloudSolrClient.getZkStateReader();
+ ClusterState clusterState = zkStateReader.getClusterState();
final ImmutableMap.Builder<String, Table> builder = ImmutableMap.builder();
- for (String collection : collections) {
+
+ for (String collection : clusterState.getCollectionsMap().keySet()) {
builder.put(collection, new SolrTable(this, collection));
}
+
+ for (Map.Entry<String, String> alias : zkStateReader.getAliases().getCollectionAliasMap().entrySet()) {
+ builder.put(alias.getKey(), new SolrTable(this, alias.getValue()));
+ }
+
return builder.build();
} catch (IOException e) {
throw new RuntimeException(e);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5f654876/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 69d236f..9461725 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,10 +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.Collections;
-import java.util.List;
import java.util.Properties;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
@@ -36,6 +36,7 @@ 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.ZkStateReader;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -514,16 +515,20 @@ public class JdbcTest extends SolrCloudTestCase {
assertFalse(rs.next());
}
- List<String> collections = new ArrayList<>();
- collections.addAll(cluster.getSolrClient().getZkStateReader().getClusterState().getCollectionsMap().keySet());
- Collections.sort(collections);
+ ZkStateReader zkStateReader = cluster.getSolrClient().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);
try(ResultSet rs = databaseMetaData.getTables(null, zkHost, "%", null)) {
- for(String acollection : collections) {
+ for(String table : tables) {
assertTrue(rs.next());
assertNull(rs.getString("tableCat"));
assertEquals(zkHost, rs.getString("tableSchem"));
- assertEquals(acollection, rs.getString("tableName"));
+ assertEquals(table, rs.getString("tableName"));
assertEquals("TABLE", rs.getString("tableType"));
assertNull(rs.getString("remarks"));
}