Skip to content

Commit 381d7b3

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-synapse-pool-rebrand
2 parents b30d737 + d61f9e7 commit 381d7b3

34 files changed

Lines changed: 152 additions & 145 deletions

File tree

docs/azure-data-studio/tutorial-qds-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ To add the *slow queries widget* to your dashboard, edit the *dashboard.database
131131

132132
5. View the query's execution plan:
133133

134-
![showplan](./media/tutorial-qds-sql-server/showplan.png)
134+
![Screenshot showing the query's execution plan.](./media/tutorial-qds-sql-server/showplan.png)
135135

136136
## Next steps
137137

docs/azure-data-studio/tutorial-sql-editor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ Azure Data Studio provides many built-in T-SQL snippets for quickly creating sta
6161

6262
2. Type **sql** in the editor, arrow down to **sqlCreateStoredProcedure**, and press the *Tab* key (or *Enter*) to load the create stored procedure snippet.
6363

64-
![snippet-list](./media/tutorial-sql-editor/snippet-list.png)
64+
![Screenshot showing the Query Editor with sql typed in the editor and the sqlCreateStoredProcedure option called out.](./media/tutorial-sql-editor/snippet-list.png)
6565

6666
3. The create stored procedure snippet has two fields set up for quick edit, *StoredProcedureName* and *SchemaName*. Select *StoredProcedureName*, right-click, and select **Change All Occurrences**. Now type *getCustomer* and all *StoredProcedureName* entries change to *getCustomer*.
6767

68-
![snippet](./media/tutorial-sql-editor/snippet.png)
68+
![Screenshot showing the Query Editor with the Change All Occurrences option called out.](./media/tutorial-sql-editor/snippet.png)
6969

7070
5. Change all occurrences of *SchemaName* to *dbo*.
7171
6. The snippet contains placeholder parameters and body text that needs updating. The *EXECUTE* statement also contains placeholder text because it doesn't know how many parameters the procedure will have. For this tutorial update the snippet so it looks like the following code:

docs/connect/jdbc/reference/supportsresultsetconcurrency-method-sqlserverdatabasemetadata.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public boolean supportsResultSetConcurrency(int type,
5757

5858
An **int** that indicates the result set concurrency level, which can be one of the following values as defined in java.sql.ResultSet or SQLServerResultSet:
5959

60-
## java.sql.ResultSet Types
60+
## Concurrency java.sql.ResultSet Types
6161
CONCUR_READ_ONLY
6262

6363
CONCUR_UPDATABLE
6464

65-
## SQLServerResultSet Types
65+
## Concurrency SQLServerResultSet Types
6666
CONCUR_SS_OPTIMISTIC_CC
6767

6868
CONCUR_SS_SCROLL_LOCKS

docs/database-engine/install-windows/change-the-database-compatibility-mode-and-use-the-query-store.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The upgrade process to enable new query processor functionality is related to th
4040
4141
The recommended workflow for upgrading the query processor to the latest version of the code is documented in the [Keep performance stability during the upgrade to newer SQL Server section of Query Store Usage Scenarios](../../relational-databases/performance/query-store-usage-scenarios.md#CEUpgrade), as seen below.
4242

43-
![query-store-usage-5](../../relational-databases/performance/media/query-store-usage-5.png "query-store-usage-5")
43+
![Diagram showing the recommended workflow for upgrading the query processor to the latest version of the code.](../../relational-databases/performance/media/query-store-usage-5.png "query-store-usage-5")
4444

4545
Starting with [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] v18, users can be guided through the recommended workflow using the Query Tuning Assistant. For more information, see [Upgrading Databases by using the Query Tuning Assistant](../../relational-databases/performance/upgrade-dbcompat-using-qta.md).
4646

docs/database-engine/install-windows/view-and-read-sql-server-setup-log-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SQL Server Setup creates log files in a dated and time-stamped folder within **\
3838
| **For unattended installations** | %temp%\sqlsetup*.log |
3939

4040

41-
![setup-bootstrap-example.png](media/view-and-read-sql-server-setup-log-files/setup-bootstrap-example.png)
41+
![Screenshot showing where to find the ConfigurationFiles.ini file in the Setup Bootstrap folder.](media/view-and-read-sql-server-setup-log-files/setup-bootstrap-example.png)
4242

4343
>[!NOTE]
4444
> The numbers in the path *nnn* correspond to the version of SQL being installed. In the above picture, SQL 2017 was installed, so the folder is 140. For SQL 2016, the folder would be 130, and for SQL 2014 the folder would be 120.

docs/integration-services/expressions/subtract-ssis-expression.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ numeric_expression1 - numeric_expression2
3838
Determined by the data types of the two arguments. For more information, see [Integration Services Data Types in Expressions](../../integration-services/expressions/integration-services-data-types-in-expressions.md).
3939

4040
## Remarks
41-
Enclose the minus unary expression in parenthesis to ensure that the expression is evaluated in the correct order
42-
43-
## Remarks
44-
If either operand is null, the result is null.
41+
- Enclose the minus unary expression in parenthesis to ensure that the expression is evaluated in the correct order
42+
43+
- If either operand is null, the result is null.
4544

4645
## Expression Examples
4746
This example subtracts numeric literals.

docs/integration-services/functions-dm-execution-performance-counters.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,18 @@ dm_execution_performance_counters [ @execution_id = ] execution_id
5858
|counter_name|**nvarchar(128)**|The name of the counter.|See the **Remarks** section of values.|
5959
|counter_value|**BigInt**|Value returned by the counter.||
6060

61-
## Example
61+
## Examples
62+
63+
### A. Return statistics for a running execution
64+
6265
In the following example, the function returns statistics for a running execution with an ID of 34.
6366

6467
```sql
6568
select * from [catalog].[dm_execution_performance_counters] (34)
6669
```
6770

68-
## Example
71+
### B. Return statistics for all running executions
72+
6973
In the following example, the function returns statistics for all the executions running on the [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] server, depending on your permissions.
7074

7175
```sql

docs/integration-services/system-stored-procedures/catalog-remove-data-tap.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ catalog.remove_data_tap [ @data_tap_id = ] data_tap_id
3232
The unique identifier for the data tap that is created by using the catalog.add_data_tap stored procedure. The *data_tap_id* is **bigint**.
3333

3434
## Remarks
35-
When a package contains more than one data flow tasks that have the same name, the data tap is added to the first data flow task with the given name.
35+
36+
- When a package contains more than one data flow tasks that have the same name, the data tap is added to the first data flow task with the given name.
37+
38+
- To remove data taps, the instance of the execution must be in the created state (a value of 1 in the **status** column of the [catalog.operations (SSISDB Database)](../../integration-services/system-views/catalog-operations-ssisdb-database.md)view) .
3639

3740
## Return Codes
3841
0 (success)
@@ -42,9 +45,6 @@ catalog.remove_data_tap [ @data_tap_id = ] data_tap_id
4245
## Result Set
4346
None
4447

45-
## Remarks
46-
To remove data taps, the instance of the execution must be in the created state (a value of 1 in the **status** column of the [catalog.operations (SSISDB Database)](../../integration-services/system-views/catalog-operations-ssisdb-database.md)view) .
47-
4848
## Permissions
4949
This stored procedure requires one of the following permissions:
5050

docs/integration-services/system-stored-procedures/catalog-revoke-permission-ssisdb-database.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ catalog.revoke_permission [ @object_type = ] object_type
6262
## Result Sets
6363
None
6464

65-
## Remarks
66-
None
67-
6865
## Permissions
6966
This stored procedure requires one of the following permissions:
7067

docs/integration-services/system-stored-procedures/catalog-set-execution-parameter-value-ssisdb-database.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,19 @@ catalog.set_execution_parameter_value [ @execution_id = execution_id
108108
|*parameter_name*|DUMP_EVENT_CODE|
109109
|*parameter_value*|One or more event codes|
110110

111-
## Example
111+
## Examples
112+
113+
### A. Generate dump files for errors
114+
112115
The following example specifies that the Integration Services server generates dump files when any error occurs during a package execution.
113116

114117
```sql
115118
exec catalog.create_execution 'TR2','Recurring ETL', 'Dim_DCVendor.dtsx',NULL, 0,@execution_id out
116119
exec catalog.set_execution_parameter_value @execution_id, 50, 'DUMP_ON_ERROR',1
117120
```
118121

119-
## Example
122+
### B. Generate dump files for events
123+
120124
The following example specifies that the Integration Services server generates dump files when events occur during a package execution, and specifies the event that causes the server to generate the files.
121125

122126
```sql

0 commit comments

Comments
 (0)