From abc8be45255e2071a93b58386748c3cae031f6a4 Mon Sep 17 00:00:00 2001 From: weiwenda Date: Wed, 25 Sep 2019 13:29:50 +0800 Subject: [PATCH 1/2] .hiverc is loaded twice making create function throw exception --- .../scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala b/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala index 31d45dd..e6d58b1 100644 --- a/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala +++ b/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala @@ -108,7 +108,8 @@ object SparkXSQLShell extends Logging { sqlContext = spark.sqlContext conf = spark.sparkContext.getConf sc = spark.sparkContext - processInitFile(conf) + // we shouldn't load .hiverc twice + // processInitFile(conf) } def initialize(sqlContent: String, conf: SparkConf) = { From 17b7ee4ecd6591077f40b972c287468705d75b00 Mon Sep 17 00:00:00 2001 From: weiwenda Date: Sun, 29 Sep 2019 10:23:19 +0800 Subject: [PATCH 2/2] .hiverc is loaded twice making create function throw exception --- .../scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala b/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala index e6d58b1..54d27e0 100644 --- a/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala +++ b/sql/xsql-shell/src/main/scala/org/apache/spark/sql/xsql/shell/SparkXSQLShell.scala @@ -108,7 +108,8 @@ object SparkXSQLShell extends Logging { sqlContext = spark.sqlContext conf = spark.sparkContext.getConf sc = spark.sparkContext - // we shouldn't load .hiverc twice + // Don't call processInitFile again to avoid load .hiverc twice. + // For more details, please see https://github.com/Qihoo360/XSQL/pull/45 // processInitFile(conf) }