You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/09/22 05:19:10 UTC
[1/2] incubator-carbondata git commit: Fix doc
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 5894980b5 -> 0be0f3083
Fix doc
update option 'ALL_DICTIONARY_PATH'
Fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/6bbea523
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/6bbea523
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/6bbea523
Branch: refs/heads/master
Commit: 6bbea5234576f5acc64e9467e002ef53d1b52c6c
Parents: 5894980
Author: Zhangshunyu <zh...@huawei.com>
Authored: Sun Sep 18 14:33:06 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Wed Sep 21 22:17:43 2016 -0700
----------------------------------------------------------------------
docs/DML-Operations-on-Carbon.md | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6bbea523/docs/DML-Operations-on-Carbon.md
----------------------------------------------------------------------
diff --git a/docs/DML-Operations-on-Carbon.md b/docs/DML-Operations-on-Carbon.md
index 31cba8e..fa2305e 100644
--- a/docs/DML-Operations-on-Carbon.md
+++ b/docs/DML-Operations-on-Carbon.md
@@ -18,7 +18,7 @@
-->
* [LOAD DATA](#LOAD DATA)
-* [SHOW LOADS](#SHOW LOADS)
+* [SHOW SEGMENTS](#SHOW SEGMENTS)
* [DELETE SEGMENT BY ID](#DELETE SEGMENT BY ID)
* [DELETE SEGMENT BY DATE](#DELETE SEGMENT BY DATE)
@@ -86,15 +86,10 @@ Following are the options that can be used in load data:
```ruby
OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':')
```
-- **LOCAL_DICTIONARY_PATH:** Local dictionary files path.
+- **ALL_DICTIONARY_PATH:** All dictionary files path.
```ruby
- OPTIONS('LOCAL_DICTIONARY_PATH'='/opt/localdictionary/')
- ```
-- **DICTIONARY_FILE_EXTENSION:** local Dictionary file extension.
-
- ```ruby
- OPTIONS('DICTIONARY_FILE_EXTENSION'='.dictionary')
+ OPTIONS('ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary')
```
**Example:**
@@ -109,8 +104,8 @@ Following are the options that can be used in load data:
'MULTILINE'='true', 'ESCAPECHAR'='\',
'COMPLEX_DELIMITER_LEVEL_1'='$',
'COMPLEX_DELIMITER_LEVEL_2'=':',
- 'LOCAL_DICTIONARY_PATH'='/opt/localdictionary/',
- 'DICTIONARY_FILE_EXTENSION'='.dictionary')
+ 'ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary'
+ )
```
***
@@ -128,7 +123,7 @@ This command is to show the segments of carbon table to the user.
| ------------- | -----| --------- |
| db_name | Database name, if it is not specified then it uses current database. | YES |
| table_name | The name of the table in provided database.| NO |
-| number_of_loads | limit the output to this number. | YES |
+| number_of_segments | limit the output to this number. | YES |
**Example:**
@@ -157,8 +152,8 @@ This command is to delete segment by using the segment ID.
**Example:**
```ruby
- DELETE LOAD 0 FROM TABLE CarbonDatabase.CarbonTable;
- DELETE LOAD 0.1,5,8 FROM TABLE CarbonDatabase.CarbonTable;
+ DELETE SEGMENT 0 FROM TABLE CarbonDatabase.CarbonTable;
+ DELETE SEGMENT 0.1,5,8 FROM TABLE CarbonDatabase.CarbonTable;
Note: Here 0.1 is compacted segment sequence id.
```
[2/2] incubator-carbondata git commit: [CARBONDATA-255]Fix DDL AND
DML DOC This closes #172
Posted by ch...@apache.org.
[CARBONDATA-255]Fix DDL AND DML DOC This closes #172
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/0be0f308
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/0be0f308
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/0be0f308
Branch: refs/heads/master
Commit: 0be0f30830c3a9487b5fc13f6fe27e4ca4b5a300
Parents: 5894980 6bbea52
Author: chenliang613 <ch...@apache.org>
Authored: Wed Sep 21 22:18:56 2016 -0700
Committer: chenliang613 <ch...@apache.org>
Committed: Wed Sep 21 22:18:56 2016 -0700
----------------------------------------------------------------------
docs/DML-Operations-on-Carbon.md | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------