Merge pull request #26 from mlee3gsd/master

Update Spark to DW Connector
Azure-Samples · Jun 17, 2020 · a90c6fd · a90c6fd
2 parents 8a52a78 + 13f45b5
commit a90c6fd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 30 deletions.
diff --git a/Notebooks/PySpark/03 Read and write from SQL pool table.ipynb b/Notebooks/PySpark/03 Read and write from SQL pool table.ipynb
@@ -1,12 +1,4 @@
 {
-  "metadata": {
-    "saveOutput": true,
-    "language_info": {
-      "name": "scala"
-    }
-  },
-  "nbformat": 4,
-  "nbformat_minor": 2,
   "cells": [
     {
       "cell_type": "markdown",
@@ -126,12 +118,9 @@
         "import com.microsoft.spark.sqlanalytics.utils.Constants\n",
         "\n",
         "val sql_pool_name = \"Your sql pool name\" //fill in your sql pool name\n",
-        "val account_name = \"Your storage account name\" //fill in your storage account name\n",
-        "val temp_folder = \"Your temp folder\" //fill in a container name under your storage account\n",
         "\n",
-        "holiday_nodate.write.option(Constants.TEMP_FOLDER, s\"abfss://$temp_folder@$account_name.dfs.core.windows.net/\")\n",
-        "    .sqlanalytics(s\"$sql_pool_name.dbo.PublicHoliday\", Constants.INTERNAL)\n",
-        ""
+        "holiday_nodate.write\n",
+        "    .sqlanalytics(s\"$sql_pool_name.dbo.PublicHoliday\", Constants.INTERNAL)\n"
       ],
       "attachments": {}
     },
@@ -170,11 +159,18 @@
       "source": [
         "// Read  the table we just created in the sql pool as a Spark dataframe\n",
         "val spark_read = spark.read.\n",
-        "    option(Constants.TEMP_FOLDER, s\"abfss://$temp_folder@$account_name.dfs.core.windows.net/\").\n",
         "    sqlanalytics(s\"$sql_pool_name.dbo.PublicHoliday\")\n",
         "spark_read.show(5, truncate = false)"
       ],
       "attachments": {}
     }
-  ]
+  ],
+  "metadata": {
+    "saveOutput": true,
+    "language_info": {
+      "name": "scala"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 2
 }
diff --git a/Notebooks/Scala/03 Read and write from SQL pool table.ipynb b/Notebooks/Scala/03 Read and write from SQL pool table.ipynb
@@ -1,12 +1,4 @@
 {
-  "metadata": {
-    "saveOutput": true,
-    "language_info": {
-      "name": "scala"
-    }
-  },
-  "nbformat": 4,
-  "nbformat_minor": 2,
   "cells": [
     {
       "cell_type": "markdown",
@@ -123,12 +115,9 @@
         "import com.microsoft.spark.sqlanalytics.utils.Constants\n",
         "\n",
         "val sql_pool_name = \"Your sql pool name\" //fill in your sql pool name\n",
-        "val account_name = \"Your storage account name\" //fill in your storage account name\n",
-        "val temp_folder = \"Your temp folder\" //fill in a container name under your storage account\n",
         "\n",
-        "holiday_nodate.write.option(Constants.TEMP_FOLDER, s\"abfss://$temp_folder@$account_name.dfs.core.windows.net/\")\n",
-        "    .sqlanalytics(s\"$sql_pool_name.dbo.PublicHoliday\", Constants.INTERNAL)\n",
-        ""
+        "holiday_nodate.write\n",
+        "    .sqlanalytics(s\"$sql_pool_name.dbo.PublicHoliday\", Constants.INTERNAL)\n"
       ],
       "attachments": {}
     },
@@ -167,11 +156,18 @@
       "source": [
         "// Read  the table we just created in the sql pool as a Spark dataframe\n",
         "val spark_read = spark.read.\n",
-        "    option(Constants.TEMP_FOLDER, s\"abfss://$temp_folder@$account_name.dfs.core.windows.net/\").\n",
         "    sqlanalytics(s\"$sql_pool_name.dbo.PublicHoliday\")\n",
         "spark_read.show(5, truncate = false)"
       ],
       "attachments": {}
     }
-  ]
+  ],
+  "metadata": {
+    "saveOutput": true,
+    "language_info": {
+      "name": "scala"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 2
 }