Skip to content

Commit 170edaa

Browse files
authored
Merge pull request #110876 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents d39e704 + 0dd4749 commit 170edaa

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

articles/data-factory/connector-azure-sql-database.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ BEGIN
488488
END
489489
```
490490

491-
**Option 2:** You also can choose to [invoke a stored procedure within the copy activity](#invoke-a-stored-procedure-from-a-sql-sink). This approach runs each row in the source table instead of using bulk insert as the default approach in the copy activity, which isn't appropriate for large-scale upsert.
491+
**Option 2:** You also can choose to [invoke a stored procedure within the copy activity](#invoke-a-stored-procedure-from-a-sql-sink). This approach runs each batch (as governed by the `writeBatchSize` property) in the source table instead of using bulk insert as the default approach in the copy activity.
492492

493493
### Overwrite the entire table
494494

@@ -503,10 +503,7 @@ The steps to write data with custom logic are similar to those described in the
503503

504504
## <a name="invoke-a-stored-procedure-from-a-sql-sink"></a> Invoke a stored procedure from a SQL sink
505505

506-
When you copy data into Azure SQL Database, you also can configure and invoke a user-specified stored procedure with additional parameters. The stored procedure feature takes advantage of [table-valued parameters](https://msdn.microsoft.com/library/bb675163.aspx).
507-
508-
> [!TIP]
509-
> Invoking a stored procedure processes the data row by row instead of by using a bulk operation, which we don't recommend for large-scale copy. Learn more from [Best practice for loading data into Azure SQL Database](#best-practice-for-loading-data-into-azure-sql-database).
506+
When you copy data into Azure SQL Database, you also can configure and invoke a user-specified stored procedure with additional parameters on each batch of the source table. The stored procedure feature takes advantage of [table-valued parameters](https://msdn.microsoft.com/library/bb675163.aspx).
510507

511508
You can use a stored procedure when built-in copy mechanisms don't serve the purpose. An example is when you want to apply extra processing before the final insertion of source data into the destination table. Some extra processing examples are when you want to merge columns, look up additional values, and insert into more than one table.
512509

articles/postgresql/howto-configure-privatelink-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ az resource show --ids $networkInterfaceId --api-version 2019-04-01 -o json
114114
115115
#Create DNS records
116116
az network private-dns record-set a create --name myserver --zone-name privatelink.postgres.database.azure.com --resource-group myResourceGroup
117-
az network private-dns record-set a add-record --record-set-name myserver --zone-name privatelink.postgres.database.windows.net --resource-group myResourceGroup -a <Private IP Address>
117+
az network private-dns record-set a add-record --record-set-name myserver --zone-name privatelink.postgres.database.azure.com --resource-group myResourceGroup -a <Private IP Address>
118118
```
119119

120120
> [!NOTE]

articles/virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ms.tgt_pltfrm: na
1212
ms.workload: infrastructure-services
1313
ms.date: 3/2/2020
1414
ms.author: rohink
15+
ms.custom: fasttrack-edit
1516
---
1617

1718
# Name resolution for resources in Azure virtual networks
@@ -181,8 +182,7 @@ If forwarding queries to Azure doesn't suit your needs, you should provide your
181182
* Be secured against access from the internet, to mitigate threats posed by external agents.
182183

183184
> [!NOTE]
184-
> For best performance, when you are using Azure VMs as DNS servers, IPv6 should be disabled. A [public IP address](virtual-network-public-ip-address.md) should be assigned to each DNS server VM.
185-
>
185+
> For best performance, when you are using Azure VMs as DNS servers, IPv6 should be disabled.
186186
187187
### Web apps
188188
Suppose you need to perform name resolution from your web app built by using App Service, linked to a virtual network, to VMs in the same virtual network. In addition to setting up a custom DNS server that has a DNS forwarder that forwards queries to Azure (virtual IP 168.63.129.16), perform the following steps:

0 commit comments

Comments
 (0)