Skip to content

Commit 2225b10

Browse files
re-group data loading pages under Data Migration
1 parent 8e4c558 commit 2225b10

File tree

11 files changed

+37
-54
lines changed

11 files changed

+37
-54
lines changed

content/admin/security/ports-usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ follows:
3737

3838

3939
<sup>1</sup>: Dgraph Zero uses port 5080 for internal communication within the
40-
cluster, and to support the [data import]({{< relref "about_import.md" >}})
40+
cluster, and to support the [data import]({{< relref "import-data.md" >}})
4141
tools: Dgraph Live Loader and Dgraph Bulk Loader.
4242

4343
<sup>2</sup>: Dgraph Zero uses port 6080 for

content/cli/bulk.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ Ensure adequate disk space:
275275
## See Also
276276
277277
- [Live Loader]({{< relref "live.md" >}}) - For incremental updates
278-
- [Data Migration]({{< relref "../../migration/about-data-migration.md" >}}) - Migration strategies
278+
- [Data Migration]({{< relref "../../migration/import-data.md" >}}) - Migration strategies
279279
- [Schema]({{< relref "../../dql/dql-schema.md" >}}) - Schema definition
280-
- [Bulk Loader Guide]({{< relref "howto/importdata/bulk-loader.md" >}}) - Detailed bulk loading guide
280+
- [Bulk Loader Guide]({{< relref "bulk-loader.md" >}}) - Detailed bulk loading guide
281281

content/enterprise-features/encryption-at-rest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type = "docs"
1010
{{% notice "note" %}}
1111
This feature was introduced in [v1.1.1](https://github.com/dgraph-io/dgraph/releases/tag/v1.1.1).
1212
For migrating unencrypted data to a new Dgraph cluster with encryption enabled, you need to
13-
[export the database]({{< relref "dgraph-administration.md#export-database" >}}) and [import data]({{< relref "about_import.md" >}}),
13+
[export the database]({{< relref "dgraph-administration.md#export-database" >}}) and [import data]({{< relref "import-data.md" >}}),
1414
preferably using the [bulk loader]({{< relref "bulk-loader.md" >}}).
1515
{{% /notice %}}
1616

content/howto/importdata/_index.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

content/howto/importdata/about_import.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

content/migration/about-data-migration.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

content/howto/importdata/bulk-loader.md renamed to content/migration/bulk-loader.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title = "Initial import (Bulk Loader)"
44
type = "docs"
55
weight = 3
66
[menu.main]
7-
parent = "importdata"
7+
parent = "migration"
88
identifier="bulkloading"
99
+++
1010

content/howto/export-data.md renamed to content/migration/export-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
title = "Export data"
33
type = "docs"
44
keywords = "export, data, self hosted"
5-
weight = 3
5+
weight = 7
66
[menu.main]
77
identifier = "exportdata"
8-
parent = "howto"
8+
parent = "migration"
99
+++
1010

1111
As an `Administrator` you can export data from Dgraph to an an object store, NFS, or a file path.

content/migration/import-data.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
+++
2+
title = "Import Data"
3+
type = "docs"
4+
keywords = "Data, migration, csv, sql,"
5+
[menu.main]
6+
parent = "migration"
7+
weight = 1
8+
+++
9+
10+
As an `Administrator` you can initialize a new Dgraph cluster by doing an [Initial import]({{< relref "bulk-loader.md" >}}) and you can import data into a running instance by performing a [Live import]({{< relref "live-loader.md" >}}).
11+
12+
13+
Initial import is **considerably faster** than the live import but can only be used to load data into a new cluster (without prior data) and is executed before starting the Alpha nodes.
14+
15+
16+
{{% notice "note" %}} Both options accept [RDF N-Quad/Triple
17+
data](https://www.w3.org/TR/n-quads/) or JSON format. Refers to [data migration]({{< relref "import-data.md" >}}) to see how to convert other data formats.{{% /notice %}}
18+
19+
20+
To load CSV-formatted data or SQL data into Dgraph,
21+
first convert the dataset into one of the accepted formats ([RDF N-Quad/Triple](https://www.w3.org/TR/n-quads/) or JSON) and then load the
22+
resulting dataset into Dgraph.
23+
24+
After you convert the `.csv` or `.sql` files to [RDF N-Quad/Triple](https://www.w3.org/TR/n-quads/) or JSON,
25+
you can use [Dgraph Live Loader]({{< relref "live-loader.md" >}}) or
26+
[Dgraph Bulk Loader]({{< relref "bulk-loader.md" >}}) to import your data.

content/howto/importdata/live-loader.md renamed to content/migration/live-loader.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ title = "Live import"
44
type = "docs"
55
weight = 2
66
[menu.main]
7-
parent = "importdata"
7+
parent = "migration"
88
+++
99

1010
You can import data on a running Dgraph instance (which may have prior data) using Dgraph CLI command [dgraph live]({{< relref "cli/live.md" >}}) referred to as **Live Loader**.
1111
Live Loader sends mutations to a Dgraph cluster and has options to handle unique IDs assignment and to update existing data.
1212

1313
{{% notice "note" %}} Live Loader accepts [RDF N-Quad/Triple
14-
data](https://www.w3.org/TR/n-quads/) or JSON in plain or gzipped format. Refers to [data migration]({{< relref "about-data-migration.md" >}}) to see how to convert other data formats.{{% /notice %}}
14+
data](https://www.w3.org/TR/n-quads/) or JSON in plain or gzipped format. Refers to [data migration]({{< relref "import-data.md" >}}) to see how to convert other data formats.{{% /notice %}}
1515

1616
## Before you begin
1717
Verify that you have a local folder `<local-path-to-data>` containing
1818
- at least one **data file** in RDF or JSON in plain or gzip format with the data to import
1919
- an optional **schema file**.
2020

21-
Those files have been generated by an [export]({{< relref "export-data.md" >}}) or by a [data migration]({{< relref "about-data-migration.md" >}}) tool.
21+
Those files have been generated by an [export]({{< relref "export-data.md" >}}) or by a [data migration]({{< relref "import-data.md" >}}) tool.
2222

2323

2424
## Importing data on Dgraph Cloud

0 commit comments

Comments
 (0)