Repository: spark
Updated Branches:
  refs/heads/master 0cdcdd2c9 -> f0eea76d9


[SQL][DOCS] Clarify that the server is for JDBC and ODBC

Author: Michael Armbrust <[email protected]>

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


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f0eea76d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f0eea76d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f0eea76d

Branch: refs/heads/master
Commit: f0eea76d941c487763febbd9162600f89cedbd5c
Parents: 0cdcdd2
Author: Michael Armbrust <[email protected]>
Authored: Fri Sep 26 22:24:34 2014 -0700
Committer: Reynold Xin <[email protected]>
Committed: Fri Sep 26 22:24:34 2014 -0700

----------------------------------------------------------------------
 docs/sql-programming-guide.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/f0eea76d/docs/sql-programming-guide.md
----------------------------------------------------------------------
diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index c1f8054..6524980 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
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to