You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2015/12/16 20:52:07 UTC
calcite git commit: [CALCITE-934] Use an OS-assigned ephemeral port
for CalciteRemoteDriverTest
Repository: calcite
Updated Branches:
refs/heads/master 322b97300 -> 1bbb6a2b9
[CALCITE-934] Use an OS-assigned ephemeral port for CalciteRemoteDriverTest
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/1bbb6a2b
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/1bbb6a2b
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/1bbb6a2b
Branch: refs/heads/master
Commit: 1bbb6a2b97bf3da149c5f878b2d59ceafa737521
Parents: 322b973
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 16 14:50:40 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 16 14:50:40 2015 -0500
----------------------------------------------------------------------
core/pom.xml | 3 +++
.../org/apache/calcite/jdbc/CalciteRemoteDriverTest.java | 9 ++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/1bbb6a2b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index f710e66..32c6d3a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -244,6 +244,9 @@ limitations under the License.
<ignoredUnusedDeclaredDependency>net.hydromatic:foodmart-data-hsqldb</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.postgresql:postgresql</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
+ <ignoredUsedUndeclaredDependencies>
+ <ignoredUsedUndeclaredDependency>org.eclipse.jetty:jetty-server</ignoredUsedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/calcite/blob/1bbb6a2b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
index d43e5d2..b0a0be7 100644
--- a/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
+++ b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
@@ -22,8 +22,10 @@ import org.apache.calcite.avatica.SqlType;
import org.apache.calcite.avatica.remote.LocalJsonService;
import org.apache.calcite.avatica.remote.LocalService;
import org.apache.calcite.avatica.remote.Service;
+import org.apache.calcite.avatica.server.AvaticaJsonHandler;
import org.apache.calcite.avatica.server.HttpServer;
import org.apache.calcite.avatica.server.Main;
+import org.apache.calcite.avatica.server.Main.HandlerFactory;
import org.apache.calcite.prepare.CalcitePrepareImpl;
import org.apache.calcite.test.CalciteAssert;
import org.apache.calcite.test.JdbcFrontLinqBackTest;
@@ -152,7 +154,12 @@ public class CalciteRemoteDriverTest {
@BeforeClass public static void beforeClass() throws Exception {
localConnection = CalciteAssert.hr().connect();
- start = Main.start(new String[]{Factory.class.getName()});
+ // Make sure we pick an ephemeral port for the server
+ start = Main.start(new String[]{Factory.class.getName()}, 0, new HandlerFactory() {
+ public AvaticaJsonHandler createHandler(Service service) {
+ return new AvaticaJsonHandler(service);
+ }
+ });
final int port = start.getPort();
remoteConnection = DriverManager.getConnection(
"jdbc:avatica:remote:url=http://localhost:" + port);