Skip to content

Commit 316ab42

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram-0415a
2 parents 72854fc + 6295c16 commit 316ab42

6 files changed

+27
-2
lines changed

articles/cosmos-db/create-sql-api-java-changefeed.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ mvn clean package
8484

8585
Press enter. Now the following block of code will execute and initialize the Change Feed processor on another thread:
8686

87+
# [Java SDK 4.0](#tab/v4sdk)
8788

8889
**Java SDK 4.0**
8990
```java
@@ -98,6 +99,8 @@ mvn clean package
9899
while (!isProcessorRunning.get()); //Wait for Change Feed processor start
99100
```
100101
102+
# [Java SDK 3.7.0](#tab/v3sdk)
103+
101104
**Java SDK 3.7.0**
102105
```java
103106
changeFeedProcessorInstance = getChangeFeedProcessor("SampleHost_1", feedContainer, leaseContainer);
@@ -110,7 +113,8 @@ mvn clean package
110113
111114
while (!isProcessorRunning.get()); //Wait for Change Feed processor start
112115
```
113-
116+
---
117+
114118
```"SampleHost_1"``` is the name of the Change Feed processor worker. ```changeFeedProcessorInstance.start()``` is what actually starts the Change Feed processor.
115119
116120
Return to the Azure Portal Data Explorer in your browser. Under the **InventoryContainer-leases** container, click **items** to see its contents. You will see that Change Feed Processor has populated the lease container, i.e. the processor has assigned the ```SampleHost_1``` worker a lease on some partitions of the **InventoryContainer**.
@@ -119,6 +123,8 @@ mvn clean package
119123
120124
1. Press enter again in the terminal. This will trigger 10 documents to be inserted into **InventoryContainer**. Each document insertion appears in the Change Feed as JSON; the following callback code handles these events by mirroring the JSON documents into a materialized view:
121125
126+
# [Java SDK 4.0](#tab/v4sdk)
127+
122128
**Java SDK 4.0**
123129
```java
124130
public static ChangeFeedProcessor getChangeFeedProcessor(String hostName, CosmosAsyncContainer feedContainer, CosmosAsyncContainer leaseContainer) {
@@ -145,6 +151,8 @@ mvn clean package
145151
}
146152
```
147153
154+
# [Java SDK 3.7.0](#tab/v3sdk)
155+
148156
**Java SDK 3.7.0**
149157
```java
150158
public static ChangeFeedProcessor getChangeFeedProcessor(String hostName, CosmosContainer feedContainer, CosmosContainer leaseContainer) {
@@ -170,6 +178,7 @@ mvn clean package
170178
typeContainer.upsertItem(document).subscribe();
171179
}
172180
```
181+
---
173182
174183
1. Allow the code to run 5-10sec. Then return to the Azure Portal Data Explorer and navigate to **InventoryContainer > items**. You should see that items are being inserted into the inventory container; note the partition key (```id```).
175184
@@ -185,6 +194,8 @@ mvn clean package
185194
186195
Hit enter again to call the function ```deleteDocument()``` in the example code. This function, shown below, upserts a new version of the document with ```/ttl == 5```, which sets document Time-To-Live (TTL) to 5sec.
187196
197+
# [Java SDK 4.0](#tab/v4sdk)
198+
188199
**Java SDK 4.0**
189200
```java
190201
public static void deleteDocument() {
@@ -212,6 +223,7 @@ mvn clean package
212223
feedContainer.upsertItem(document,new CosmosItemRequestOptions()).block();
213224
}
214225
```
226+
# [Java SDK 3.7.0](#tab/v3sdk)
215227
216228
**Java SDK 3.7.0**
217229
```java
@@ -240,6 +252,7 @@ mvn clean package
240252
feedContainer.upsertItem(document,new CosmosItemRequestOptions()).block();
241253
}
242254
```
255+
---
243256
244257
The Change Feed ```feedPollDelay``` is set to 100ms; therefore, Change Feed responds to this update almost instantly and calls ```updateInventoryTypeMaterializedView()``` shown above. That last function call will upsert the new document with TTL of 5sec into **InventoryContainer-pktype**.
245258

articles/cosmos-db/create-sql-api-java.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ git clone https://github.com/Azure-Samples/azure-cosmos-java-getting-started.git
7676
This step is optional. If you're interested in learning how the database resources are created in the code, you can review the following snippets. Otherwise, you can skip ahead to [Run the app
7777
](#run-the-app).
7878

79+
80+
# [Sync API](#tab/sync)
81+
7982
### Managing database resources using the synchronous (sync) API
8083

8184
* `CosmosClient` initialization. The `CosmosClient` provides client-side logical representation for the Azure Cosmos database service. This client is used to configure and execute requests against the service.
@@ -102,6 +105,8 @@ This step is optional. If you're interested in learning how the database resourc
102105

103106
[!code-java[](~/azure-cosmosdb-java-v4-getting-started/src/main/java/com/azure/cosmos/sample/sync/SyncMain.java?name=QueryItems)]
104107

108+
# [Async API](#tab/async)
109+
105110
### Managing database resources using the asynchronous (async) API
106111

107112
* Async API calls return immediately, without waiting for a response from the server. In light of this, the following code snippets show proper design patterns for accomplishing all of the preceding management tasks using async API.
@@ -130,6 +135,8 @@ This step is optional. If you're interested in learning how the database resourc
130135

131136
[!code-java[](~/azure-cosmosdb-java-v4-getting-started/src/main/java/com/azure/cosmos/sample/async/AsyncMain.java?name=QueryItems)]
132137

138+
---
139+
133140
## Run the app
134141

135142
Now go back to the Azure portal to get your connection string information and launch the app with your endpoint information. This enables your app to communicate with your hosted database.

articles/machine-learning/how-to-move-data-in-out-of-pipelines.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ ms.topic: conceptual
99
ms.author: laobri
1010
author: lobrien
1111
ms.date: 04/01/2020
12+
ms.custom: contperfq4
1213
# As a data scientist using Python, I want to get data into my pipeline and flowing between steps
1314
---
1415

1516
# Moving data into and between ML pipeline steps (Python)
1617

1718
[!INCLUDE [applies-to-skus](../../includes/aml-applies-to-basic-enterprise-sku.md)]
1819

19-
Data is central to machine learning pipelines. This article provides code for importing, transforming, and moving data between steps in an Azure Machine Learning pipeline. For an overview of how data works in Azure Machine Learning, see [Access data in Azure storage services](how-to-access-data.md). For the benefits and structure of Azure Machine Learning pipelines, see [What are Azure Machine Learning pipelines?](concept-ml-pipelines.md).
20+
This article provides code for importing, transforming, and moving data between steps in an Azure Machine Learning pipeline. For an overview of how data works in Azure Machine Learning, see [Access data in Azure storage services](how-to-access-data.md). For the benefits and structure of Azure Machine Learning pipelines, see [What are Azure Machine Learning pipelines?](concept-ml-pipelines.md).
2021

2122
This article will show you how to:
2223

articles/machine-learning/how-to-trigger-published-pipeline.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ms.subservice: core
1010
ms.workload: data-services
1111
ms.topic: conceptual
1212
ms.date: 02/07/2020
13+
ms.custom: contperfq4
1314

1415
---
1516
# Trigger a run of a Machine Learning pipeline from a Logic App

articles/machine-learning/tutorial-pipeline-batch-scoring-classification.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ author: trevorbye
1010
ms.author: trbye
1111
ms.reviewer: laobri
1212
ms.date: 03/11/2020
13+
ms.custom: contperfq4
1314
---
1415

1516
# Tutorial: Build an Azure Machine Learning pipeline for batch scoring

articles/machine-learning/tutorial-train-deploy-image-classification-model-vscode.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ms.topic: tutorial
99
author: luisquintanilla
1010
ms.author: luquinta
1111
ms.date: 04/13/2020
12+
ms.custom: contperfq4
13+
1214
#Customer intent: As a professional data scientist, I want to learn how to train and deploy an image classification model using TensorFlow and the Azure Machine Learning Visual Studio Code Extension.
1315
---
1416

0 commit comments

Comments
 (0)