Merge pull request #190082 from HeidiSteen/heidist-work

ttorble · web-flow · commit 510311e9757b · 2022-03-01T08:18:32.000Z
more indexer H2 alignment
diff --git a/articles/search/search-howto-connecting-azure-sql-database-to-azure-search-using-indexers.md b/articles/search/search-howto-connecting-azure-sql-database-to-azure-search-using-indexers.md
@@ -103,7 +103,7 @@ In a [search index](search-what-is-an-index.md), add fields to accept values fro
 | int, smallint, tinyint |Edm.Int32, Edm.Int64, Edm.String | |
 | bigint |Edm.Int64, Edm.String | |
 | real, float |Edm.Double, Edm.String | |
-| smallmoney, money decimal numeric |Edm.String |Azure Cognitive Search does not support converting decimal types into Edm.Double because this would lose precision |
+| smallmoney, money decimal numeric |Edm.String |Azure Cognitive Search does not support converting decimal types into Edm.Double because doing so would lose precision |
 | char, nchar, varchar, nvarchar |Edm.String<br/>Collection(Edm.String) |A SQL string can be used to populate a Collection(Edm.String) field if the string represents a JSON array of strings: `["red", "white", "blue"]` |
 | smalldatetime, datetime, datetime2, date, datetimeoffset |Edm.DateTimeOffset, Edm.String | |
 | uniqueidentifer |Edm.String | |
@@ -200,9 +200,11 @@ Execution history contains up to 50 of the most recently completed executions, w
 
 ## Indexing new, changed, and deleted rows
 
-If your SQL database supports [change tracking](/sql/relational-databases/track-changes/about-change-tracking-sql-server), a search indexer can pick up just the new and updated content on subsequent indexer runs. Azure Cognitive Search provides two change detection policies to support incremental indexing. 
+If your SQL database supports [change tracking](/sql/relational-databases/track-changes/about-change-tracking-sql-server), a search indexer can pick up just the new and updated content on subsequent indexer runs. 
 
-Within an indexer definition, you can specify a change detection policy that tells the indexer which change tracking mechanism is used on your table or view. There are two policies to choose from:
+To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. This property tells the indexer which change tracking mechanism is used on your table or view. 
+
+For Azure SQL indexers, there two change detection policies: 
 
 + "SqlIntegratedChangeTrackingPolicy" (applies to tables only)
 
@@ -236,7 +238,7 @@ api-key: admin-key
     }
 ```
 
-When using SQL integrated change tracking policy, do not specify a separate data deletion detection policy. The SQL integrated change tracking policy has built-in support for identifying deleted rows. However, for the deletes to be detected automatically, the document key in your search index must be the same as the primary key in the SQL table. 
+When using SQL integrated change tracking policy, do not specify a separate data deletion detection policy. The SQL integrated change tracking policy has built-in support for identifying deleted rows. However, for the deleted rows to be detected automatically, the document key in your search index must be the same as the primary key in the SQL table. 
 
 > [!NOTE]  
 > When using [TRUNCATE TABLE](/sql/t-sql/statements/truncate-table-transact-sql) to remove a large number of rows from a SQL table, the indexer needs to be [reset](/rest/api/searchservice/reset-indexer) to reset the change tracking state to pick up row deletions.
@@ -282,12 +284,13 @@ api-key: admin-key
 
 ##### convertHighWaterMarkToRowVersion
 
-If you're using a [rowversion](/sql/t-sql/data-types/rowversion-transact-sql) data type for the high water mark column, consider using the `convertHighWaterMarkToRowVersion` indexer configuration setting. `convertHighWaterMarkToRowVersion` does two things:
+If you're using a [rowversion](/sql/t-sql/data-types/rowversion-transact-sql) data type for the high water mark column, consider setting the `convertHighWaterMarkToRowVersion` property in indexer configuration. Setting this property to true results in the following behaviors: 
+
+* Uses the rowversion data type for the high water mark column in the indexer SQL query. Using the correct data type improves indexer query performance.
 
-* Use the rowversion data type for the high water mark column in the indexer sql query. Using the correct data type improves indexer query performance.
-* Subtract 1 from the rowversion value before the indexer query runs. Views with 1 to many joins may have rows with duplicate rowversion values. Subtracting 1 ensures the indexer query doesn't miss these rows.
+* Subtracts one from the rowversion value before the indexer query runs. Views with one-to-many joins may have rows with duplicate rowversion values. Subtracting 1one ensures the indexer query doesn't miss these rows.
 
-To enable this feature, create or update the indexer with the following configuration:
+To enable this property, create or update the indexer with the following configuration:
 
 ```http
     {
@@ -301,7 +304,7 @@ To enable this feature, create or update the indexer with the following configur
 
 ##### queryTimeout
 
-If you encounter timeout errors, you can use the `queryTimeout` indexer configuration setting to set the query timeout to a value higher than the default 5-minute timeout. For example, to set the timeout to 10 minutes, create or update the indexer with the following configuration:
+If you encounter timeout errors, set the `queryTimeout` indexer configuration setting to a value higher than the default 5-minute timeout. For example, to set the timeout to 10 minutes, create or update the indexer with the following configuration:
 
 ```http
     {
@@ -315,7 +318,7 @@ If you encounter timeout errors, you can use the `queryTimeout` indexer configur
 
 ##### disableOrderByHighWaterMarkColumn
 
-You can also disable the `ORDER BY [High Water Mark Column]` clause. However, this is not recommended because if the indexer execution is interrupted by an error, the indexer has to re-process all rows if it runs later - even if the indexer has already processed almost all the rows by the time it was interrupted. To disable the `ORDER BY` clause, use the `disableOrderByHighWaterMarkColumn` setting in the indexer definition:  
+You can also disable the `ORDER BY [High Water Mark Column]` clause. However, this is not recommended because if the indexer execution is interrupted by an error, the indexer has to re-process all rows if it runs later, even if the indexer has already processed almost all the rows at the time it was interrupted. To disable the `ORDER BY` clause, use the `disableOrderByHighWaterMarkColumn` setting in the indexer definition:  
 
 ```http
     {
diff --git a/articles/search/search-howto-index-cosmosdb-gremlin.md b/articles/search/search-howto-index-cosmosdb-gremlin.md
@@ -145,9 +145,9 @@ In a [search index](search-what-is-an-index.md), add fields to accept the source
 
 1. Create additional fields for more searchable content. See [Create an index](search-how-to-create-search-index.md) for details.
 
-### Mapping between JSON Data Types and Azure Cognitive Search Data Types
+### Mapping data types
 
-| JSON data type | Compatible target index field types |
+| JSON data type | Cognitive Search field types |
 | --- | --- |
 | Bool |Edm.Boolean, Edm.String |
 | Numbers that look like integers |Edm.Int32, Edm.Int64, Edm.String |
@@ -244,7 +244,9 @@ Execution history contains up to 50 of the most recently completed executions, w
 
 Once an indexer has fully populated a search index, you might want subsequent indexer runs to incrementally index just the new and changed documents in your database.
 
-To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. For Cosmos DB, the only supported policy is the [`HighWaterMarkChangeDetectionPolicy`](/dotnet/api/azure.search.documents.indexes.models.highwatermarkchangedetectionpolicy) using the `_ts` (timestamp) property provided by Azure Cosmos DB. 
+To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. This property tells the indexer which change tracking mechanism is used on your data.
+
+For Cosmos DB indexers, the only supported policy is the [`HighWaterMarkChangeDetectionPolicy`](/dotnet/api/azure.search.documents.indexes.models.highwatermarkchangedetectionpolicy) using the `_ts` (timestamp) property provided by Azure Cosmos DB. 
 
 The following example shows a [data source definition](#define-the-data-source) with a change detection policy:
 
diff --git a/articles/search/search-howto-index-cosmosdb-mongodb.md b/articles/search/search-howto-index-cosmosdb-mongodb.md
@@ -128,9 +128,9 @@ In a [search index](search-what-is-an-index.md), add fields to accept the source
 
 1. Create additional fields for more searchable content. See [Create an index](search-how-to-create-search-index.md) for details.
 
-### Mapping between JSON Data Types and Azure Cognitive Search Data Types
+### Mapping data types
 
-| JSON data type | Compatible target index field types |
+| JSON data type | Cognitive Search field types |
 | --- | --- |
 | Bool |Edm.Boolean, Edm.String |
 | Numbers that look like integers |Edm.Int32, Edm.Int64, Edm.String |
@@ -227,7 +227,9 @@ Execution history contains up to 50 of the most recently completed executions, w
 
 Once an indexer has fully populated a search index, you might want subsequent indexer runs to incrementally index just the new and changed documents in your database.
 
-To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. For Cosmos DB, the only supported policy is the [`HighWaterMarkChangeDetectionPolicy`](/dotnet/api/azure.search.documents.indexes.models.highwatermarkchangedetectionpolicy) using the `_ts` (timestamp) property provided by Azure Cosmos DB. 
+To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. This property tells the indexer which change tracking mechanism is used on your data.
+
+For Cosmos DB indexers, the only supported policy is the [`HighWaterMarkChangeDetectionPolicy`](/dotnet/api/azure.search.documents.indexes.models.highwatermarkchangedetectionpolicy) using the `_ts` (timestamp) property provided by Azure Cosmos DB. 
 
 The following example shows a [data source definition](#define-the-data-source) with a change detection policy:
 
diff --git a/articles/search/search-howto-index-cosmosdb.md b/articles/search/search-howto-index-cosmosdb.md
@@ -188,9 +188,9 @@ In a [search index](search-what-is-an-index.md), add fields to accept the source
 
 1. Create additional fields for more searchable content. See [Create an index](search-how-to-create-search-index.md) for details.
 
-### Mapping between JSON Data Types and Azure Cognitive Search Data Types
+### Mapping data types
 
-| JSON data type | Compatible target index field types |
+| JSON data types | Cognitive Search field types |
 | --- | --- |
 | Bool |Edm.Boolean, Edm.String |
 | Numbers that look like integers |Edm.Int32, Edm.Int64, Edm.String |
@@ -287,7 +287,9 @@ Execution history contains up to 50 of the most recently completed executions, w
 
 Once an indexer has fully populated a search index, you might want subsequent indexer runs to incrementally index just the new and changed documents in your database.
 
-To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. For Cosmos DB, the only supported policy is the [`HighWaterMarkChangeDetectionPolicy`](/dotnet/api/azure.search.documents.indexes.models.highwatermarkchangedetectionpolicy) using the `_ts` (timestamp) property provided by Azure Cosmos DB. 
+To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. This property tells the indexer which change tracking mechanism is used on your data.
+
+For Cosmos DB indexers, the only supported policy is the [`HighWaterMarkChangeDetectionPolicy`](/dotnet/api/azure.search.documents.indexes.models.highwatermarkchangedetectionpolicy) using the `_ts` (timestamp) property provided by Azure Cosmos DB. 
 
 The following example shows a [data source definition](#define-the-data-source) with a change detection policy:
 
diff --git a/articles/search/search-howto-index-mysql.md b/articles/search/search-howto-index-mysql.md
@@ -103,6 +103,25 @@ In a [search index](search-what-is-an-index.md), add search index fields that co
 
 If the primary key in the source table matches the document key (in this case, "ID"), the indexer will import the primary key as the document key.
 
+<a name="TypeMapping"></a>
+
+### Mapping data types
+
+The following table maps the MySQL database to Cognitive Search equivalents. See [Supported data types (Azure Cognitive Search)](/rest/api/searchservice/supported-data-types) for more information.
+
+> [!NOTE]
+> The preview does not support geometry types and blobs. 
+
+| MySQL data types |  Cognitive Search field types |
+| --------------- | -------------------------------- |
+| `bool`, `boolean` | Edm.Boolean, Edm.String |
+| `tinyint`, `smallint`, `mediumint`, `int`, `integer`, `year` | Edm.Int32, Edm.Int64, Edm.String |
+| `bigint` | Edm.Int64, Edm.String |
+| `float`, `double`, `real` | Edm.Double, Edm.String |
+| `date`, `datetime`, `timestamp` | Edm.DateTimeOffset, Edm.String |
+| `char`, `varchar`, `tinytext`, `mediumtext`, `text`, `longtext`, `enum`, `set`, `time` | Edm.String |
+| unsigned numerical data, serial, decimal, dec, bit, blob, binary, geometry | N/A |
+
 ## Configure and run the MySQL indexer
 
 Once the index and data source have been created, you're ready to create the indexer. Indexer configuration specifies the inputs, parameters, and properties controlling run time behaviors.
@@ -180,13 +199,15 @@ The response includes status and the number of items processed. It should look s
 
 Execution history contains up to 50 of the most recently completed executions, which are sorted in the reverse chronological order so that the latest execution comes first.
 
-## Capture new, changed, and deleted rows
+<a name="DataChangeDetectionPolicy"></a>
 
-If your data source meets the requirements for change and deletion detection, the indexer can incrementally index the changes in your data source since the last indexer job, which means you can avoid having to re-index the entire table or view every time an indexer runs.
+## Indexing new and changed rows
 
-<a name="DataChangeDetectionPolicy"></a>
+Once an indexer has fully populated a search index, you might want subsequent indexer runs to incrementally index just the new and changed rows in your database.
 
-### High Water Mark Change Detection policy
+To enable incremental indexing, set the "dataChangeDetectionPolicy" property in your data source definition. This property tells the indexer which change tracking mechanism is used on your data.
+
+For Azure Database for MySQL indexers, the only supported policy is the [`HighWaterMarkChangeDetectionPolicy`](/dotnet/api/azure.search.documents.indexes.models.highwatermarkchangedetectionpolicy). 
 
 An indexer's change detection policy relies on having a "high water mark" column that captures the row version, or the date and time when a row was last updated. It's often a DATE, DATETIME, or TIMESTAMP column at a granularity sufficient for meeting the requirements of a high water mark column. 
 
@@ -197,7 +218,7 @@ In your MySQL database, the high water mark column must meet the following requi
 + The value of this column increases with each insert or update.
 + Queries with the following WHERE and ORDER BY clauses can be executed efficiently: `WHERE [High Water Mark Column] > [Current High Water Mark Value] ORDER BY [High Water Mark Column]`
 
-To set a high water mark policy in your indexer data source, create or update your data source like this:
+The following example shows a [data source definition](#define-the-data-source) with a change detection policy:
 
 ```http
 POST https://[search service name].search.windows.net/datasources?api-version=2020-06-30-Preview
@@ -222,11 +243,11 @@ api-key: [admin key]
 
 <a name="DataDeletionDetectionPolicy"></a>
 
-### Soft Delete Column Deletion Detection policy
+## Indexing deleted rows
 
-When rows are deleted from the source table, you probably want to delete those rows from the search index as well. If the rows are physically removed from the table, Azure Cognitive Search has no way to infer the presence of records that no longer exist.  However, you can use the “soft-delete” technique to logically delete rows without removing them from the table. Add a column to your table or view and mark rows as deleted using that column.
+When rows are deleted from the table or view, you normally want to delete those rows from the search index as well. However, if the rows are physically removed from the table, an indexer has no way to infer the presence of records that no longer exist. The solution is to use a "soft-delete" technique to logically delete rows without removing them from the table. You'll do this by adding a column to your table or view and mark rows as deleted using that column. 
 
-When using the soft-delete technique, you can specify the soft delete policy as follows when creating or updating the data source:
+Given a column that provides deletion state, an indexer can be configured to remove any search documents for which deletion state is set to true. The configuration property that supports this behavior is a data deletion detection policy, which is specified in the [data source definition](#define-the-data-source) as follows:
 
 ```http
 {
@@ -239,26 +260,7 @@ When using the soft-delete technique, you can specify the soft delete policy as
 }
 ```
 
-The "softDeleteMarkerValue" must be a string – use the string representation of your actual value. For example, if you have an integer column where deleted rows are marked with the value 1, use `"1"`. If you have a BIT column where deleted rows are marked with the Boolean true value, use the string literal `True` or `true`, the case doesn't matter.
-
-<a name="TypeMapping"></a>
-
-## Mapping data types
-
-The following table maps the MySQL database to Cognitive Search equivalents. See [Supported data types (Azure Cognitive Search)](/rest/api/searchservice/supported-data-types) for more information.
-
-> [!NOTE]
-> The preview does not support geometry types and blobs. 
-
-| MySQL data type |  Cognitive Search field type |
-| --------------- | -------------------------------- |
-| `bool`, `boolean` | Edm.Boolean, Edm.String |
-| `tinyint`, `smallint`, `mediumint`, `int`, `integer`, `year` | Edm.Int32, Edm.Int64, Edm.String |
-| `bigint` | Edm.Int64, Edm.String |
-| `float`, `double`, `real` | Edm.Double, Edm.String |
-| `date`, `datetime`, `timestamp` | Edm.DateTimeOffset, Edm.String |
-| `char`, `varchar`, `tinytext`, `mediumtext`, `text`, `longtext`, `enum`, `set`, `time` | Edm.String |
-| unsigned numerical data, serial, decimal, dec, bit, blob, binary, geometry | N/A |
+The "softDeleteMarkerValue" must be a string. For example, if you have an integer column where deleted rows are marked with the value 1, use `"1"`. If you have a BIT column where deleted rows are marked with the Boolean true value, use the string literal `True` or `true` (the case doesn't matter).
 
 ## Next steps
 
diff --git a/articles/search/search-howto-large-index.md b/articles/search/search-howto-large-index.md
@@ -1,7 +1,7 @@
 ---
 title: Index large data set using built-in indexers
 titleSuffix: Azure Cognitive Search
-description: Strategies for large data indexing or computationally-intensive indexing through batch mode, resourcing, and techniques for scheduled, parallel, and distributed indexing.
+description: Strategies for large data indexing or computationally intensive indexing through batch mode, resourcing, and techniques for scheduled, parallel, and distributed indexing.
 
 manager: nitinme
 author: dereklegenzoff
