Skip to content

Commit 2a33c21

Browse files
committed
Added new transforms in parent article list; fixed TOC casing.
1 parent 01aaac3 commit 2a33c21

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

articles/data-factory/TOC.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,15 @@
299299
- name: Transform data
300300
href: transform-data.md
301301
items:
302-
- name: HdInsight Hive Activity
302+
- name: HDInsight Hive Activity
303303
href: transform-data-using-hadoop-hive.md
304-
- name: HdInsight Pig Activity
304+
- name: HDInsight Pig Activity
305305
href: transform-data-using-hadoop-pig.md
306-
- name: HdInsight MapReduce Activity
306+
- name: HDInsight MapReduce Activity
307307
href: transform-data-using-hadoop-map-reduce.md
308-
- name: HdInsight Streaming Activity
308+
- name: HDInsight Streaming Activity
309309
href: transform-data-using-hadoop-streaming.md
310-
- name: HdInsight Spark Activity
310+
- name: HDInsight Spark Activity
311311
href: transform-data-using-spark.md
312312
- name: ML Batch Execution Activity
313313
href: transform-data-using-machine-learning.md

articles/data-factory/transform-data.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: data-services
1111
ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: conceptual
14-
ms.date: 01/16/2018
14+
ms.date: 07/31/2018
1515
ms.author: douglasl
1616

1717
---
@@ -20,11 +20,14 @@ ms.author: douglasl
2020
> * [Hive](transform-data-using-hadoop-hive.md)
2121
> * [Pig](transform-data-using-hadoop-pig.md)
2222
> * [MapReduce](transform-data-using-hadoop-map-reduce.md)
23-
> * [Hadoop Streaming](transform-data-using-hadoop-streaming.md)
24-
> * [Spark](transform-data-using-spark.md)
23+
> * [HDInsight Streaming](transform-data-using-hadoop-streaming.md)
24+
> * [HDInsight Spark](transform-data-using-spark.md)
2525
> * [Machine Learning](transform-data-using-machine-learning.md)
2626
> * [Stored Procedure](transform-data-using-stored-procedure.md)
2727
> * [Data Lake Analytics U-SQL](transform-data-using-data-lake-analytics.md)
28+
> * [Databricks notebook](transform-data-databricks-notebook.md)
29+
> * [Databricks Jar](transform-data-databricks-jar.md)
30+
> * [Databricks Python](transform-data-databricks-python.md)
2831
> * [.NET custom](transform-data-using-dotnet-custom-activity.md)
2932
3033
## Overview
@@ -60,6 +63,18 @@ You can use the SQL Server Stored Procedure activity in a Data Factory pipeline
6063
## Data Lake Analytics U-SQL activity
6164
Data Lake Analytics U-SQL activity runs a U-SQL script on an Azure Data Lake Analytics cluster. See [Data Analytics U-SQL activity](transform-data-using-data-lake-analytics.md) article for details.
6265

66+
## Databricks Notebook activity
67+
68+
The Azure Databricks Notebook Activity in a Data Factory pipeline runs a Databricks notebook in your Azure Databricks workspace.Azure Databricks is a managed platform for running Apache Spark. See [Transform data by running a Databricks notebook](transform-data-databricks-notebook.md).
69+
70+
## Databricks Jar activity
71+
72+
The Azure Databricks Jar Activity in a Data Factory pipeline runs a Spark Jar in your Azure Databricks cluster. Azure Databricks is a managed platform for running Apache Spark. See [Transform data by running a Jar activity in Azure Databricks](transform-data-databricks-jar.md).
73+
74+
## Databricks Python activity
75+
76+
The Azure Databricks Python Activity in a Data Factory pipeline runs a Python file in your Azure Databricks cluster. Azure Databricks is a managed platform for running Apache Spark. See [Transform data by running a Python activity in Azure Databricks](transform-data-databricks-python.md).
77+
6378
## Custom activity
6479
If you need to transform data in a way that is not supported by Data Factory, you can create a custom activity with your own data processing logic and use the activity in the pipeline. You can configure the custom .NET activity to run using either an Azure Batch service or an Azure HDInsight cluster. See [Use custom activities](transform-data-using-dotnet-custom-activity.md) article for details.
6580

0 commit comments

Comments
 (0)