aboutsummaryrefslogtreecommitdiff
path: root/docs/sql-programming-guide.md
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2014-09-26 22:24:34 -0700
committerReynold Xin <rxin@apache.org>2014-09-26 22:24:34 -0700
commitf0eea76d941c487763febbd9162600f89cedbd5c (patch)
tree36a2f1927f0b69afd4a65b1dd138a286d0ebb189 /docs/sql-programming-guide.md
parent0cdcdd2c9df98fb64d9d16ebace992fbba9c16b4 (diff)
downloadspark-f0eea76d941c487763febbd9162600f89cedbd5c.tar.gz
spark-f0eea76d941c487763febbd9162600f89cedbd5c.tar.bz2
spark-f0eea76d941c487763febbd9162600f89cedbd5c.zip
[SQL][DOCS] Clarify that the server is for JDBC and ODBC
Author: Michael Armbrust <michael@databricks.com> Closes #2527 from marmbrus/patch-1 and squashes the following commits: a0f9f1c [Michael Armbrust] [SQL][DOCS] Clarify that the server is for JDBC and ODBC
Diffstat (limited to 'docs/sql-programming-guide.md')
-rw-r--r--docs/sql-programming-guide.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index c1f80544bf..65249808fa 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -872,12 +872,12 @@ that these options will be deprecated in future release as more optimizations ar
Spark SQL also supports interfaces for running SQL queries directly without the need to write any
code.
-## Running the Thrift JDBC server
+## Running the Thrift JDBC/ODBC server
-The Thrift JDBC server implemented here corresponds to the [`HiveServer2`](https://cwiki.apache.org/confluence/display/Hive/Setting+Up+HiveServer2)
+The Thrift JDBC/ODBC server implemented here corresponds to the [`HiveServer2`](https://cwiki.apache.org/confluence/display/Hive/Setting+Up+HiveServer2)
in Hive 0.12. You can test the JDBC server with the beeline script that comes with either Spark or Hive 0.12.
-To start the JDBC server, run the following in the Spark directory:
+To start the JDBC/ODBC server, run the following in the Spark directory:
./sbin/start-thriftserver.sh
@@ -906,11 +906,11 @@ or system properties:
```
{% endhighlight %}
-Now you can use beeline to test the Thrift JDBC server:
+Now you can use beeline to test the Thrift JDBC/ODBC server:
./bin/beeline
-Connect to the JDBC server in beeline with:
+Connect to the JDBC/ODBC server in beeline with:
beeline> !connect jdbc:hive2://localhost:10000