You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by va...@apache.org on 2018/10/05 20:06:27 UTC
incubator-livy git commit: [LIVY-500] Add beeline client for dev
Repository: incubator-livy
Updated Branches:
refs/heads/master df25e6f08 -> d87a34872
[LIVY-500] Add beeline client for dev
## What changes were proposed in this pull request?
The PR adds a new `thriftserver/client` module and a `beeline` script which are useful to have a client for the thriftserver during local testing. Both things are intended for dev usage only and are not shipped with the distribution.
## How was this patch tested?
manual test
Author: Marco Gaido <mg...@hortonworks.com>
Closes #113 from mgaido91/LIVY-500.
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/d87a3487
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/d87a3487
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/d87a3487
Branch: refs/heads/master
Commit: d87a34872069107329b67940d193c2962cf2026d
Parents: df25e6f
Author: Marco Gaido <mg...@hortonworks.com>
Authored: Fri Oct 5 13:06:21 2018 -0700
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Fri Oct 5 13:06:21 2018 -0700
----------------------------------------------------------------------
dev/beeline | 48 ++++++++++++++++++++++++++++++++
pom.xml | 1 +
thriftserver/client/pom.xml | 60 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 109 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/d87a3487/dev/beeline
----------------------------------------------------------------------
diff --git a/dev/beeline b/dev/beeline
new file mode 100755
index 0000000..620d4ab
--- /dev/null
+++ b/dev/beeline
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+export LIVY_HOME=$(cd $(dirname $0)/.. && pwd)
+CLASS="org.apache.hive.beeline.BeeLine"
+
+LIVY_CONF_DIR=${LIVY_CONF_DIR:-"$LIVY_HOME/conf"}
+
+if [ -f "${LIVY_CONF_DIR}/livy-env.sh" ]; then
+ # Promote all variable declarations to environment (exported) variables
+ set -a
+ . "${LIVY_CONF_DIR}/livy-env.sh"
+ set +a
+fi
+
+# Find the java binary
+if [ -n "${JAVA_HOME}" ]; then
+ RUNNER="${JAVA_HOME}/bin/java"
+elif [ `command -v java` ]; then
+ RUNNER="java"
+else
+ echo "JAVA_HOME is not set" >&2
+ exit 1
+fi
+
+
+LIBDIR="$LIVY_HOME/thriftserver/client/target/jars"
+
+if [ ! -d "$LIBDIR" ]; then
+ echo "Could not find Livy jars directory." 1>&2
+ exit 1
+fi
+
+exec $RUNNER $BEELINE_JAVA_OPTS -cp $LIBDIR/*:$LIVY_CONF_DIR:$CLASSPATH $CLASS "$@"
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/d87a3487/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02c71cb..32a6b89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1023,6 +1023,7 @@
<id>thriftserver</id>
<modules>
<module>thriftserver/server</module>
+ <module>thriftserver/client</module>
</modules>
</profile>
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/d87a3487/thriftserver/client/pom.xml
----------------------------------------------------------------------
diff --git a/thriftserver/client/pom.xml b/thriftserver/client/pom.xml
new file mode 100644
index 0000000..d80524e
--- /dev/null
+++ b/thriftserver/client/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>livy-main</artifactId>
+ <groupId>org.apache.livy</groupId>
+ <version>0.6.0-incubating-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+
+ <artifactId>livy-beeline</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-jdbc</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-beeline</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>