From cef6e1cceb6d4f8b06eb29f2f0e67016f85ec46d Mon Sep 17 00:00:00 2001
From: Umachandar Jayachandran <umajay@microsoft.com>
Date: Thu, 10 Oct 2019 14:40:40 -0700
Subject: [PATCH] Added compute pool data source

---
 .../bootstrap-sample-db.sh                    |  2 +-
 .../bootstrap-sample-db.sql                   | 38 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/samples/features/sql-big-data-cluster/bootstrap-sample-db.sh b/samples/features/sql-big-data-cluster/bootstrap-sample-db.sh
index cbfeead3..7c0aaf86 100644
--- a/samples/features/sql-big-data-cluster/bootstrap-sample-db.sh
+++ b/samples/features/sql-big-data-cluster/bootstrap-sample-db.sh
@@ -52,7 +52,7 @@ then
     $DEBUG curl -G "https://sqlchoice.blob.core.windows.net/sqlchoice/static/tpcxbb_1gb.bak" -o tpcxbb_1gb.bak
 fi
 
-read -r MASTER_POD_NAME HADR_ENABLED <<<$(sqlcmd -S $SQL_MASTER_INSTANCE -Usa -P$SQL_MASTER_SA_PASSWORD -I -b -h-1 -Q "SET NOCOUNT ON; SELECT @@SERVERNAME, SERVERPROPERTY('IsHadrEnabled');")
+read -r MASTER_POD_NAME HADR_ENABLED <<<$(sqlcmd -S $SQL_MASTER_INSTANCE -Usa -P$SQL_MASTER_SA_PASSWORD -I -b -h-1 -Q "SET NOCOUNT ON; SELECT @@SERVERNAME, SERVERPROPERTY('IsHadrEnabled');") || (echo $ERROR_MESSAGE && exit 1)
 
 echo Copying sales database backup file...
 $DEBUG kubectl cp tpcxbb_1gb.bak $CLUSTER_NAMESPACE/$MASTER_POD_NAME:var/opt/mssql/data -c mssql-server || (echo $ERROR_MESSAGE && exit 1)
diff --git a/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql b/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
index f6811779..2e1f0ed3 100644
--- a/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
+++ b/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
@@ -80,35 +80,35 @@ CREATE OR ALTER PROCEDURE #create_data_sources
 AS
 BEGIN
 	-- Create database master key (required for database scoped credentials used in the samples)
-	IF NOT EXISTS(SELECT * FROM sys.symmetric_keys WHERE name = '##MS_DatabaseMasterKey##')
-		CREATE MASTER KEY ENCRYPTION BY PASSWORD = 'sql19bigdatacluster!';
+	CREATE MASTER KEY ENCRYPTION BY PASSWORD = 'sql19bigdatacluster!';
 
 	-- Create default data sources for SQL Big Data Cluster
-	IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlDataPool')
-		CREATE EXTERNAL DATA SOURCE SqlDataPool
-		WITH (LOCATION = 'sqldatapool://controller-svc/default');
+	IF SERVERPROPERTY('ProductLevel') = 'RTM'	
+		CREATE EXTERNAL DATA SOURCE SqlComputePool
+		WITH (LOCATION = 'sqlcomputepool://controller-svc/default');
 
-	IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
-		CREATE EXTERNAL DATA SOURCE SqlStoragePool
-		WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+	CREATE EXTERNAL DATA SOURCE SqlDataPool
+	WITH (LOCATION = 'sqldatapool://controller-svc/default');
 
-	IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
-		CREATE EXTERNAL DATA SOURCE HadoopData
-		WITH(
-				TYPE=HADOOP,
-				LOCATION='hdfs://nmnode-0-svc:9000/',
-				RESOURCE_MANAGER_LOCATION='sparkhead-svc:8032'
-		);
+	CREATE EXTERNAL DATA SOURCE SqlStoragePool
+	WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+
+	CREATE EXTERNAL DATA SOURCE HadoopData
+	WITH(
+			TYPE=HADOOP,
+			LOCATION='hdfs://nmnode-0-svc:9000/',
+			RESOURCE_MANAGER_LOCATION='sparkhead-svc:8032'
+	);
 END;
 GO
 
 --- Sample dbs:
 DECLARE @sample_dbs CURSOR, @proc nvarchar(255);
 SET @sample_dbs = CURSOR FAST_FORWARD FOR
-									SELECT file_or_directory_name, d.db_name
-									FROM sys.dm_os_enumerate_filesystem('/var/opt/mssql/data', '*.bak') as f
-									CROSS APPLY (VALUES(REPLACE(REPLACE(file_or_directory_name, 'tpcxbb_1gb', 'sales'), '.bak', ''))) as d(db_name)
-									WHERE DB_ID(d.db_name) IS NULL;
+					SELECT file_or_directory_name, d.db_name
+					FROM sys.dm_os_enumerate_filesystem('/var/opt/mssql/data', '*.bak') as f
+					CROSS APPLY (VALUES(REPLACE(REPLACE(file_or_directory_name, 'tpcxbb_1gb', 'sales'), '.bak', ''))) as d(db_name)
+					WHERE DB_ID(d.db_name) IS NULL;
 DECLARE @file nvarchar(260), @db_name nvarchar(128);														
 OPEN @sample_dbs;
 WHILE(1=1)