You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2016/11/02 09:35:04 UTC

[1/2] incubator-carbondata git commit: Update doc for dateformat option

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 100d34f8c -> cd058ad73


Update doc for dateformat option


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/71fc0695
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/71fc0695
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/71fc0695

Branch: refs/heads/master
Commit: 71fc0695d16261e12a2608dd7901cff4e5eb5f55
Parents: 267af1f
Author: lion-x <xl...@gmail.com>
Authored: Sat Oct 29 17:10:07 2016 +0800
Committer: lion-x <xl...@gmail.com>
Committed: Wed Nov 2 09:14:31 2016 +0800

----------------------------------------------------------------------
 docs/DML-Operations-on-Carbon.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/71fc0695/docs/DML-Operations-on-Carbon.md
----------------------------------------------------------------------
diff --git a/docs/DML-Operations-on-Carbon.md b/docs/DML-Operations-on-Carbon.md
index 23a01ca..b910ddb 100644
--- a/docs/DML-Operations-on-Carbon.md
+++ b/docs/DML-Operations-on-Carbon.md
@@ -91,12 +91,19 @@ Following are the options that can be used in load data:
     ```ruby
     OPTIONS('ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary')
     ```
-- **COLUMNDICT:** dictionary file path for single column.
+- **COLUMNDICT:** Dictionary file path for specified column.
 
     ```ruby
     OPTIONS('COLUMNDICT'='column1:dictionaryFilePath1, column2:dictionaryFilePath2')
     ```
     Note: ALL_DICTIONARY_PATH and COLUMNDICT can't be used together.
+- **DATEFORMAT:** Date format for specified column.
+
+    ```ruby
+    OPTIONS('DATEFORMAT'='column1:dateFormat1, column2:dateFormat2')
+    ```
+    Note: Date formats are specified by date pattern strings. The date pattern letters in Carbon are
+    the same as in JAVA [SimpleDateFormat](http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html).
 
 **Example:**
 
@@ -110,7 +117,8 @@ Following are the options that can be used in load data:
                                  'MULTILINE'='true', 'ESCAPECHAR'='\', 
                                  'COMPLEX_DELIMITER_LEVEL_1'='$', 
                                  'COMPLEX_DELIMITER_LEVEL_2'=':',
-                                 'ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary'
+                                 'ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary',
+                                 'DATEFORMAT'='projectjoindate:yyyy-MM-dd'
                                  )
   ```
 


[2/2] incubator-carbondata git commit: [CARBONDATA-353]Update doc for dateformat option This closes #272

Posted by ja...@apache.org.
[CARBONDATA-353]Update doc for dateformat option This closes #272


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/cd058ad7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/cd058ad7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/cd058ad7

Branch: refs/heads/master
Commit: cd058ad73d6c5a8da5dbc26038daf38ff9e6289f
Parents: 100d34f 71fc069
Author: jackylk <ja...@huawei.com>
Authored: Wed Nov 2 17:33:28 2016 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Wed Nov 2 17:33:28 2016 +0800

----------------------------------------------------------------------
 docs/DML-Operations-on-Carbon.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------