Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 38db439

Browse files
committed
Merge branch 'release-sqlseattle' of https://github.com/MicrosoftDocs/sql-docs-pr into release-ignite-synapse-analytics
2 parents 52245d0 + ffa4f10 commit 38db439

23 files changed

Lines changed: 486 additions & 139 deletions

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "docs/big-data-cluster/deploy-on-minikube.md",
5+
"redirect_url": "/sql/big-data-cluster/deploy-get-started",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "docs/big-data-cluster/reference-azdata-control.md",
510
"redirect_url": "/sql/big-data-cluster/reference-azdata",

docs/advanced-analytics/package-management/install-additional-python-packages-on-sql-server.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ If the client computer you use to connect to SQL Server has Internet access, you
7272

7373
1. On the client computer, open **Python** or a Python environment.
7474

75-
1. Use the following commands to install the **text-tools** package. Substitute your own SQL Server database connection information.
75+
1. Use the following commands to install the **text-tools** package. Substitute your own SQL Server database connection information (if you don't use Windows Authentication, add `uid` and `pwd` parameters).
7676

7777
```python
7878
import sqlmlutils
79-
connection = sqlmlutils.ConnectionInfo(server="yourserver", database="yourdatabase", uid="yoursqluser", pwd="yoursqlpassword")
79+
connection = sqlmlutils.ConnectionInfo(server="yourserver", database="yourdatabase")
8080
sqlmlutils.SQLPackageManager(connection).install("text-tools")
8181
```
8282

@@ -100,11 +100,11 @@ Use **sqlmlutils** to install each package (WHL file) you find in the local fold
100100

101101
In this example, **text-tools** has no dependencies, so there is only one file from the `text-tools` folder for you to install. In contrast, a package such as **scikit-plot** has 11 dependencies, so you would find 12 files in the folder (the **scikit-plot** package and the 11 dependent packages), and you would install each of them.
102102

103-
Run the following Python script. Substitute your own SQL Server database connection information, and the actual file path and name of the package. Repeat the `sqlmlutils.SQLPackageManager` statement for each package file in the folder.
103+
Run the following Python script. Substitute the actual file path and name of the package, and your own SQL Server database connection information (if you don't use Windows Authentication, add `uid` and `pwd` parameters). Repeat the `sqlmlutils.SQLPackageManager` statement for each package file in the folder.
104104

105105
```python
106106
import sqlmlutils
107-
connection = sqlmlutils.ConnectionInfo(server="yourserver", database="yourdatabase", uid="yoursqluser", pwd="yoursqlpassword")
107+
connection = sqlmlutils.ConnectionInfo(server="yourserver", database="yourdatabase")
108108
sqlmlutils.SQLPackageManager(connection).install("c:/temp/packages/text-tools/text_tools-1.0.0-py3-none-any.whl")
109109
```
110110

docs/advanced-analytics/package-management/install-additional-r-packages-on-sql-server.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,13 @@ If the client computer you use to connect to SQL Server has Internet access, you
124124

125125
1. On the client computer, open RStudio and create a new **R Script** file.
126126

127-
1. Use the following R script to install the **glue** package using **sqlmlutils**. Substitute your own SQL Server database connection information.
127+
1. Use the following R script to install the **glue** package using **sqlmlutils**. Substitute your own SQL Server database connection information (if you don't use Windows Authentication, add `uid` and `pwd` parameters).
128128

129129
```R
130130
library(sqlmlutils)
131131
connection <- connectionInfo(
132132
server= "yourserver",
133-
database = "yourdatabase",
134-
uid = "yoursqluser",
135-
pwd = "yoursqlpassword")
133+
database = "yourdatabase")
136134

137135
sql_install.packages(connectionString = connection, pkgs = "glue", verbose = TRUE, scope = "PUBLIC")
138136
```
@@ -189,15 +187,13 @@ On the client computer:
189187

190188
1. Open RStudio and create a new **R Script** file.
191189

192-
1. Use the following R script to install the **glue** package using **sqlmlutils**. Substitute your own SQL Server database connection information.
190+
1. Use the following R script to install the **glue** package using **sqlmlutils**. Substitute your own SQL Server database connection information (if you don't use Windows Authentication, add `uid` and `pwd` parameters).
193191

194192
```R
195193
library(sqlmlutils)
196194
connection <- connectionInfo(
197195
server= "yourserver",
198-
database = "yourdatabase",
199-
uid = "yoursqluser",
200-
pwd = "yoursqlpassword")
196+
database = "yourdatabase")
201197
localRepo = "c:/temp/packages/glue"
202198

203199
sql_install.packages(connectionString = connection, pkgs = "glue", verbose = TRUE, scope = "PUBLIC", repos=paste0("file:///",localRepo))

docs/advanced-analytics/tutorials/quickstart-python-train-score-model.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ monikerRange: ">=sql-server-2017||>=sql-server-linux-ver15||=sqlallproducts-allv
1818

1919
In this quickstart, you'll create and train a predictive model using Python, save the model to a table in your SQL Server instance, then use the model to predict values from new data using [SQL Server Machine Learning Services](../what-is-sql-server-machine-learning.md).
2020

21-
You'll create and execute two stored procedures running in SQL. The first one uses the classic Iris flower data set and generates a Naïve Bayes model to predict an Iris species based on flower characteristics. The second procedure is for scoring - it calls the model generated in the first procedure to output a set of predictions based on new data. By placing code in a stored procedure, operations are contained, reusable, and callable by other stored procedures and client applications.
21+
You'll create and execute two stored procedures running in SQL. The first one uses the classic Iris flower data set and generates a Naïve Bayes model to predict an Iris species based on flower characteristics. The second procedure is for scoring - it calls the model generated in the first procedure to output a set of predictions based on new data. By placing Python code in a SQL stored procedure, operations are contained in SQL, are reusable, and can be called by other stored procedures and client applications.
2222

2323
By completing this quickstart, you'll learn:
2424

@@ -39,7 +39,9 @@ By completing this quickstart, you'll learn:
3939

4040
In this step, you'll create a stored procedure that generates a model for predicting outcomes.
4141

42-
1. Open a new query window in SSMS connected to the **irissql** database.
42+
1. Open SSMS, connect to your SQL Server instance, and open a new query window.
43+
44+
1. Connect to the irissql database.
4345

4446
```sql
4547
USE irissql

docs/advanced-analytics/tutorials/quickstart-r-train-score-model.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,18 @@ monikerRange: ">=sql-server-2016||>=sql-server-linux-ver15||=sqlallproducts-allv
1818

1919
In this quickstart, you'll create and train a predictive model using R, save the model to a table in your SQL Server instance, then use the model to predict values from new data using [SQL Server Machine Learning Services](../what-is-sql-server-machine-learning.md).
2020

21-
The model you'll use in this quickstart is a simple generalized linear model (GLM) that predicts the probability that a vehicle has been fitted with a manual transmission. You'll use the **mtcars** dataset included with R.
21+
You'll create and execute two stored procedures running in SQL. The first one uses the **mtcars** dataset included with R and generates a simple generalized linear model (GLM) that predicts the probability that a vehicle has been fitted with a manual transmission. The second procedure is for scoring - it calls the model generated in the first procedure to output a set of predictions based on new data. By placing R code in a SQL stored procedure, operations are contained in SQL, are reusable, and can be called by other stored procedures and client applications.
2222

2323
> [!TIP]
2424
> If you need a refresher on linear models, try this tutorial which describes the process of fitting a model using rxLinMod: [Fitting Linear Models](/machine-learning-server/r/how-to-revoscaler-linear-model)
2525
26+
By completing this quickstart, you'll learn:
27+
28+
> [!div class="checklist"]
29+
> - How to embed R code in a stored procedure
30+
> - How to pass inputs to your code through inputs on the stored procedure
31+
> - How stored procedures are used to operationalize models
32+
2633
## Prerequisites
2734

2835
- This quickstart requires access to an instance of SQL Server with [SQL Server Machine Learning Services](../install/sql-machine-learning-services-windows-install.md) with the R language installed.
@@ -37,7 +44,7 @@ To create the model, you'll create source data for training, create the model an
3744

3845
### Create the source data
3946

40-
1. Open **SQL Server Management Studio** and connect to your SQL Server instance.
47+
1. Open SSMS, connect to your SQL Server instance, and open a new query window.
4148

4249
1. Create a table to save the training data.
4350

docs/big-data-cluster/deploy-on-minikube.md

Lines changed: 0 additions & 69 deletions
This file was deleted.

docs/big-data-cluster/deployment-custom-configuration.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -536,18 +536,8 @@ The following **patch.json** file performs the following changes:
536536
"op": "add",
537537
"path": "spec.services.hdfs.resources/-",
538538
"value": "spark-0"
539-
},
540-
{
541-
"op": "add",
542-
"path": "spec.services.spark.settings",
543-
"value": {
544-
"DriverMemory": "2g",
545-
"DriverCores": "1",
546-
"ExecutorInstances": "2",
547-
"ExecutorMemory": "2g",
548-
"ExecutorCores": "1"
549-
}
550539
}
540+
}
551541
]
552542
}
553543
```

docs/big-data-cluster/deployment-high-availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Deploy SQL Server Big Data Cluster with high availability
33
titleSuffix: Deploy SQL Server Big Data Cluster with high availability
4-
description: Learn how to deploy [!INCLUDE[big-data-clusters-2019](../includes/ssbigdataclusters-ver15.md)] with high availability.
4+
description: Learn how to deploy SQL Server Big Data Cluster with high availability.
55
author: mihaelablendea
66
ms.author: mihaelab
77
ms.reviewer: mikeray

docs/database-engine/availability-groups/windows/resume-an-availability-database-sql-server.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ ms.author: mathoma
6262

6363
1. Connect to the server instance that hosts the secondary replica whose database you want to resume.
6464

65-
2. Resume the secondary database by using the following [ALTER DATABASE](../../../t-sql/statements/alter-database-transact-sql-set-hadr.md)statement:
66-
67-
ALTER DATABASE *database_name* SET HADR RESUME
65+
2. Resume the secondary database by using the following [ALTER DATABASE](../../../t-sql/statements/alter-database-transact-sql-set-hadr.md) statement:
66+
67+
ALTER DATABASE *database_name* SET HADR RESUME;
6868

6969
## <a name="PowerShellProcedure"></a> Using PowerShell
7070
**To resume a secondary database**

docs/database-engine/availability-groups/windows/suspend-an-availability-database-sql-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ ms.author: mathoma
9494

9595
1. Connect to the server instance that hosts the replica whose database you want to suspend. For more information, see [Prerequisites](#Prerequisites), earlier in this topic.
9696

97-
2. Suspend the database by using the following [ALTER DATABASE](../../../t-sql/statements/alter-database-transact-sql-set-hadr.md)statement:
97+
2. Suspend the database by using the following [ALTER DATABASE](../../../t-sql/statements/alter-database-transact-sql-set-hadr.md) statement:
9898

99-
ALTER DATABASE *database_name* SET HADR SUSPEND
99+
ALTER DATABASE *database_name* SET HADR SUSPEND;
100100

101101
## <a name="PowerShellProcedure"></a> Using PowerShell
102102
**To suspend a database**

0 commit comments

Comments
 (0)