Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5C8281855A for ; Wed, 10 Jun 2015 18:48:22 +0000 (UTC) Received: (qmail 62753 invoked by uid 500); 10 Jun 2015 18:48:22 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 62722 invoked by uid 500); 10 Jun 2015 18:48:22 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 62713 invoked by uid 99); 10 Jun 2015 18:48:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jun 2015 18:48:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08A29E0385; Wed, 10 Jun 2015 18:48:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rxin@apache.org To: commits@spark.apache.org Message-Id: <453d526e109244369c506066ced580b8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SQL] [MINOR] Fixes a minor Java example error in SQL programming guide Date: Wed, 10 Jun 2015 18:48:22 +0000 (UTC) Repository: spark Updated Branches: refs/heads/branch-1.4 a0a7f2f92 -> 7b88e6a1e [SQL] [MINOR] Fixes a minor Java example error in SQL programming guide Author: Cheng Lian Closes #6749 from liancheng/java-sample-fix and squashes the following commits: 5b44585 [Cheng Lian] Fixes a minor Java example error in SQL programming guide (cherry picked from commit 8f7308f9c49805b9486aaae5f60e4481e8ba24e8) Signed-off-by: Reynold Xin Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7b88e6a1 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7b88e6a1 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7b88e6a1 Branch: refs/heads/branch-1.4 Commit: 7b88e6a1e3b8f79cb41842bc21893760dc4b74e6 Parents: a0a7f2f Author: Cheng Lian Authored: Wed Jun 10 11:48:14 2015 -0700 Committer: Reynold Xin Committed: Wed Jun 10 11:48:19 2015 -0700 ---------------------------------------------------------------------- docs/sql-programming-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7b88e6a1/docs/sql-programming-guide.md ---------------------------------------------------------------------- diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md index cde5830..17f2954 100644 --- a/docs/sql-programming-guide.md +++ b/docs/sql-programming-guide.md @@ -1475,7 +1475,7 @@ expressed in HiveQL. {% highlight java %} // sc is an existing JavaSparkContext. -HiveContext sqlContext = new org.apache.spark.sql.hive.HiveContext(sc); +HiveContext sqlContext = new org.apache.spark.sql.hive.HiveContext(sc.sc); sqlContext.sql("CREATE TABLE IF NOT EXISTS src (key INT, value STRING)"); sqlContext.sql("LOAD DATA LOCAL INPATH 'examples/src/main/resources/kv1.txt' INTO TABLE src"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org