Skip to content

Commit b9253c6

Browse files
uc-msftuc-msft
committed
CTP 3.1 changes for data source
1 parent d720106 commit b9253c6

8 files changed

Lines changed: 54 additions & 59 deletions

File tree

‎samples/features/sql-big-data-cluster/bootstrap-sample-db.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ BEGIN
7676

7777
-- Create default data sources for SQL Big Data Cluster
7878
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlDataPool')
79-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
80-
CREATE EXTERNAL DATA SOURCE SqlDataPool
81-
WITH (LOCATION = 'sqldatapool://service-mssql-controller:8080/datapools/default');
82-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
79+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8380
CREATE EXTERNAL DATA SOURCE SqlDataPool
8481
WITH (LOCATION = 'sqldatapool://controller-svc:8080/datapools/default');
82+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
83+
CREATE EXTERNAL DATA SOURCE SqlDataPool
84+
WITH (LOCATION = 'sqldatapool://controller-svc/default');
8585

8686
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
87-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
88-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
89-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
90-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
87+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
9188
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9289
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
90+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
91+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
92+
WITH (LOCATION = 'sqlhdfs://controller-svc/default');
9393

9494
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
9595
CREATE EXTERNAL DATA SOURCE HadoopData

‎samples/features/sql-big-data-cluster/data-pool/data-ingestion-sql.sql‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ GO
44
-- Create external data source for Data Pool inside a SQL big data cluster
55
--
66
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlDataPool')
7-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8-
CREATE EXTERNAL DATA SOURCE SqlDataPool
9-
WITH (LOCATION = 'sqldatapool://service-mssql-controller:8080/datapools/default');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
11-
CREATE EXTERNAL DATA SOURCE SqlDataPool
12-
WITH (LOCATION = 'sqldatapool://controller-svc:8080/datapools/default');
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8+
CREATE EXTERNAL DATA SOURCE SqlDataPool
9+
WITH (LOCATION = 'sqldatapool://controller-svc:8080/datapools/default');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
11+
CREATE EXTERNAL DATA SOURCE SqlDataPool
12+
WITH (LOCATION = 'sqldatapool://controller-svc/default');
1313

1414
-- Create external table in a data pool in SQL Server 2019 big data cluster.
1515
-- The SqlDataPool data source is a special data source that is available in
@@ -26,12 +26,6 @@ IF NOT EXISTS(SELECT * FROM sys.external_tables WHERE name = 'web_clickstream_cl
2626
);
2727
GO
2828

29-
-- Currently the create external table operation is asynchronous and there is no
30-
-- way to determine completion of the operation. To prevent failures of the insert
31-
-- into the external table, wait for few minutes.
32-
WAITFOR DELAY '00:02:00';
33-
GO
34-
3529
-- Insert results of a SELECT statement into the external table created on the data pool.
3630
-- Store summary results for quick access instead of going to the source tables always.
3731
--
@@ -72,5 +66,6 @@ GO
7266
-- Cleanup
7367
/*
7468
DROP EXTERNAL TABLE [dbo].[web_clickstream_clicks_data_pool];
69+
DROP EXTERNAL DATA SOURCE SqlDataPool;
7570
GO
7671
*/

‎samples/features/sql-big-data-cluster/data-virtualization/oracle/customer-oracle.sql‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'OracleSalesS
2222
CREATE EXTERNAL TABLE [dbo].[customer_ora]
2323
(
2424
[C_CUSTOMER_SK] DECIMAL(10,0),
25-
[C_CUSTOMER_ID] NVARCHAR(16) COLLATE SQL_Latin1_General_CP1_CI_AS,
25+
[C_CUSTOMER_ID] NVARCHAR(16) COLLATE Latin1_General_100_BIN2_UTF8,
2626
[C_CURRENT_CDEMO_SK] DECIMAL(10,0),
2727
[C_CURRENT_HDEMO_SK] DECIMAL(10,0),
2828
[C_CURRENT_ADDR_SK] DECIMAL(10,0),
2929
[C_FIRST_SHIPTO_DATE_SK] DECIMAL(10,0),
3030
[C_FIRST_SALES_DATE_SK] DECIMAL(8,0),
31-
[C_SALUTATION] NVARCHAR(10) COLLATE SQL_Latin1_General_CP1_CI_AS,
32-
[C_FIRST_NAME] NVARCHAR(20) COLLATE SQL_Latin1_General_CP1_CI_AS,
33-
[C_LAST_NAME] NVARCHAR(30) COLLATE SQL_Latin1_General_CP1_CI_AS,
34-
[C_PREFERRED_CUST_FLAG] NVARCHAR COLLATE SQL_Latin1_General_CP1_CI_AS,
31+
[C_SALUTATION] NVARCHAR(10) COLLATE Latin1_General_100_BIN2_UTF8,
32+
[C_FIRST_NAME] NVARCHAR(20) COLLATE Latin1_General_100_BIN2_UTF8,
33+
[C_LAST_NAME] NVARCHAR(30) COLLATE Latin1_General_100_BIN2_UTF8,
34+
[C_PREFERRED_CUST_FLAG] NVARCHAR COLLATE Latin1_General_100_BIN2_UTF8,
3535
[C_BIRTH_DAY] DECIMAL(8,0),
3636
[C_BIRTH_MONTH] DECIMAL(8,0),
3737
[C_BIRTH_YEAR] DECIMAL(8,0),
38-
[C_BIRTH_COUNTRY] NVARCHAR(20) COLLATE SQL_Latin1_General_CP1_CI_AS,
39-
[C_LOGIN] NVARCHAR(13) COLLATE SQL_Latin1_General_CP1_CI_AS,
40-
[C_EMAIL_ADDRESS] NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS,
41-
[C_LAST_REVIEW_DATE] NVARCHAR(20) COLLATE SQL_Latin1_General_CP1_CI_AS
38+
[C_BIRTH_COUNTRY] NVARCHAR(20) COLLATE Latin1_General_100_BIN2_UTF8,
39+
[C_LOGIN] NVARCHAR(13) COLLATE Latin1_General_100_BIN2_UTF8,
40+
[C_EMAIL_ADDRESS] NVARCHAR(50) COLLATE Latin1_General_100_BIN2_UTF8,
41+
[C_LAST_REVIEW_DATE] NVARCHAR(20) COLLATE Latin1_General_100_BIN2_UTF8
4242
)
4343
WITH (DATA_SOURCE=[OracleSalesSrvr],
4444
LOCATION='<oracle_service_name,nvarchar(30),xe>.SALES.CUSTOMER');

‎samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-csv.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ GO
44
-- Create external data source for HDFS inside SQL big data cluster.
55
--
66
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
7-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
11-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
11+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12+
WITH (LOCATION = 'sqlhdfs://controller-svc/default');
1313

1414
-- Create file format for CSV separated file with appropriate properties.
1515
--

‎samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-parquet.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ GO
44
-- Create external data source for HDFS inside SQL big data cluster.
55
--
66
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
7-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
11-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
11+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12+
WITH (LOCATION = 'sqlhdfs://controller-svc/default');
1313

1414
-- Create file format for parquet file with appropriate properties.
1515
--

‎samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-tsv.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ GO
44
-- Create external data source for HDFS inside SQL big data cluster.
55
--
66
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
7-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
11-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
11+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12+
WITH (LOCATION = 'sqlhdfs://controller-svc/default');
1313

1414
-- Create file format for tab separated file with appropriate properties.
1515
--

‎samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-csv.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ GO
44
-- Create external data source for HDFS inside SQL big data cluster.
55
--
66
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
7-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
11-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
11+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12+
WITH (LOCATION = 'sqlhdfs://controller-svc/default');
1313

1414
-- Create file format for CSV file with appropriate properties.
1515
--

‎samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-parquet.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ GO
44
-- Create external data source for HDFS inside SQL big data cluster.
55
--
66
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
7-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
11-
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
11+
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12+
WITH (LOCATION = 'sqlhdfs://controller-svc/default');
1313

1414
-- Create file format for parquet file with appropriate properties.
1515
--

0 commit comments

Comments
 (0)