Skip to content

Commit b382829

Browse files
authored
Update more docs and also the developer.md doc (#414)
* update dev.md * update docs
1 parent 4b1e9e6 commit b382829

File tree

9 files changed

+50
-24
lines changed

9 files changed

+50
-24
lines changed

DEVELOPERS.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,20 @@ can be displayed. For example, the following command creates a
9393
```bash
9494
dot -Tpdf < /tmp/plan.dot > /tmp/plan.pdf
9595
```
96+
97+
## How to format `.md` document
98+
99+
We are using `prettier` to format `.md` files.
100+
101+
You can either use `npm i -g prettier` to install it globally or use `npx` to run it as a standalone binary. Using `npx` required a working node environment. Upgrading to the latest prettier is recommended (by adding `--upgrade` to the `npm` command).
102+
103+
```bash
104+
$ prettier --version
105+
2.3.0
106+
```
107+
108+
After you've confirmed your prettier version, you can format all the `.md` files:
109+
110+
```bash
111+
prettier -w {ballista,datafusion,datafusion-examples,dev,docs,python}/**/*.md
112+
```

datafusion-examples/examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ The examples `csv_sql.rs` and `parquet_sql.rs` demonstrate building a query plan
2525

2626
## Distributed
2727

28-
The `flight-client.rs` and `flight-server.rs` examples demonstrate how to run DataFusion as a standalone process and execute SQL queries from a client using the Flight protocol.
28+
The `flight-client.rs` and `flight-server.rs` examples demonstrate how to run DataFusion as a standalone process and execute SQL queries from a client using the Flight protocol.

dev/README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,16 @@ committer.
3333

3434
## How to merge a Pull request
3535

36-
Please don't merge PRs using the Github Web interface. Instead, set up
37-
your git clone such as to have a remote named ``apache`` pointing to the
36+
Please don't merge PRs using the Github Web interface. Instead, set up
37+
your git clone such as to have a remote named `apache` pointing to the
3838
official Arrow repository:
39+
3940
```
4041
git remote add apache git@github.com:apache/arrow.git
4142
```
4243

4344
and then run the following command:
45+
4446
```
4547
./dev/merge_arrow_pr.sh
4648
```
@@ -64,10 +66,13 @@ If these aren't supplied, the script will ask you the values of them.
6466
Note that the directory name of your Arrow git clone must be called `arrow`.
6567

6668
example output:
69+
6770
```
6871
Which pull request would you like to merge? (e.g. 34):
6972
```
73+
7074
Type the pull request number (from https://github.com/apache/arrow/pulls) and hit enter.
75+
7176
```
7277
=== Pull Request #X ===
7378
title Blah Blah Blah
@@ -77,16 +82,20 @@ url https://api.github.com/repos/apache/arrow/pulls/X
7782
7883
Proceed with merging pull request #3? (y/n):
7984
```
85+
8086
If this looks good, type y and hit enter.
87+
8188
```
8289
From git-wip-us.apache.org:/repos/asf/arrow.git
8390
* [new branch] master -> PR_TOOL_MERGE_PR_3_MASTER
8491
Switched to branch 'PR_TOOL_MERGE_PR_3_MASTER'
8592
8693
Merge complete (local ref PR_TOOL_MERGE_PR_3_MASTER). Push to apache? (y/n):
8794
```
95+
8896
A local branch with the merge has been created.
8997
type y and hit enter to push it to apache master
98+
9099
```
91100
Counting objects: 67, done.
92101
Delta compression using up to 4 threads.
@@ -115,6 +124,7 @@ Merge hash: 485658a5
115124
116125
Would you like to pick 485658a5 into another branch? (y/n):
117126
```
127+
118128
For now just say n as we have 1 branch
119129

120130
## Verifying Release Candidates

dev/archery/archery/crossbow/tests/fixtures/crossbow-success-message.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Revision: {revision}
22

33
Submitted crossbow builds: [{repo} @ {branch}](https://github.com/{repo}/branches/all?query={branch})
44

5-
|Task|Status|
6-
|----|------|
7-
|docker-cpp-cmake32|[![CircleCI](https://img.shields.io/circleci/build/github/{repo}/{branch}-circle-docker-cpp-cmake32.svg)](https://circleci.com/gh/{repo}/tree/{branch}-circle-docker-cpp-cmake32)|
8-
|wheel-osx-cp36m|[![TravisCI](https://img.shields.io/travis/{repo}/{branch}-travis-wheel-osx-cp36m.svg)](https://travis-ci.com/{repo}/branches)|
9-
|wheel-osx-cp37m|[![TravisCI](https://img.shields.io/travis/{repo}/{branch}-travis-wheel-osx-cp37m.svg)](https://travis-ci.com/{repo}/branches)|
10-
|wheel-win-cp36m|[![Appveyor](https://img.shields.io/appveyor/ci/{repo}/{branch}-appveyor-wheel-win-cp36m.svg)](https://ci.appveyor.com/project/{repo}/history)|
5+
| Task | Status |
6+
| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
7+
| docker-cpp-cmake32 | [![CircleCI](https://img.shields.io/circleci/build/github/{repo}/{branch}-circle-docker-cpp-cmake32.svg)](https://circleci.com/gh/{repo}/tree/{branch}-circle-docker-cpp-cmake32) |
8+
| wheel-osx-cp36m | [![TravisCI](https://img.shields.io/travis/{repo}/{branch}-travis-wheel-osx-cp36m.svg)](https://travis-ci.com/{repo}/branches) |
9+
| wheel-osx-cp37m | [![TravisCI](https://img.shields.io/travis/{repo}/{branch}-travis-wheel-osx-cp37m.svg)](https://travis-ci.com/{repo}/branches) |
10+
| wheel-win-cp36m | [![Appveyor](https://img.shields.io/appveyor/ci/{repo}/{branch}-appveyor-wheel-win-cp36m.svg)](https://ci.appveyor.com/project/{repo}/history) |

dev/benchmarking/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
~ under the License.
1818
-->
1919

20-
2120
> NOTE: For those deploying this database, Postgres does not by default use
2221
> UTF-8, however it is [required for the jsonb][pg-jsonb] format used in
2322
> some columns to always work. This [stackoverflow post][so-utf8] describes
@@ -81,7 +80,6 @@ database will be set up automatically once the container is running.
8180
To start the containers, be sure to have [Docker installed][docker],
8281
and then run the following from this directory (arrow/dev/benchmarking).
8382

84-
8583
```
8684
docker-compose up
8785
```
@@ -111,9 +109,11 @@ The `psql` shell client is bundled with the PostgreSQL core distribution
111109
available from the [Postgres download page][postgres-downloads].
112110
Using the `PG_USER` defined in the `.env` file (currently "benchmark"),
113111
the command to connect to the container is:
112+
114113
```shell
115114
psql -h localhost -p 5432 -U benchmark
116115
```
116+
117117
There is an example script in [examples/example.sql](examples/example.sql) that
118118
runs some queries against the database. To run it in the psql client, type
119119
the following in the psql command-line interface:
@@ -168,14 +168,15 @@ The script [graphql_submit.sh](./graphql_submit.sh) simplifies submission
168168
to the database via curl. Examples:
169169

170170
```shell
171-
./graphql_submit.sh benchmarks examples/benchmark_example.json
171+
./graphql_submit.sh benchmarks examples/benchmark_example.json
172172
./graphql_submit.sh runs examples/benchmark_run_example.json
173173
```
174174

175175
#### Querying
176176

177177
The output of the query is a JSON object that is hard to read on the command line.
178178
Here is an example query in the shell:
179+
179180
```shell
180181
curl -X POST \
181182
-H "Content-Type: application/json" \
@@ -190,6 +191,7 @@ which (if you have previously run the "examples.sql" command) yields
190191
```
191192

192193
Here is an example query using Python:
194+
193195
```python
194196
import json
195197
import requests
@@ -219,7 +221,6 @@ for row in response.json()['data']['allEnvironmentViews']['edges']:
219221
> how to do it for Amazon RDS. This [section of the docs][pg-charset]
220222
> states how to do it in general, i.e.: `initdb -E UTF8`.
221223
222-
223224
## Quick reference
224225

225226
- String variables `'have single quotes'`

dev/release/VERIFY.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ GLib, Java and JavaScript builds on Linux and macOS. Read the comments in
3434

3535
You need the followings to verify C GLib build:
3636

37-
* GLib
38-
* GObject Introspection
39-
* Ruby (not EOL-ed version is required)
40-
* gobject-introspection gem
41-
* test-unit gem
37+
- GLib
38+
- GObject Introspection
39+
- Ruby (not EOL-ed version is required)
40+
- gobject-introspection gem
41+
- test-unit gem
4242

4343
You can install them by the followings on Debian GNU/Linux and Ubuntu:
4444

dev/tasks/conda-recipes/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,12 @@ related parts (the cloning of arrow and the jinja templated variables) and
5454
moving the matrix definitions like [this][matrix-definition] to the crossbow
5555
[tasks.yml][../tasks.yml] config file.
5656

57-
5857
### Porting recipes from crossbow to the upstream feedstocks
5958

6059
Theoretically these recipes should be up to date with the actual version of
6160
Arrow, so during the release procedure the content of these recipes should be
6261
copied to the upstream feedstocks.
6362

64-
6563
[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
6664
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
6765
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12

dev/tasks/gandiva-jars/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ Do the following to update arrow manylinux docker image for building Gandiva Jar
2626
- Export JAVA_HOME environment variable.
2727
- Then update build_boost.sh under python/manylinux1/scripts to build boost statically.
2828

29-
Please look at https://github.com/praveenbingo/arrow/tree/buildGandivaDocker that already has these changes.
29+
Please look at https://github.com/praveenbingo/arrow/tree/buildGandivaDocker that already has these changes.

dev/tasks/linux-packages/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
## Requirements
2323

24-
* Ruby
25-
* Docker
26-
* Tools to build tar.gz for Apache Arrow C++ and GLib
24+
- Ruby
25+
- Docker
26+
- Tools to build tar.gz for Apache Arrow C++ and GLib
2727

2828
## How to build .deb packages
2929

0 commit comments

Comments
 (0)