Skip to content

Commit c74aa88

Browse files
authored
Merge pull request #88274 from linda33wj/adx
Update ADF connector articles
2 parents 204297a + eade77b commit c74aa88

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

articles/data-factory/connector-azure-search.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: data-services
1212
ms.tgt_pltfrm: na
1313

1414
ms.topic: conceptual
15-
ms.date: 08/01/2019
15+
ms.date: 09/13/2019
1616
ms.author: jingwang
1717
---
1818

@@ -161,7 +161,7 @@ Azure Search service supports writing documents as a batch. A batch can contain
161161
]
162162
```
163163

164-
### Data type support
164+
## Data type support
165165

166166
The following table specifies whether an Azure Search data type is supported or not.
167167

@@ -176,5 +176,7 @@ The following table specifies whether an Azure Search data type is supported or
176176
| String Array | N |
177177
| GeographyPoint | N |
178178

179+
Currently other data types e.g. ComplexType are not supported. For a full list of Azure Serach supported data type, see [Supported data types (Azure Search)](https://docs.microsoft.com/rest/api/searchservice/supported-data-types).
180+
179181
## Next steps
180182
For a list of data stores supported as sources and sinks by the copy activity in Azure Data Factory, see [supported data stores](copy-activity-overview.md##supported-data-stores-and-formats).

articles/data-factory/connector-teradata.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Copy data from Teradata by using Azure Data Factory | Microsoft Docs
3-
description: The Teradata Connector of the Data Factory service lets you copy data from a Teradata database to data stores supported by Data Factory as sinks.
2+
title: Copy data from Teradata Vantage by using Azure Data Factory | Microsoft Docs
3+
description: The Teradata Connector of the Data Factory service lets you copy data from a Teradata Vantage to data stores supported by Data Factory as sinks.
44
services: data-factory
55
documentationcenter: ''
66
author: linda33wj
@@ -12,21 +12,21 @@ ms.workload: data-services
1212
ms.tgt_pltfrm: na
1313

1414
ms.topic: conceptual
15-
ms.date: 08/23/2019
15+
ms.date: 09/13/2019
1616
ms.author: jingwang
1717

1818
---
19-
# Copy data from Teradata by using Azure Data Factory
19+
# Copy data from Teradata Vantage by using Azure Data Factory
2020
> [!div class="op_single_selector" title1="Select the version of Data Factory service you are using:"]
2121
>
2222
> * [Version 1](v1/data-factory-onprem-teradata-connector.md)
2323
> * [Current version](connector-teradata.md)
2424
25-
This article outlines how to use the copy activity in Azure Data Factory to copy data from a Teradata database. It builds on the [copy activity overview](copy-activity-overview.md).
25+
This article outlines how to use the copy activity in Azure Data Factory to copy data from Teradata Vantage. It builds on the [copy activity overview](copy-activity-overview.md).
2626

2727
## Supported capabilities
2828

29-
You can copy data from a Teradata database to any supported sink data store. For a list of data stores that are supported as sources/sinks by the copy activity, see the [Supported data stores](copy-activity-overview.md#supported-data-stores-and-formats) table.
29+
You can copy data from Teradata Vantage to any supported sink data store. For a list of data stores that are supported as sources/sinks by the copy activity, see the [Supported data stores](copy-activity-overview.md#supported-data-stores-and-formats) table.
3030

3131
Specifically, this Teradata connector supports:
3232

@@ -59,8 +59,8 @@ The Teradata linked service supports the following properties:
5959
| Property | Description | Required |
6060
|:--- |:--- |:--- |
6161
| type | The type property must be set to **Teradata**. | Yes |
62-
| connectionString | Specifies the information needed to connect to the Teradata Database instance. Refer to the following samples.<br/>You can also put a password in Azure Key Vault, and pull the `password` configuration out of the connection string. Refer to [Store credentials in Azure Key Vault](store-credentials-in-key-vault.md) with more details. | Yes |
63-
| username | Specify a user name to connect to the Teradata database. Applies when you are using Windows authentication. | No |
62+
| connectionString | Specifies the information needed to connect to the Teradata instance. Refer to the following samples.<br/>You can also put a password in Azure Key Vault, and pull the `password` configuration out of the connection string. Refer to [Store credentials in Azure Key Vault](store-credentials-in-key-vault.md) with more details. | Yes |
63+
| username | Specify a user name to connect to Teradata. Applies when you are using Windows authentication. | No |
6464
| password | Specify a password for the user account you specified for the user name. You can also choose to [reference a secret stored in Azure Key Vault](store-credentials-in-key-vault.md). <br>Applies when you are using Windows authentication, or referencing a password in Key Vault for basic authentication. | No |
6565
| connectVia | The [Integration Runtime](concepts-integration-runtime.md) to be used to connect to the data store. Learn more from [Prerequisites](#prerequisites) section. If not specified, it uses the default Azure Integration Runtime. |Yes |
6666

@@ -139,8 +139,8 @@ To copy data from Teradata, the following properties are supported:
139139
| Property | Description | Required |
140140
|:--- |:--- |:--- |
141141
| type | The type property of the dataset must be set to `TeradataTable`. | Yes |
142-
| database | The name of the Teradata database. | No (if "query" in activity source is specified) |
143-
| table | The name of the table in the Teradata database. | No (if "query" in activity source is specified) |
142+
| database | The name of the Teradata instance. | No (if "query" in activity source is specified) |
143+
| table | The name of the table in the Teradata instance. | No (if "query" in activity source is specified) |
144144

145145
**Example:**
146146

@@ -194,7 +194,7 @@ To copy data from Teradata, the following properties are supported in the copy a
194194
|:--- |:--- |:--- |
195195
| type | The type property of the copy activity source must be set to `TeradataSource`. | Yes |
196196
| query | Use the custom SQL query to read data. An example is `"SELECT * FROM MyTable"`.<br>When you enable partitioned load, you need to hook any corresponding built-in partition parameters in your query. For examples, see the [Parallel copy from Teradata](#parallel-copy-from-teradata) section. | No (if table in dataset is specified) |
197-
| partitionOptions | Specifies the data partitioning options used to load data from Teradata. <br>Allow values are: **None** (default), **Hash** and **DynamicRange**.<br>When a partition option is enabled (that is, not `None`), the degree of parallelism to concurrently load data from a Teradata database is controlled by the [`parallelCopies`](copy-activity-performance.md#parallel-copy) setting on the copy activity. | No |
197+
| partitionOptions | Specifies the data partitioning options used to load data from Teradata. <br>Allow values are: **None** (default), **Hash** and **DynamicRange**.<br>When a partition option is enabled (that is, not `None`), the degree of parallelism to concurrently load data from Teradata is controlled by the [`parallelCopies`](copy-activity-performance.md#parallel-copy) setting on the copy activity. | No |
198198
| partitionSettings | Specify the group of the settings for data partitioning. <br>Apply when partition option isn't `None`. | No |
199199
| partitionColumnName | Specify the name of the source column that will be used by range partition or Hash partition for parallel copy. If not specified, the primary index of the table is auto-detected and used as the partition column. <br>Apply when the partition option is `Hash` or `DynamicRange`. If you use a query to retrieve the source data, hook `?AdfHashPartitionCondition` or `?AdfRangePartitionColumnName` in WHERE clause. See example in [Parallel copy from Teradata](#parallel-copy-from-teradata) section. | No |
200200
| partitionUpperBound | The maximum value of the partition column to copy data out. <br>Apply when partition option is `DynamicRange`. If you use query to retrieve source data, hook `?AdfRangePartitionUpbound` in the WHERE clause. For an example, see the [Parallel copy from Teradata](#parallel-copy-from-teradata) section. | No |
@@ -242,9 +242,9 @@ The Data Factory Teradata connector provides built-in data partitioning to copy
242242

243243
![Screenshot of partition options](./media/connector-teradata/connector-teradata-partition-options.png)
244244

245-
When you enable partitioned copy, Data Factory runs parallel queries against your Teradata source to load data by partitions. The parallel degree is controlled by the [`parallelCopies`](copy-activity-performance.md#parallel-copy) setting on the copy activity. For example, if you set `parallelCopies` to four, Data Factory concurrently generates and runs four queries based on your specified partition option and settings, and each query retrieves a portion of data from your Teradata database.
245+
When you enable partitioned copy, Data Factory runs parallel queries against your Teradata source to load data by partitions. The parallel degree is controlled by the [`parallelCopies`](copy-activity-performance.md#parallel-copy) setting on the copy activity. For example, if you set `parallelCopies` to four, Data Factory concurrently generates and runs four queries based on your specified partition option and settings, and each query retrieves a portion of data from your Teradata.
246246

247-
You are suggested to enable parallel copy with data partitioning especially when you load large amount of data from your Teradata database. The following are suggested configurations for different scenarios. When copying data into file-based data store, it's recommanded to write to a folder as multiple files (only specify folder name), in which case the performance is better than writing to a single file.
247+
You are suggested to enable parallel copy with data partitioning especially when you load large amount of data from your Teradata. The following are suggested configurations for different scenarios. When copying data into file-based data store, it's recommanded to write to a folder as multiple files (only specify folder name), in which case the performance is better than writing to a single file.
248248

249249
| Scenario | Suggested settings |
250250
| ------------------------------------------------------------ | ------------------------------------------------------------ |

0 commit comments

Comments
 (0)