Browse Source

[notebook] Clean-up the ini template

Romain Rigaux 10 years ago
parent
commit
1ad98ac

+ 56 - 66
desktop/conf/pseudo-distributed.ini.tmpl

@@ -530,73 +530,63 @@
 ###########################################################################
 
 [notebook]
-  # - section name: is a unique id of the type of snippet
-  # - name: is the nice name to print in the notebook
-  # - interface: is the connector to use to talk to the server:
-  #   * hiveserver2 is configurable in [beeswax] and [impala]
-  #   * livy and livy-batch are configurable for spark shell and spark-submit, respectively
-  #   * dbms-X in [libdbms] [[X]]
-  #   * jdbc in [jdbc]
-  #   * odbc in [odbc]
-  #   * pig in [pig] 
-  
+
   [[interpreters]]
-  
-  [[[hive]]]
-  name=Hive
-  interface=hiveserver2
-
-  [[[impala]]]
-  name=Impala
-  interface=hiveserver2
-
-  [[[scala]]]
-  name=Scala
-  interface=livy
-
-  [[[pyspark]]]
-  name=PySpark
-  interface=livy
-
-  [[[r]]]
-  name=R
-  interface=livy
-
-  [[[jar]]]
-  name=Spark Submit Jar
-  interface=livy-batch
-
-  [[[py]]]
-  name=Spark Submit Python
-  interface=livy-batch
-
-  [[[phoenix]]]
-  name=Phoenix
-  interface=jdbc
-
-  [[[mysql]]]
-  name=MySql
-  interface=dbms-mysql
-  # interface=jdbc
-  # interface=odbc
-
-  [[[pig]]]
-  name=Pig
-  interface=pig
-
-  [[[text]]]
-  name=Text
-  interface=text
-
-[jdbc]
-  [[mysql]]
-  driver={host, port, database}
-  auth={user, password}
-  # auth: optional: prompt user or impersonation if available, e.g. https://issues.apache.org/jira/browse/HIVE-6486
-
-  [[phoenix]]
-  driver={host, port, database}
-  auth={user, password}
+
+    [[[hive]]]
+    name=Hive
+    interface=hiveserver2
+
+    [[[impala]]]
+    name=Impala
+    interface=hiveserver2
+
+    [[[scala]]]
+    name=Scala
+    interface=livy
+
+    [[[pyspark]]]
+    name=PySpark
+    interface=livy
+
+    [[[r]]]
+    name=R
+    interface=livy
+
+    [[[jar]]]
+    name=Spark Submit Jar
+    interface=livy-batch
+
+    [[[py]]]
+    name=Spark Submit Python
+    interface=livy-batch
+
+    [[[text]]]
+    name=Text
+    interface=text
+
+    [[[mysql]]]
+    name=MySql
+    interface=mysql
+
+    [[[mysqljdbc]]]
+    name=MySql JDBC
+    interface=jdbc
+
+    ## [[[phoenix]]]
+    ## name=Phoenix
+    ## interface=jdbc-phoenix
+
+# Proof of concept
+# [jdbc]
+#  [[mysql]]
+#  driver={host, port, database}
+#  auth={user, password}
+#  # auth: optional: prompt user or impersonation if available, e.g. https://issues.apache.org/jira/browse/HIVE-6486
+
+#  [[phoenix]]
+#  driver={host, port, database}
+#  auth={user, password}
 
 
 ###########################################################################

+ 2 - 2
desktop/core/src/desktop/static/desktop/js/assistHelper.js

@@ -142,9 +142,9 @@ AssistHelper.prototype.clearCache = function() {
   $.totalStorage("hue.assist." + self.getTotalStorageUserPrefix(), {});
 };
 
-AssistHelper.prototype.fetchPanelData = function (hierarcy, successCallback, errorCallback) {
+AssistHelper.prototype.fetchPanelData = function (hierarchy, successCallback, errorCallback) {
   var self = this;
-  self.fetchAssistData("/" + self.options.app + "/api/autocomplete/" + hierarcy.join("/"), successCallback, errorCallback);
+  self.fetchAssistData("/" + self.options.app + "/api/autocomplete/" + hierarchy.join("/"), successCallback, errorCallback);
 };
 
 AssistHelper.prototype.fetchAssistData = function (url, successCallback, errorCallback) {