9c530576a4
## What changes were proposed in this pull request?
This PR exposes `sql` in PySpark Shell like Scala/R Shells for consistency.
**Background**
* Scala
```scala
scala> sql("select 1 a")
res0: org.apache.spark.sql.DataFrame = [a: int]
```
* R
```r
> sql("select 1")
SparkDataFrame[1:int]
```
**Before**
* Python
```python
>>> sql("select 1 a")
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
NameError: name 'sql' is not defined
```
**After**
* Python
```python
>>> sql("select 1 a")
DataFrame[a: int]
```
## How was this patch tested?
Manual.
Author: Dongjoon Hyun <dongjoon@apache.org>
Closes #14190 from dongjoon-hyun/SPARK-16536.
79 lines
2.4 KiB
Python
79 lines
2.4 KiB
Python
#
|
|
# 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.
|
|
#
|
|
|
|
"""
|
|
An interactive shell.
|
|
|
|
This file is designed to be launched as a PYTHONSTARTUP script.
|
|
"""
|
|
|
|
import atexit
|
|
import os
|
|
import platform
|
|
|
|
import py4j
|
|
|
|
import pyspark
|
|
from pyspark.context import SparkContext
|
|
from pyspark.sql import SparkSession, SQLContext
|
|
from pyspark.storagelevel import StorageLevel
|
|
|
|
if os.environ.get("SPARK_EXECUTOR_URI"):
|
|
SparkContext.setSystemProperty("spark.executor.uri", os.environ["SPARK_EXECUTOR_URI"])
|
|
|
|
SparkContext._ensure_initialized()
|
|
|
|
try:
|
|
# Try to access HiveConf, it will raise exception if Hive is not added
|
|
SparkContext._jvm.org.apache.hadoop.hive.conf.HiveConf()
|
|
spark = SparkSession.builder\
|
|
.enableHiveSupport()\
|
|
.getOrCreate()
|
|
except py4j.protocol.Py4JError:
|
|
spark = SparkSession.builder.getOrCreate()
|
|
except TypeError:
|
|
spark = SparkSession.builder.getOrCreate()
|
|
|
|
sc = spark.sparkContext
|
|
sql = spark.sql
|
|
atexit.register(lambda: sc.stop())
|
|
|
|
# for compatibility
|
|
sqlContext = spark._wrapped
|
|
sqlCtx = sqlContext
|
|
|
|
print("""Welcome to
|
|
____ __
|
|
/ __/__ ___ _____/ /__
|
|
_\ \/ _ \/ _ `/ __/ '_/
|
|
/__ / .__/\_,_/_/ /_/\_\ version %s
|
|
/_/
|
|
""" % sc.version)
|
|
print("Using Python version %s (%s, %s)" % (
|
|
platform.python_version(),
|
|
platform.python_build()[0],
|
|
platform.python_build()[1]))
|
|
print("SparkSession available as 'spark'.")
|
|
|
|
# The ./bin/pyspark script stores the old PYTHONSTARTUP value in OLD_PYTHONSTARTUP,
|
|
# which allows us to execute the user's PYTHONSTARTUP file:
|
|
_pythonstartup = os.environ.get('OLD_PYTHONSTARTUP')
|
|
if _pythonstartup and os.path.isfile(_pythonstartup):
|
|
with open(_pythonstartup) as f:
|
|
code = compile(f.read(), _pythonstartup, 'exec')
|
|
exec(code)
|