Skip to content

Commit e5f086d

Browse files
committed
Storage pool uri update due to AKS incompatibility
1 parent 70e6496 commit e5f086d

9 files changed

Lines changed: 20 additions & 14 deletions

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ BEGIN
8585
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
8686
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
8787
CREATE EXTERNAL DATA SOURCE SqlStoragePool
88-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
88+
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
8989

9090
IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
9191
IF SERVERPROPERTY('ProductLevel') = 'CTP2.4'
@@ -99,8 +99,8 @@ BEGIN
9999
CREATE EXTERNAL DATA SOURCE HadoopData
100100
WITH(
101101
TYPE=HADOOP,
102-
LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
103-
RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
102+
LOCATION='hdfs://nmnode-0-svc:9000/',
103+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
104104
);
105105
END;
106106
GO
@@ -118,11 +118,17 @@ BEGIN
118118
FETCH @sample_dbs INTO @file;
119119
IF @@FETCH_STATUS < 0 BREAK;
120120

121+
-- Restore the sample databases:
121122
EXECUTE #restore_database @file;
123+
124+
-- Get database name used in restore:
122125
SET @proc = CONCAT(QUOTENAME(LEFT(@file, CHARINDEX('.', @file)-1)), N'.sys.sp_executesql');
123126

124127
EXECUTE @proc N'#create_data_sources';
125128

129+
-- Set compatibility level to 150:
130+
EXECUTE @proc N'ALTER DATABASE CURRENT SET COMPATIBILITY_LEVEL = 150';
131+
126132
-- Rename TPCx-BB database:
127133
IF DB_ID('tpcxbb_1gb') IS NOT NULL
128134
ALTER DATABASE tpcxbb_1gb MODIFY NAME = sales;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
2828
CREATE EXTERNAL DATA SOURCE HadoopData
2929
WITH(
3030
TYPE=HADOOP,
31-
LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
32-
RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
31+
LOCATION='hdfs://nmnode-0-svc:9000/',
32+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
3333
);
3434

3535
-- Create file format for RCFILE with appropriate properties.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
1818
CREATE EXTERNAL DATA SOURCE HadoopData
1919
WITH(
2020
TYPE=HADOOP,
21-
LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
22-
RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
21+
LOCATION='hdfs://nmnode-0-svc:9000/',
22+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
2323
);
2424

2525
-- Create file format for orc file with appropriate properties.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
1818
CREATE EXTERNAL DATA SOURCE HadoopData
1919
WITH(
2020
TYPE=HADOOP,
21-
LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
22-
RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
21+
LOCATION='hdfs://nmnode-0-svc:9000/',
22+
RESOURCE_MANAGER_LOCATION='master-svc:8032'
2323
);
2424

2525
-- Create file format for orc file with appropriate properties.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
99
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
1010
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
99
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
1010
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
99
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
1010
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
99
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
1010
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
99
WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
1010
ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
1111
CREATE EXTERNAL DATA SOURCE SqlStoragePool
12-
WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
12+
WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
1313

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

0 commit comments

Comments
 (0)