Skip to content

Commit 8359f35

Browse files
Merge pull request #2107 from MicrosoftDocs/main638905718932569699sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 691f8f6 + 7b39c85 commit 8359f35

File tree

4 files changed

+26
-23
lines changed

4 files changed

+26
-23
lines changed

docs/data-engineering/get-started-api-livy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ A Lakehouse artifact is required to access the Livy endpoint. Once the Lakehouse
101101

102102
The endpoint of the Livy API would follow this pattern:
103103

104-
<https://api.fabric.microsoft.com/v1/workspaces/><ws_id>/lakehouses/<lakehouse_id>/livyapi/versions/2023-12-01/
104+
`https://api.fabric.microsoft.com/v1/workspaces/><ws_id>/lakehouses/<lakehouse_id>/livyapi/versions/2023-12-01/`
105105

106106
The URL is appended with either \<sessions> or \<batches> depending on what you choose.
107107

docs/data-engineering/materialized-lake-views/create-materialized-lake-view.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ DROP MATERIALIZED LAKE VIEW customers_enriched;
142142
143143
## Current limitations
144144

145+
* The Schema name will full capitals is not supported and is a known limitation, you can continue to use Create MLVs without full caps in Schema name.
145146
* Spark properties set at the session level aren't applied during scheduled lineage refresh.
146147
* The creation of materialized lake view with delta time-travel isn't supported.
147148
* DML statements aren't supported with materialized lake views.

docs/data-science/ai-services/ai-services-overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,17 @@ To determine your Fabric home region, visit [Find your Fabric home region](../..
8585

8686
### Consumption rate for OpenAI language models
8787

88-
| **Models** | **Context (Tokens)** | **Input (Per 1,000 Tokens)** | **Output (Per 1,000 Tokens)** |
89-
|---|---|---|---|
90-
|GPT-4o-2024-05-13 Global |128 K|84.03 CU seconds |336.13 CU seconds|
91-
|GPT-4o-mini-0718 Global |128 K|5.04 CU seconds |20.17 CU seconds|
88+
| **Models** | **Deployment Name** | **Context (Tokens)** | **Input (Per 1,000 Tokens)** | **Output (Per 1,000 Tokens)** |
89+
|---|---|---|---|---|
90+
|GPT-4o-2024-05-13 Global | `gpt-4o` | 128 K | 84.03 CU seconds | 336.13 CU seconds |
91+
|GPT-4o-mini-0718 Global | `gpt-4o-mini` | 128 K| 5.04 CU seconds | 20.17 CU seconds |
9292

9393

9494
### Consumption rate for OpenAI embedding models
9595

96-
| **Models** | **Operation Unit of Measure** | **Consumption rate** |
97-
|---|---|---|
98-
|text-embedding-ada-002 | 1,000 Tokens|3.36 CU seconds|
96+
| **Models** | **Deployment Name** | **Context (Tokens)** | **Input (Per 1,000 Tokens)** |
97+
|---|---|---|---|
98+
| Ada | `text-embedding-ada-002` | 8192 | 3.36 CU seconds |
9999

100100
### Consumption rate for Text Analytics
101101

docs/onelake/onelake-consumption.md

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,27 @@ Requests to OneLake, such as reading or writing data, consume Fabric Capacity Un
2626
### Operation types
2727
OneLake uses the same [mappings](/azure/storage/blobs/map-rest-apis-transaction-categories) as Azure Data Lake Storage (ADLS) to classify the operation to the category.
2828

29-
This table defines CU consumption when OneLake data is accessed using applications that redirect certain requests. Redirection is an implementation that reduces consumption of OneLake compute.
29+
OneLake supports two access paths: redirect and proxy. Applications will use one of these paths based on specific circumstances, some determined by the workload and others outside its control. Requests via proxy and redirect share the same consumption rate.
30+
31+
This table defines CU consumption when OneLake data is accessed using applications that redirect certain requests.
3032

3133
| **Operation in Metrics App** | **Description** | **Operation Unit of Measure** | **Consumption rate** |
3234
|---|---|---|---|
3335
| **OneLake Read via Redirect** | OneLake Read via Redirect | Every 4 MB, per 10,000* | 104 CU seconds |
3436
| **OneLake Write via Redirect** | OneLake Write via Redirect | Every 4 MB, per 10,000* | 1626 CU seconds |
37+
| **OneLake Other Operations via Redirect** | OneLake Other Operations via Redirect | Per 10,000 | 104 CU seconds |
3538
| **OneLake Iterative Read via Redirect** | OneLake Iterative Read via Redirect | Per 10,000 | 1626 CU seconds |
3639
| **OneLake Iterative Write via Redirect** | OneLake Iterative Write via Redirect | Per 100 | 1300 CU seconds |
37-
| **OneLake Other Operations via Redirect** | OneLake Other Operations via Redirect | Per 10,000 | 104 CU seconds |
3840

39-
This table defines CU consumption when OneLake data is accessed using applications that proxy requests.
41+
This table defines CU consumption when OneLake data is accessed using applications that proxy requests, which match the rate for transactions via redirect.
4042

4143
| **Operation in Metrics App** | **Description** | **Operation Unit of Measure** | **Consumption rate** |
4244
|---|---|---|---|
43-
| **OneLake Read via Proxy** | OneLake Read via Proxy | Every 4 MB, per 10,000* | 306 CU seconds |
44-
| **OneLake Write via Proxy** | OneLake Write via Proxy | Every 4 MB, per 10,000* | 2650 CU seconds |
45-
| **OneLake Iterative Read via Proxy** | OneLake Iterative Read via Proxy | Per 10,000 | 4798 CU seconds |
46-
| **OneLake Iterative Write via Proxy** | OneLake Iterative Write via Proxy | Per 100 | 2117.95 CU seconds |
47-
| **OneLake Other Operations** | OneLake Other Operations | Per 10,000 | 306 CU seconds |
45+
| **OneLake Read via Proxy** | OneLake Read via Proxy | Every 4 MB, per 10,000* | 104 CU seconds |
46+
| **OneLake Write via Proxy** | OneLake Write via Proxy | Every 4 MB, per 10,000* | 1626 CU seconds |
47+
| **OneLake Other Operations** | OneLake Other Operations | Per 10,000 | 104 CU seconds |
48+
| **OneLake Iterative Read via Proxy** | OneLake Iterative Read via Proxy | Per 10,000 | 1626 CU seconds |
49+
| **OneLake Iterative Write via Proxy** | OneLake Iterative Write via Proxy | Per 100 | 1300 CU seconds |
4850

4951
*For files > 4 MB in size, OneLake counts a transaction for every 4 MB block of data read or written. For files < 4 MB, a full transaction is counted. For example, if you do 10,000 read operations via Redirect and each file read is 16 MB in size, your capacity consumption is 40,000 transactions or 416 CU seconds.
5052

@@ -80,19 +82,19 @@ This table defines CU consumption when disaster recovery is enabled and OneLake
8082
|---|---|---|---|
8183
| **OneLake BCDR Read via Redirect** | OneLake BCDR Read via Redirect | Every 4 MB, per 10,000 | 104 CU seconds |
8284
| **OneLake BCDR Write via Redirect** | OneLake BCDR Write via Redirect | Every 4 MB, per 10,000 | 3056 CU seconds |
85+
| **OneLake BCDR Other Operations Via Redirect** | OneLake BCDR Other Operations Via Redirect | Per 10,000 | 104 CU seconds |
8386
| **OneLake BCDR Iterative Read via Redirect** | OneLake BCDR Iterative Read via Redirect | Per 10,000 | 1626 CU seconds |
8487
| **OneLake BCDR Iterative Write via Redirect** | OneLake BCDR Iterative Write via Redirect | Per 100 | 2730 CU seconds |
85-
| **OneLake BCDR Other Operations Via Redirect** | OneLake BCDR Other Operations Via Redirect | Per 10,000 | 104 CU seconds |
8688

87-
This table defines CU consumption when disaster recovery is enabled and OneLake data is accessed using applications that proxy requests.
89+
This table defines CU consumption when disaster recovery is enabled and OneLake data is accessed using applications that proxy requests, which match the rate for transactions via redirect.
8890

8991
| **Operation** | **Description** | **Operation Unit of Measure** | **Capacity Units** |
9092
|---|---|---|---|
91-
| **OneLake BCDR Read via Proxy** | OneLake BCDR Read via Proxy | Every 4 MB, per 10,000 | 306 CU seconds |
92-
| **OneLake BCDR Write via Proxy** | OneLake BCDR Write via Proxy | Every 4 MB, per 10,000 | 3870 CU seconds |
93-
| **OneLake BCDR Iterative Read via Proxy** | OneLake BCDR Iterative Read via Proxy | Per 10,000 | 4798 CU seconds |
94-
| **OneLake BCDR Iterative Write via Proxy** | OneLake BCDR Iterative Write via Proxy | Per 100 | 3415.5 CU seconds |
95-
| **OneLake BCDR Other Operations** | OneLake BCDR Other Operations | Per 10,000 | 306 CU seconds |
93+
| **OneLake BCDR Read via Proxy** | OneLake BCDR Read via Proxy | Every 4 MB, per 10,000 | 104 CU seconds |
94+
| **OneLake BCDR Write via Proxy** | OneLake BCDR Write via Proxy | Every 4 MB, per 10,000 | 3056 CU seconds |
95+
| **OneLake BCDR Other Operations** | OneLake BCDR Other Operations | Per 10,000 | 104 CU seconds |
96+
| **OneLake BCDR Iterative Read via Proxy** | OneLake BCDR Iterative Read via Proxy | Per 10,000 | 1626 CU seconds |
97+
| **OneLake BCDR Iterative Write via Proxy** | OneLake BCDR Iterative Write via Proxy | Per 100 | 2730 CU seconds |
9698

9799
## OneLake security
98100

0 commit comments

Comments
 (0)