Skip to content

Commit 1119104

Browse files
Merge pull request #100584 from linda33wj/master
Update ADF connector content
2 parents e2fc6c9 + 2e905e9 commit 1119104

17 files changed

+63
-63
lines changed

articles/data-factory/TOC.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -673,18 +673,18 @@
673673
href: /python/api/overview/azure/datafactory?view=azure-python
674674
- name: Resources
675675
items:
676+
- name: Whitepapers
677+
href: whitepapers.md
678+
- name: FAQ
679+
href: frequently-asked-questions.md
680+
- name: Service updates
681+
href: https://azure.microsoft.com/updates/?product=data-factory
676682
- name: Ask a question - MSDN forum
677683
href: https://social.msdn.microsoft.com/Forums/en-US/home?forum=AzureDataFactory&filter=alltypes&sort=lastpostdesc
678684
- name: Ask a question - Stack Overflow
679685
href: https://stackoverflow.com/questions/tagged/azure-data-factory
680686
- name: Request a feature
681687
href: https://feedback.azure.com/forums/270578-azure-data-factory
682-
- name: FAQ
683-
href: frequently-asked-questions.md
684-
- name: Whitepapers
685-
href: whitepapers.md
686-
- name: Roadmap
687-
href: https://azure.microsoft.com/roadmap/?tag=data-factory
688688
- name: Pricing
689689
href: https://azure.microsoft.com/pricing/details/data-factory/
690690
- name: Availability by region

articles/data-factory/connector-amazon-simple-storage-service.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ The following properties are supported for Amazon S3 under `storeSettings` setti
149149

150150
| Property | Description | Required |
151151
| ------------------------ | ------------------------------------------------------------ | ----------------------------------------------------------- |
152-
| type | The type property under `storeSettings` must be set to **AmazonS3ReadSetting**. | Yes |
152+
| type | The type property under `storeSettings` must be set to **AmazonS3ReadSettings**. | Yes |
153153
| recursive | Indicates whether the data is read recursively from the subfolders or only from the specified folder. Note that when recursive is set to true and the sink is a file-based store, an empty folder or subfolder isn't copied or created at the sink. Allowed values are **true** (default) and **false**. | No |
154154
| prefix | Prefix for the S3 object key under the given bucket configured in dataset to filter source objects. Objects whose keys start with this prefix are selected. <br>Applies only when `wildcardFolderPath` and `wildcardFileName` properties are not specified. | No |
155155
| wildcardFolderPath | The folder path with wildcard characters under the given bucket configured in dataset to filter source folders. <br>Allowed wildcards are: `*` (matches zero or more characters) and `?` (matches zero or single character); use `^` to escape if your actual folder name has wildcard or this escape char inside. <br>See more examples in [Folder and file filter examples](#folder-and-file-filter-examples). | No |
@@ -181,11 +181,11 @@ The following properties are supported for Amazon S3 under `storeSettings` setti
181181
"source": {
182182
"type": "DelimitedTextSource",
183183
"formatSettings":{
184-
"type": "DelimitedTextReadSetting",
184+
"type": "DelimitedTextReadSettings",
185185
"skipLineCount": 10
186186
},
187187
"storeSettings":{
188-
"type": "AmazonS3ReadSetting",
188+
"type": "AmazonS3ReadSettings",
189189
"recursive": true,
190190
"wildcardFolderPath": "myfolder*A",
191191
"wildcardFileName": "*.csv"

articles/data-factory/connector-azure-blob-storage.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ The following properties are supported for Azure Blob under `storeSettings` sett
358358

359359
| Property | Description | Required |
360360
| ------------------------ | ------------------------------------------------------------ | --------------------------------------------- |
361-
| type | The type property under `storeSettings` must be set to **AzureBlobStorageReadSetting**. | Yes |
361+
| type | The type property under `storeSettings` must be set to **AzureBlobStorageReadSettings**. | Yes |
362362
| recursive | Indicates whether the data is read recursively from the subfolders or only from the specified folder. Note that when recursive is set to true and the sink is a file-based store, an empty folder or subfolder isn't copied or created at the sink. Allowed values are **true** (default) and **false**. | No |
363363
| wildcardFolderPath | The folder path with wildcard characters under the given container configured in dataset to filter source folders. <br>Allowed wildcards are: `*` (matches zero or more characters) and `?` (matches zero or single character); use `^` to escape if your actual folder name has wildcard or this escape char inside. <br>See more examples in [Folder and file filter examples](#folder-and-file-filter-examples). | No |
364364
| wildcardFileName | The file name with wildcard characters under the given container + folderPath/wildcardFolderPath to filter source files. <br>Allowed wildcards are: `*` (matches zero or more characters) and `?` (matches zero or single character); use `^` to escape if your actual folder name has wildcard or this escape char inside. See more examples in [Folder and file filter examples](#folder-and-file-filter-examples). | Yes if `fileName` is not specified in dataset |
@@ -392,11 +392,11 @@ The following properties are supported for Azure Blob under `storeSettings` sett
392392
"source": {
393393
"type": "DelimitedTextSource",
394394
"formatSettings":{
395-
"type": "DelimitedTextReadSetting",
395+
"type": "DelimitedTextReadSettings",
396396
"skipLineCount": 10
397397
},
398398
"storeSettings":{
399-
"type": "AzureBlobStorageReadSetting",
399+
"type": "AzureBlobStorageReadSettings",
400400
"recursive": true,
401401
"wildcardFolderPath": "myfolder*A",
402402
"wildcardFileName": "*.csv"
@@ -418,7 +418,7 @@ The following properties are supported for Azure Blob under `storeSettings` sett
418418

419419
| Property | Description | Required |
420420
| ------------------------ | ------------------------------------------------------------ | -------- |
421-
| type | The type property under `storeSettings` must be set to **AzureBlobStorageWriteSetting**. | Yes |
421+
| type | The type property under `storeSettings` must be set to **AzureBlobStorageWriteSettings**. | Yes |
422422
| copyBehavior | Defines the copy behavior when the source is files from a file-based data store.<br/><br/>Allowed values are:<br/><b>- PreserveHierarchy (default)</b>: Preserves the file hierarchy in the target folder. The relative path of source file to source folder is identical to the relative path of target file to target folder.<br/><b>- FlattenHierarchy</b>: All files from the source folder are in the first level of the target folder. The target files have autogenerated names. <br/><b>- MergeFiles</b>: Merges all files from the source folder to one file. If the file or blob name is specified, the merged file name is the specified name. Otherwise, it's an autogenerated file name. | No |
423423
| maxConcurrentConnections | The number of the connections to connect to storage store concurrently. Specify only when you want to limit the concurrent connection to the data store. | No |
424424

@@ -448,7 +448,7 @@ The following properties are supported for Azure Blob under `storeSettings` sett
448448
"sink": {
449449
"type": "ParquetSink",
450450
"storeSettings":{
451-
"type": "AzureBlobStorageWriteSetting",
451+
"type": "AzureBlobStorageWriteSettings",
452452
"copyBehavior": "PreserveHierarchy"
453453
}
454454
}

articles/data-factory/connector-azure-data-lake-storage.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ The following properties are supported for Data Lake Storage Gen2 under `storeSe
250250

251251
| Property | Description | Required |
252252
| ------------------------ | ------------------------------------------------------------ | --------------------------------------------- |
253-
| type | The type property under `storeSettings` must be set to **AzureBlobFSReadSetting**. | Yes |
253+
| type | The type property under `storeSettings` must be set to **AzureBlobFSReadSettings**. | Yes |
254254
| recursive | Indicates whether the data is read recursively from the subfolders or only from the specified folder. When recursive is set to true and the sink is a file-based store, an empty folder or subfolder isn't copied or created at the sink. Allowed values are **true** (default) and **false**. | No |
255255
| wildcardFolderPath | The folder path with wildcard characters under the given file system configured in dataset to filter source folders. <br>Allowed wildcards are `*` (matches zero or more characters) and `?` (matches zero or single character). Use `^` to escape if your actual folder name has a wildcard or this escape char inside. <br>See more examples in [Folder and file filter examples](#folder-and-file-filter-examples). | No |
256256
| wildcardFileName | The file name with wildcard characters under the given file system + folderPath/wildcardFolderPath to filter source files. <br>Allowed wildcards are `*` (matches zero or more characters) and `?` (matches zero or single character). Use `^` to escape if your actual folder name has a wildcard or this escape char inside. See more examples in [Folder and file filter examples](#folder-and-file-filter-examples). | Yes if `fileName` isn't specified in dataset |
@@ -281,11 +281,11 @@ The following properties are supported for Data Lake Storage Gen2 under `storeSe
281281
"source": {
282282
"type": "DelimitedTextSource",
283283
"formatSettings":{
284-
"type": "DelimitedTextReadSetting",
284+
"type": "DelimitedTextReadSettings",
285285
"skipLineCount": 10
286286
},
287287
"storeSettings":{
288-
"type": "AzureBlobFSReadSetting",
288+
"type": "AzureBlobFSReadSettings",
289289
"recursive": true,
290290
"wildcardFolderPath": "myfolder*A",
291291
"wildcardFileName": "*.csv"
@@ -307,7 +307,7 @@ The following properties are supported for Data Lake Storage Gen2 under `storeSe
307307

308308
| Property | Description | Required |
309309
| ------------------------ | ------------------------------------------------------------ | -------- |
310-
| type | The type property under `storeSettings` must be set to **AzureBlobFSWriteSetting**. | Yes |
310+
| type | The type property under `storeSettings` must be set to **AzureBlobFSWriteSettings**. | Yes |
311311
| copyBehavior | Defines the copy behavior when the source is files from a file-based data store.<br/><br/>Allowed values are:<br/><b>- PreserveHierarchy (default)</b>: Preserves the file hierarchy in the target folder. The relative path of the source file to the source folder is identical to the relative path of the target file to the target folder.<br/><b>- FlattenHierarchy</b>: All files from the source folder are in the first level of the target folder. The target files have autogenerated names. <br/><b>- MergeFiles</b>: Merges all files from the source folder to one file. If the file name is specified, the merged file name is the specified name. Otherwise, it's an autogenerated file name. | No |
312312
| maxConcurrentConnections | The number of connections to connect to the data store concurrently. Specify only when you want to limit the concurrent connection to the data store. | No |
313313

@@ -337,7 +337,7 @@ The following properties are supported for Data Lake Storage Gen2 under `storeSe
337337
"sink": {
338338
"type": "ParquetSink",
339339
"storeSettings":{
340-
"type": "AzureBlobFSWriteSetting",
340+
"type": "AzureBlobFSWriteSettings",
341341
"copyBehavior": "PreserveHierarchy"
342342
}
343343
}

articles/data-factory/connector-azure-data-lake-store.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ The following properties are supported for Azure Data Lake Store Gen1 under `sto
197197

198198
| Property | Description | Required |
199199
| ------------------------ | ------------------------------------------------------------ | --------------------------------------------- |
200-
| type | The type property under `storeSettings` must be set to **AzureDataLakeStoreReadSetting**. | Yes |
200+
| type | The type property under `storeSettings` must be set to **AzureDataLakeStoreReadSettings**. | Yes |
201201
| recursive | Indicates whether the data is read recursively from the subfolders or only from the specified folder. When recursive is set to true and the sink is a file-based store, an empty folder or subfolder isn't copied or created at the sink. Allowed values are **true** (default) and **false**. | No |
202202
| wildcardFolderPath | The folder path with wildcard characters to filter source folders. <br>Allowed wildcards are `*` (matches zero or more characters) and `?` (matches zero or single character). Use `^` to escape if your actual folder name has a wildcard or this escape char inside. <br>See more examples in [Folder and file filter examples](#folder-and-file-filter-examples). | No |
203203
| wildcardFileName | The file name with wildcard characters under the given folderPath/wildcardFolderPath to filter source files. <br>Allowed wildcards are `*` (matches zero or more characters) and `?` (matches zero or single character). Use `^` to escape if your actual folder name has a wildcard or this escape char inside. See more examples in [Folder and file filter examples](#folder-and-file-filter-examples). | Yes if `fileName` isn't specified in dataset |
@@ -228,11 +228,11 @@ The following properties are supported for Azure Data Lake Store Gen1 under `sto
228228
"source": {
229229
"type": "DelimitedTextSource",
230230
"formatSettings":{
231-
"type": "DelimitedTextReadSetting",
231+
"type": "DelimitedTextReadSettings",
232232
"skipLineCount": 10
233233
},
234234
"storeSettings":{
235-
"type": "AzureDataLakeStoreReadSetting",
235+
"type": "AzureDataLakeStoreReadSettings",
236236
"recursive": true,
237237
"wildcardFolderPath": "myfolder*A",
238238
"wildcardFileName": "*.csv"
@@ -254,7 +254,7 @@ The following properties are supported for Azure Data Lake Store Gen1 under `sto
254254

255255
| Property | Description | Required |
256256
| ------------------------ | ------------------------------------------------------------ | -------- |
257-
| type | The type property under `storeSettings` must be set to **AzureDataLakeStoreWriteSetting**. | Yes |
257+
| type | The type property under `storeSettings` must be set to **AzureDataLakeStoreWriteSettings**. | Yes |
258258
| copyBehavior | Defines the copy behavior when the source is files from a file-based data store.<br/><br/>Allowed values are:<br/><b>- PreserveHierarchy (default)</b>: Preserves the file hierarchy in the target folder. The relative path of the source file to the source folder is identical to the relative path of the target file to the target folder.<br/><b>- FlattenHierarchy</b>: All files from the source folder are in the first level of the target folder. The target files have autogenerated names. <br/><b>- MergeFiles</b>: Merges all files from the source folder to one file. If the file name is specified, the merged file name is the specified name. Otherwise, it's an autogenerated file name. | No |
259259
| maxConcurrentConnections | The number of connections to connect to the data store concurrently. Specify only when you want to limit the concurrent connection to the data store. | No |
260260

@@ -284,7 +284,7 @@ The following properties are supported for Azure Data Lake Store Gen1 under `sto
284284
"sink": {
285285
"type": "ParquetSink",
286286
"storeSettings":{
287-
"type": "AzureDataLakeStoreWriteSetting",
287+
"type": "AzureDataLakeStoreWriteSettings",
288288
"copyBehavior": "PreserveHierarchy"
289289
}
290290
}

0 commit comments

Comments
 (0)