Skip to content

Commit 40e1ff4

Browse files
uc-msftuc-msft
committed
Data source changes for CTP 3.0
1 parent 9088a27 commit 40e1ff4

10 files changed

Lines changed: 60 additions & 84 deletions

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,32 +76,28 @@ 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-
CREATE EXTERNAL DATA SOURCE SqlDataPool
80-
WITH (LOCATION = 'sqldatapool://service-mssql-controller:8080/datapools/default');
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'
83+
CREATE EXTERNAL DATA SOURCE SqlDataPool
84+
WITH (LOCATION = 'sqldatapool://controller-svc:8080/datapools/default');
8185

8286
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
83-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.4'
87+
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8488
CREATE EXTERNAL DATA SOURCE SqlStoragePool
85-
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
86-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
89+
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
90+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
8791
CREATE EXTERNAL DATA SOURCE SqlStoragePool
88-
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
92+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
8993

9094
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
91-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.4'
92-
CREATE EXTERNAL DATA SOURCE HadoopData
93-
WITH(
94-
TYPE=HADOOP,
95-
LOCATION='hdfs://mssql-master-pool-0.service-master-pool:9000/',
96-
RESOURCE_MANAGER_LOCATION='mssql-master-pool-0.service-master-pool:8032'
97-
);
98-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
99-
CREATE EXTERNAL DATA SOURCE HadoopData
100-
WITH(
101-
TYPE=HADOOP,
102-
LOCATION='hdfs://nmnode-0-svc:9000/',
103-
RESOURCE_MANAGER_LOCATION='master-svc:8032'
104-
);
95+
CREATE EXTERNAL DATA SOURCE HadoopData
96+
WITH(
97+
TYPE=HADOOP,
98+
LOCATION='hdfs://nmnode-0-svc:9000/',
99+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
100+
);
105101
END;
106102
GO
107103

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +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-
CREATE EXTERNAL DATA SOURCE SqlDataPool
8-
WITH (LOCATION = 'sqldatapool://service-mssql-controller:8080/datapools/default');
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');
913

1014
-- Create external table in a data pool in SQL Server 2019 big data cluster.
1115
-- The SqlDataPool data source is a special data source that is available in

‎samples/features/sql-big-data-cluster/data-virtualization/hadoop/inventory-export-hdfs-rcfile.sql‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,12 @@ GO
1717
-- execution.
1818
--
1919
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
20-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.4'
21-
CREATE EXTERNAL DATA SOURCE HadoopData
22-
WITH(
23-
TYPE=HADOOP,
24-
LOCATION='hdfs://mssql-master-pool-0.service-master-pool:9000/',
25-
RESOURCE_MANAGER_LOCATION='mssql-master-pool-0.service-master-pool:8032'
26-
);
27-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
28-
CREATE EXTERNAL DATA SOURCE HadoopData
29-
WITH(
30-
TYPE=HADOOP,
31-
LOCATION='hdfs://nmnode-0-svc:9000/',
32-
RESOURCE_MANAGER_LOCATION='master-svc:8032'
33-
);
20+
CREATE EXTERNAL DATA SOURCE HadoopData
21+
WITH(
22+
TYPE=HADOOP,
23+
LOCATION='hdfs://nmnode-0-svc:9000/',
24+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
25+
);
3426

3527
-- Create file format for RCFILE with appropriate properties.
3628
--

‎samples/features/sql-big-data-cluster/data-virtualization/hadoop/product-reviews-hdfs-orc.sql‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@ GO
77
-- execution.
88
--
99
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
10-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.4'
11-
CREATE EXTERNAL DATA SOURCE HadoopData
12-
WITH(
13-
TYPE=HADOOP,
14-
LOCATION='hdfs://mssql-master-pool-0.service-master-pool:9000/',
15-
RESOURCE_MANAGER_LOCATION='mssql-master-pool-0.service-master-pool:8032'
16-
);
17-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
18-
CREATE EXTERNAL DATA SOURCE HadoopData
19-
WITH(
20-
TYPE=HADOOP,
21-
LOCATION='hdfs://nmnode-0-svc:9000/',
22-
RESOURCE_MANAGER_LOCATION='master-svc:8032'
23-
);
10+
CREATE EXTERNAL DATA SOURCE HadoopData
11+
WITH(
12+
TYPE=HADOOP,
13+
LOCATION='hdfs://nmnode-0-svc:9000/',
14+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
15+
);
2416

2517
-- Create file format for orc file with appropriate properties.
2618
--

‎samples/features/sql-big-data-cluster/data-virtualization/hadoop/web-clickstreams-hdfs-orc.sql‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@ GO
77
-- execution.
88
--
99
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
10-
IF SERVERPROPERTY('ProductLevel') = 'CTP2.4'
11-
CREATE EXTERNAL DATA SOURCE HadoopData
12-
WITH(
13-
TYPE=HADOOP,
14-
LOCATION='hdfs://mssql-master-pool-0.service-master-pool:9000/',
15-
RESOURCE_MANAGER_LOCATION='mssql-master-pool-0.service-master-pool:8032'
16-
);
17-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
18-
CREATE EXTERNAL DATA SOURCE HadoopData
19-
WITH(
20-
TYPE=HADOOP,
21-
LOCATION='hdfs://nmnode-0-svc:9000/',
22-
RESOURCE_MANAGER_LOCATION='master-svc:8032'
23-
);
10+
CREATE EXTERNAL DATA SOURCE HadoopData
11+
WITH(
12+
TYPE=HADOOP,
13+
LOCATION='hdfs://nmnode-0-svc:9000/',
14+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
15+
);
2416

2517
-- Create file format for orc file with appropriate properties.
2618
--

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

Lines changed: 4 additions & 4 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.4'
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
88
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
9+
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/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: 4 additions & 4 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.4'
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
88
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
9+
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/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: 4 additions & 4 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.4'
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
88
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
9+
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/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: 4 additions & 4 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.4'
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
88
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
9+
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/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: 4 additions & 4 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.4'
7+
IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
88
CREATE EXTERNAL DATA SOURCE SqlStoragePool
9-
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
10-
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
9+
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
10+
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
1313

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

0 commit comments

Comments
 (0)