[ZEPPELIN-5493] Remove prefix in jdbc interpreter (apache#4463)

* Remove prefix in jdbc interpreter * update docs
seung-00 · Oct 28, 2022 · 679b3fb · 679b3fb
1 parent 36aebad
commit 679b3fb
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 241 deletions.
diff --git a/docs/interpreter/hive.md b/docs/interpreter/hive.md
@@ -25,7 +25,7 @@ limitations under the License.
 
 ## Important Notice
 
-Hive Interpreter will be deprecated and merged into JDBC Interpreter. 
+Hive Interpreter has been deprecated and merged into JDBC Interpreter. 
 You can use Hive Interpreter by using JDBC Interpreter with same functionality. 
 See the example below of settings and dependencies.
 
@@ -36,19 +36,19 @@ See the example below of settings and dependencies.
     <th>Value</th>
   </tr>
   <tr>
-    <td>hive.driver</td>
+    <td>default.driver</td>
     <td>org.apache.hive.jdbc.HiveDriver</td>
   </tr>
   <tr>
-    <td>hive.url</td>
+    <td>default.url</td>
     <td>jdbc:hive2://localhost:10000</td>
   </tr>
   <tr>
-    <td>hive.user</td>
+    <td>default.user</td>
     <td>hiveUser</td>
   </tr>
   <tr>
-    <td>hive.password</td>
+    <td>default.password</td>
     <td>hivePassword</td>
   </tr>
 </table>
@@ -102,31 +102,6 @@ See the example below of settings and dependencies.
     <td></td>
     <td><b>( Optional ) </b>Other properties used by the driver</td>
   </tr>
-  <tr>
-    <td>${prefix}.driver</td>
-    <td></td>
-    <td>Driver class path of <code>%hive(${prefix})</code> </td>
-  </tr>
-  <tr>
-    <td>${prefix}.url</td>
-    <td></td>
-    <td>Url of <code>%hive(${prefix})</code> </td>
-  </tr>
-  <tr>
-    <td>${prefix}.user</td>
-    <td></td>
-    <td><b>( Optional ) </b>Username of the connection of <code>%hive(${prefix})</code> </td>
-  </tr>
-  <tr>
-    <td>${prefix}.password</td>
-    <td></td>
-    <td><b>( Optional ) </b>Password of the connection of <code>%hive(${prefix})</code> </td>
-  </tr>
-  <tr>
-    <td>${prefix}.xxx</td>
-    <td></td>
-    <td><b>( Optional ) </b>Other properties used by the driver of <code>%hive(${prefix})</code> </td>
-  </tr>
   <tr>
     <td>zeppelin.jdbc.hive.timeout.threshold</td>
     <td>60000</td>
@@ -144,8 +119,6 @@ See the example below of settings and dependencies.
   </tr>
 </table>
 
-This interpreter provides multiple configuration with `${prefix}`. User can set a multiple connection properties by this prefix. It can be used like `%hive(${prefix})`.
-
 ## Overview
 
 The [Apache Hive](https://hive.apache.org/) ™ data warehouse software facilitates querying and managing large datasets 
@@ -162,14 +135,6 @@ Basically, you can use
 select * from my_table;
 ```
 
-or
-
-```sql
-%hive(etl)
--- 'etl' is a ${prefix}
-select * from my_table;
-```
-
 You can also run multiple queries up to 10 by default. Changing these settings is not implemented yet.
 
 ### Apply Zeppelin Dynamic Forms

diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md
@@ -722,16 +722,16 @@ See [User Impersonation in interpreter](../usage/interpreter/user_impersonation.
     <th>Value</th>
   </tr>
   <tr>
-    <td>hive.driver</td>
+    <td>default.driver</td>
     <td>org.apache.hive.jdbc.HiveDriver</td>
   </tr>
   <tr>
-    <td>hive.url</td>
+    <td>default.url</td>
     <td>jdbc:hive2://hive-server-host:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2</td>
   </tr>
   <tr>
-    <td>hive.proxy.user.property</td>
-    <td>hive.server2.proxy.user</td>
+    <td>default.proxy.user.property</td>
+    <td>default.server2.proxy.user</td>
   </tr>
   <tr>
     <td>zeppelin.jdbc.auth.type</td>