drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject [07/10] drill git commit: typo, minor edit
Date Wed, 17 Jun 2015 00:10:42 GMT
typo, minor edit


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/5dc90cdd
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/5dc90cdd
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/5dc90cdd

Branch: refs/heads/gh-pages
Commit: 5dc90cdda77eef8b059a63c6eb0c384ff08707fc
Parents: 36d3a5c
Author: Kristine Hahn <khahn@maprtech.com>
Authored: Wed Jun 10 14:54:29 2015 -0700
Committer: Kristine Hahn <khahn@maprtech.com>
Committed: Wed Jun 10 14:54:29 2015 -0700

----------------------------------------------------------------------
 .../010-sample--data-donuts.md                  | 54 ++++++++++----------
 .../020-selecting-flat-data.md                  | 18 ++++---
 2 files changed, 39 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/5dc90cdd/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
----------------------------------------------------------------------
diff --git a/_docs/query-data/querying-complex-data/010-sample--data-donuts.md b/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
index f1c7a1f..29e72f7 100644
--- a/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
+++ b/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
@@ -2,37 +2,39 @@
 title: "Sample Data: Donuts"
 parent: "Querying Complex Data"
 ---
-The complex data queries use the sample `donuts.json` file. To download this file, go to
[Drill test resources](https://github.com/apache/drill/tree/master/exec/java-exec/src/test/resources)
page, locate donuts.json in the list of files, and download it. For example, on the Mac right-click
the five, select Save Link As, and then click Save.
+The complex data queries use the sample `donuts.json` file. To download this file, go to
[Drill test resources](https://github.com/apache/drill/tree/master/exec/java-exec/src/test/resources)
page, locate donuts.json in the list of files, and download it. 
 
-Here is the single complete "record" (`0001`) from the `donuts.json `file. In
+Here is the first "record" (`0001`) from the `donuts.json `file. In
 terms of Drill query processing, this record is equivalent to a single record
 in a table.
 
     {
-      "id": "0001",
-      "type": "donut",
-      "name": "Cake",
-      "ppu": 0.55,
-      "batters":
-        {
-          "batter":
-            [
-               { "id": "1001", "type": "Regular" },
-               { "id": "1002", "type": "Chocolate" },
-               { "id": "1003", "type": "Blueberry" },
-               { "id": "1004", "type": "Devil's Food" }
-             ]
-        },
-      "topping":
-        [
-           { "id": "5001", "type": "None" },
-           { "id": "5002", "type": "Glazed" },
-           { "id": "5005", "type": "Sugar" },
-           { "id": "5007", "type": "Powdered Sugar" },
-           { "id": "5006", "type": "Chocolate with Sprinkles" },
-           { "id": "5003", "type": "Chocolate" },
-           { "id": "5004", "type": "Maple" }
-         ]
+        "id": "0001",
+        "type": "donut",
+        "name": "Cake",
+        "ppu": 0.55,
+        "sales": 35,
+
+        "batters":
+          {
+            "batter":
+              [
+                { "id": "1001", "type": "Regular" },
+                { "id": "1002", "type": "Chocolate" },
+                { "id": "1003", "type": "Blueberry" },
+                { "id": "1004", "type": "Devil's Food" }
+              ]
+          },
+        "topping":
+          [
+            { "id": "5001", "type": "None" },
+            { "id": "5002", "type": "Glazed" },
+            { "id": "5005", "type": "Sugar" },
+            { "id": "5007", "type": "Powdered Sugar" },
+            { "id": "5006", "type": "Chocolate with Sprinkles" },
+            { "id": "5003", "type": "Chocolate" },
+            { "id": "5004", "type": "Maple" }
+          ]
     }
 
 The data is made up of maps, arrays, and nested arrays. Name-value pairs and

http://git-wip-us.apache.org/repos/asf/drill/blob/5dc90cdd/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
----------------------------------------------------------------------
diff --git a/_docs/query-data/querying-complex-data/020-selecting-flat-data.md b/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
index 1f11905..2910feb 100644
--- a/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
+++ b/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
@@ -3,17 +3,21 @@ title: "Selecting Flat Data"
 parent: "Querying Complex Data"
 ---
 A very simple query against the `donuts.json` file returns the values for the
-four "flat" columns (the columns that contain data at the top level only: no
+five "flat" columns (the columns that contain data at the top level only: no
 nested data):
 
     0: jdbc:drill:zk=local> select id, type, name, ppu
     from dfs.`/Users/brumsby/drill/donuts.json`;
-    +------------+------------+------------+------------+
-    |     id     |    type    |    name    |    ppu     |
-    +------------+------------+------------+------------+
-    | 0001       | donut      | Cake       | 0.55       |
-    +------------+------------+------------+------------+
-    1 row selected (0.248 seconds)
+    +-------+--------+----------------+-------+
+    |  id   |  type  |      name      |  ppu  |
+    +-------+--------+----------------+-------+
+    | 0001  | donut  | Cake           | 0.55  |
+    | 0002  | donut  | Raised         | 0.69  |
+    | 0003  | donut  | Old Fashioned  | 0.55  |
+    | 0004  | donut  | Filled         | 0.69  |
+    | 0005  | donut  | Apple Fritter  | 1.0   |
+    +-------+--------+----------------+-------+
+    5 rows selected (0.18 seconds)
 
 Note that `dfs` is the schema name, the path to the file is enclosed by
 backticks, and the query must end with a semicolon.
\ No newline at end of file


Mime
View raw message