carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [53/53] incubator-carbondata-site git commit: update website 12.20 This closes #1
Date Tue, 20 Dec 2016 01:34:02 GMT
update website 12.20 This closes #1


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

Branch: refs/heads/master
Commit: c2ab1f0c11a40ce3fd5c5941fa286d3da62aabb8
Parents: 0bb92d4
Author: chenliang613 <chenliang613@apache.org>
Authored: Tue Dec 20 09:32:00 2016 +0800
Committer: chenliang613 <chenliang613@apache.org>
Committed: Tue Dec 20 09:32:00 2016 +0800

----------------------------------------------------------------------
 content/css/style.css               | 242 +++++++++++++++++++++-------
 content/dashboard.html              |  57 ++++---
 content/docs/configuration.md       | 135 ++++++++++++++++
 content/docs/data_management.md     | 135 ++++++++++++++++
 content/docs/ddl.md                 | 184 +++++++++++++++++++++
 content/docs/dml.md                 | 207 ++++++++++++++++++++++++
 content/docs/faq.md                 |  18 +++
 content/docs/index.md               |  45 ++++++
 content/docs/installation.md        | 151 ++++++++++++++++++
 content/docs/overview.md            | 177 ++++++++++++++++++++
 content/docs/quick_start.md         | 140 ++++++++++++++++
 content/docs/troubleshooting.md     |  32 ++++
 content/docs/use_cases.md           |  82 ++++++++++
 content/docs/user_guide.md          |  47 ++++++
 content/images/CDbannerSliderbg.jpg | Bin 92736 -> 88343 bytes
 content/images/CDfullyIndexing.png  | Bin 17765 -> 16207 bytes
 content/index.html                  | 266 +++++++++++++++++++++++--------
 17 files changed, 1764 insertions(+), 154 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/css/style.css
----------------------------------------------------------------------
diff --git a/content/css/style.css b/content/css/style.css
index 0d88cc9..79e3471 100644
--- a/content/css/style.css
+++ b/content/css/style.css
@@ -20,6 +20,10 @@ a:hover, a:focus{ color:#ff943d; text-decoration:none}
 
 img{ max-width:100%; height:auto}
 
+.container-fluid{ max-width: 1240px}
+.container-fluid-full{ max-width: 100%}
+
+
 
 .getmore-btn, .knowmore-btn, .join-community{display: block; background: #ff943d; border-radius: 4px; padding: 12px 40px; text-decoration: none;
   text-align: center; font-size: 18px; color: #fff; width: 220px; clear: both; margin-bottom: 30px; text-transform: uppercase; font-weight: 600;}
@@ -29,12 +33,17 @@ img{ max-width:100%; height:auto}
  {display: block; background: #d57222; color: #fff;  text-decoration: none; }
 
 
+.navbar-nav>li>.dropdown-menu {padding: 0;  margin-top: -1px;   color: #fff !important; text-decoration: none;  background: #dd6300 !important; box-shadow: none;  border: 1px solid #dd6300 !important;
+}
+.cd_navcontnt li>.dropdown-menu a:hover, .cd_navcontnt li>.dropdown-menu a.active { color: #dd6300 !important; text-decoration:none; background: #fff !important;}
+
+
 .desktop-view{ display:block}
 .mobile-view{ display:none}
 
 /*a.logo { width: 210px; display: inline-block;  margin: 10px 0;}*/
 a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
-.cd-navbar-wrapper.navbar {margin-bottom:0px;border-bottom: 4px solid #dd6300;}
+.cd-navbar-wrapper.navbar {margin-bottom:0px;border-bottom: 4px solid #dd6300; border-radius: 0}
 /*.cd_navcontnt { margin-top: 20px;}*/
 .cd_navcontnt{ margin-top: 5px}
 .cd_navcontnt li a { padding: 10px 20px;text-transform: uppercase; font-size: 14px; font-weight: 500; color: #222 !important;}
@@ -66,15 +75,7 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
 
 /*.cd-aboutwrapper{background: #282828; display: block;}*/
 .cd-aboutwrapper .container-fluid {padding: 0;}
-/*.cd-aboutblock { padding: 40px 10px; display: block; clear: both;}*/
-/*.cd-aboutblock .title{font-size: 32px; color: #fff; line-height:36px;display:block; text-align:center; margin: 0 0 20px}
-.cd-aboutblock .title .cube-icon{width:30px;height: 30px; margin:0 8px 0 0; padding:0;  display:inline-block; text-align:center;}
-.cd-aboutblock .title .title-underline{ height: 2px; width:100px; background: #fff; margin:10px auto 0; padding: 0; display:block;}
-.cd-aboutblock .para-txt { font-size: 16px; color: #fff; line-height: 30px; display: block; text-align: center; font-family:OpenSansLight;}
-.cd-aboutblock .cd-indexing-blog {border: 1px solid rgba(255,255,255,.2);  text-align: center;  padding: 20px; display: block;margin: 30px 0 20px}
-*/.cd-aboutblock .knowmore-btn {display: block; background: #ff943d; border-radius: 1px; padding: 12px 50px;text-align: center; font-size: 18px; color: #fff; 
-  float: right; clear: both; margin-bottom: 30px; text-transform: uppercase; font-weight: 600;}
-.cd-aboutblock .knowmore-btn:hover {display: block; background: #d57222}
+
 
 .cd-aboutwrapper {
     background: #fff;
@@ -83,9 +84,11 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
 }
 
 .cd-aboutblock {
-    padding: 20px 10px;
+    padding: 20px 20px 0 0px;
     display: block;
     clear: both;
+    border-right: 1px solid #ddd;
+    padding-bottom: 60px;
 }
 
 .cd-aboutblock .title {
@@ -93,54 +96,87 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
     color: #444;
     line-height: 30px;
     display: block;
-    text-align: center;
+    text-align: left;
     margin: 0 0 16px;
 }
 
 .cd-aboutblock .title .title-underline {
     height: 2px;
-    width: 100px;
+    width: 50px;
     background: #ff943d;
-    margin: 6px auto 0;
+    margin: 6px 0 0;
     padding: 0;
     display: block;
 }
 
 .cd-aboutblock .para-txt {
-    font-size: 16px;
+    font-size: 14px;
     color: #111;
     line-height: 22px;
     display: block;
-    text-align: center;
+    text-align: left;
     font-family: OpenSansLight;
 }
 
 
+
+
+.cd-aboutblock .cd-indexing-blog  img{ max-width: 100%}
+
+
+
+/**/
+
+.cd-aboutwrapper {
+    background: #fff;
+    display: block;
+    border-bottom: 1px solid #ccc;
+}
+
+.cd-aboutblock {
+    padding: 10px;
+    display: block;
+    clear: both;
+    border: 1px solid #ddd;
+    margin: 20px 0px;
+    background: #f6f6f6;
+}
+
+
 .cd-aboutblock .cd-indexing-blog {
-    border: 1px solid rgba(0,0,0,.1);
+    border: 1px solid #f6f6f6;
     text-align: center;
-    padding: 10px 0;
+    padding: 0px;
     display: block;
-    margin: 10px 0;
+    margin: 0;
+}
+
+.cd-aboutblock .para-txt {
+    font-size: 16px;
+    color: #111;
+    line-height: 22px;
+    display: block;
+    text-align: left;
+    font-family: OpenSansLight;
+    min-height: 90px;
 }
 
-/*.cd-releaseblock { background: #363636; border-left: 1px solid #555; min-height: 596px; margin: 0 -15px 0 0; padding: 40px 20px 20px;}
-.cd-releaseblock .title{font-size: 28px; color: #fff; line-height:36px;display:block; text-align:left; margin: 0 0 20px}
-.cd-releaseblock .title .title-underline{ height: 2px; width:50px; background: #fff; margin:10px 0; padding: 0; display:block;}
-.cd-releaseblock .release-links { font-size: 14px; color: #fff; line-height: 30px; display: block; text-align:left; text-decoration: none}
-.cd-releaseblock .release-links:hover { text-decoration: underline; color:#00a0d2;}
-.cd-releaseblock .release-date { font-size: 12px; color: #ff943d; line-height:20px; display: block; text-align:right;}
-.cd-releaseblock .latestR {display: block; margin-bottom: 20px; border-bottom: 1px dashed #666; padding-bottom: 20px;}
-.cd-releaseblock .nextr{display: block;   padding: 15px;} 
-.cd-releaseblock .linkblock { display: block; max-height: 180px; overflow: auto; padding-right: 10px;}
-*/
+
+
+.cd-aboutblock .knowmore-btn {display: block; background: #ff943d; border-radius: 1px; padding: 12px 50px;text-align: center; font-size: 18px; color: #fff; 
+ clear: both; margin-bottom: 16px; text-transform: uppercase; font-weight: 600;}
+.cd-aboutblock .knowmore-btn:hover {display: block; background: #d57222}
+
+
+
 
 .cd-releaseblock {
-    background: #eee;
-    margin: 15px 0;
+    background: #f6f6f6;
+    margin: 20px 0;
     border-radius: 0;
-    border: 1px solid #ccc;
+    border: 1px solid #DDD;
 }
+
 .cd-releaseblock .title {
     font-size: 24px;
     color: #444;
@@ -155,24 +191,35 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
 .cd-releaseblock .release-links:hover { text-decoration: underline; color:#00a0d2;}
 .cd-releaseblock .release-date {
     font-size: 12px;
-    color: #f86f00;
-    line-height: 16px;
+    color: #666;
+    line-height: 20px;
     display: block;
-    text-align: right;
-    margin-bottom: 4px;
+    text-align: left;
+    margin-bottom: 10px;
 }
 
 .cd-releaseblock .latestR {
     display: block;
     margin-bottom: 10px;
-    border-bottom: 1px dashed #aaa;
+   /* border-bottom: 1px dashed #aaa;*/
     padding: 10px 15px;
     background: #f6f6f6;
 }
 .cd-releaseblock .nextR{display: block;   padding: 2px 15px 15px;} 
 .cd-releaseblock .linkblock { display: block; max-height: 180px; overflow: auto; padding-right: 10px;}
 
-.cd-flowblock{ padding: 15px 0}
+
+.cd-releaseblock .latestR {
+    display: block;
+    margin-bottom: 10px;
+    /* border-bottom: 1px dashed #aaa; */
+    padding: 10px 15px;
+    background: #f6f6f6;
+}
+.cd-releaseblock .nextR{ display:none;}
+
+
+.cd-flowblock{ padding: 20px 0; background: #f6f6f6}
 .cd-columnblock {display: block; margin:5px 0; padding: 10px;}
 .cd-columnblock:hover { box-shadow: 0 2px 4px #bbb; background: #fdfdfd;}
 
@@ -190,7 +237,7 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
 .cd-columnblock .title-info {
     font-size: 14px;
     color: #000;
-    line-height: 18px;
+    line-height: 22px;
     display: block;
     text-align: center;
     font-family: OpenSansLight;
@@ -200,8 +247,55 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
 }
 .cd-columnblock .iconbox{ display: block; text-align: center;}
 .cd-columnblock .iconbox .icon { display: inline-block;width:80px; height:80px; border: 4px solid #ff943d; border-radius: 50%;}
-.cd-columnblock .iconbox .icon.one{ background: url(../images/cd-uniquedata-icon.png) no-repeat center center; background-size: 56px; }
-.cd-columnblock:hover .iconbox .icon.one{ background: #ff943d url(../images/cd-uniquedata-icon-hover.png) no-repeat center center; 
+.cd-columnblock .iconbox .icon.uniquedata{ background: url(../images/cd-uniquedata-icon.png) no-repeat center center; background-size: 56px; }
+.cd-columnblock:hover .iconbox .icon.uniquedata{ background: #ff943d url(../images/cd-uniquedata-icon-hover.png) no-repeat center center; 
+  transform:scale(1.1);  background-size: 56px;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  }
+
+
+.cd-columnblock .iconbox .icon.multilevelindexing{ background: url(../images/cd-multilevelindexing-icon.png) no-repeat center center; background-size: 56px; }
+.cd-columnblock:hover .iconbox .icon.multilevelindexing{ background: #ff943d url(../images/cd-multilevelindexing-icon-hover.png) no-repeat center center; 
+  transform:scale(1.1);  background-size: 56px;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  }
+
+
+.cd-columnblock .iconbox .icon.deepsparkintegration{ background: url(../images/cd-deepsparkintegration-icon.png) no-repeat center center; background-size: 56px; }
+.cd-columnblock:hover .iconbox .icon.deepsparkintegration{ background: #ff943d url(../images/cd-deepsparkintegration-icon-hover.png) no-repeat center center; 
+  transform:scale(1.1);  background-size: 56px;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  }
+
+  .cd-columnblock .iconbox .icon.advancedpushdownoptimization{ background: url(../images/cd-advancedpushdownoptimization-icon.png) no-repeat center center; background-size: 56px; }
+.cd-columnblock:hover .iconbox .icon.advancedpushdownoptimization{ background: #ff943d url(../images/cd-advancedpushdownoptimization-icon-hover.png) no-repeat center center; 
+  transform:scale(1.1);  background-size: 56px;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  }
+
+  .cd-columnblock .iconbox .icon.dictionaryencoding{ background: url(../images/cd-dictionaryencoding-icon.png) no-repeat center center; background-size: 56px; }
+.cd-columnblock:hover .iconbox .icon.dictionaryencoding{ background: #ff943d url(../images/cd-dictionaryencoding-icon-hover.png) no-repeat center center; 
+  transform:scale(1.1);  background-size: 56px;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  }
+
+  .cd-columnblock .iconbox .icon.updatedeletesupport{ background: url(../images/cd-updatedeletesupport-icon.png) no-repeat center center; background-size: 56px; }
+.cd-columnblock:hover .iconbox .icon.updatedeletesupport{ background: #ff943d url(../images/cd-updatedeletesupport-icon-hover.png) no-repeat center center; 
   transform:scale(1.1);  background-size: 56px;
   -webkit-transition: all .2s ease-in-out;
   -moz-transition: all .2s ease-in-out;
@@ -209,6 +303,14 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
   transition: all .2s ease-in-out;
   }
 
+/*
+cd-advancedpushdownoptimization-icon.png
+cd-deepsparkintegration-icon.png
+cd-dictionaryencoding-icon.png
+cd-multilevelindexing-icon.png
+cd-updatedeletesupport-icon.png
+*/
+
 .cd-columnblock:hover .iconbox{transform:scale(1.1); 
    -webkit-transition: all .2s ease-in-out;
    -moz-transition: all .2s ease-in-out;
@@ -223,13 +325,13 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
 .cd-releasedownload .title .release-date {font-size:16px; color: #bbb; line-height: 16px; display: inline-block;}
 .cd-releasedownload .release-note {
     font-size: 16px;
-    color: #ff943d;
+    color: #00a0d2;
     line-height: 16px;
     display: inline-block;
     margin-left: 60px;
     text-transform: capitalize;
 }
-.cd-releasedownload .release-note:hover { text-decoration: underline;}
+.cd-releasedownload .release-note:hover {color:#ff943d; text-decoration: underline;}
 
 .cd-releasedownload .download-btn {display: block; background: #ff943d; border-radius:1px; padding: 12px 50px;
   text-align: center; font-size: 18px; color: #fff; float: right; clear: both; text-transform: uppercase; font-weight: 600; margin-top: 15px}
@@ -237,12 +339,12 @@ a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
 
 
 .cd-systemblock { padding: 20px 0; background: #EEE; border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}
-.cd-thecolumnblock {display: block; margin:5px 0; min-height: 220px; padding: 15px; background: #fff; box-shadow: 0 1px 1px #bbb;}
+.cd-thecolumnblock {display: block; margin:5px 0; min-height: 280px; padding: 15px; background: #fff; box-shadow: 0 1px 1px #bbb;}
 .cd-thecolumnblock:hover { box-shadow: 0 2px 4px #bbb; background: #fff;}
 .cd-thecolumnblock .title {font-size: 20px;  color: #444;  line-height: 24px;  display: block; text-align: left; margin: 10px 4px 10px; height: 50px;  text-transform: capitalize; font-weight: 600;}
 .cd-thecolumnblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
-.cd-thecolumnblock .title-info { font-size: 14px; color: #000; line-height: 20px;    display: block; text-align: left;
-     overflow: hidden; margin: 0;}
+.cd-thecolumnblock .title-info { font-size: 14px; color: #000; line-height: 22px;    display: block; text-align: left;
+     overflow: hidden; margin: 0; font-family: OpenSansLight}
 
 
 .cd-apacheblock{ padding: 20px 0; 
@@ -259,10 +361,9 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
 .cd-apachepic {display: table-cell; margin: 5px 0; height: 220px;padding: 15px; background: #fff; box-shadow: 0 1px 1px #bbb; vertical-align: middle;}
 .cd-apachetxtblock .title {font-size: 20px;  color: #444;  line-height: 24px;  display: block; text-align: left; margin: 10px 4px 10px; height: 50px;  text-transform: capitalize; font-weight: 600;}
 .cd-apachetxtblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
-.cd-apachetxtblock .title-info { font-size: 14px; color: #000; line-height: 20px;    display: block; text-align: left;
-      overflow: hidden; margin: 0;}
-.cd-apachetxtblock .title-info .linktxt { color: #d05d00}
-
+.cd-apachetxtblock .title-info { font-size: 14px; color: #000; line-height: 22px;    display: block; text-align: left;
+      overflow: hidden; margin: 0; font-family: OpenSansLight}
+.cd-apachetxtblock .title-info .linktxt { color: #00a0d2}
 
 
 .cd-featureblock{ background: url(../images/CDbannerSliderbg.jpg) no-repeat center center; position: relative; min-height: 300px;    background-size: cover;}
@@ -294,10 +395,11 @@ footer ul.footer-nav li a:hover{ text-decoration: underline}
 footer .copyright-txt{ margin:0; padding:0; color: #aaa; font-size: 12px; display: inline-block;}
 footer .term-links{  display: inline-block;  margin:0; padding: 0 10px; text-decoration: none; color: #aaa;}
 footer .term-links:hover{ text-decoration: underline}
-footer .social-icon{ float: right;}
+footer .social-icon{ float: right; display: none}
 footer .social-icon .icons{ display: inline-block;  margin:0; padding: 0 10px; text-decoration: none; color: #aaa; opacity: .5}
 footer .social-icon .icons:hover{ opacity: 1;  text-decoration: none;}
 
+footer .topcontant{  display: none }
 
 
 /* ------------------- Documentation Style here*/
@@ -364,8 +466,11 @@ footer .social-icon .icons:hover{ opacity: 1;  text-decoration: none;}
 }
 
 .maindashboard {
-    padding: 15px;
+    padding:0  15px 0;
+    background: #fff;
+
 }
+
  
 header{
     position: fixed;
@@ -390,7 +495,7 @@ iframe {
     display: block;
     background: transparent;
     border: none;
-    height: calc(100vh - 80px);
+    height: calc(100vh - 60px);
     width: 100%;
 }
 
@@ -401,26 +506,37 @@ iframe {
     color: #444;
 }
 
-.list-group-submenu {
-  margin-left:20px;
-}
+.leftMainMenu .list-group-submenu{margin-left:20px;}
 
 
 .leftMainMenu{}
 .leftMainMenu .panel {
     margin-bottom: 20px;
     background-color: #f9f9f9;
+    box-shadow: none;
     border: 0;
     border-radius: 0;
-    -webkit-box-shadow: none;
-    box-shadow: none;
 }
 
+.leftMainMenu .list-group-item {
+    padding: 12px 8px; margin-bottom: -1px; font-size: 13px; background: #f4f4f4; line-height: 18px;}
+
+.leftMainMenu .list-group-item:first-child { border-top-left-radius:0; border-top-right-radius:0;}
+
 .leftMainMenu .fa.fa-caret-down{ float: right;}
-.leftMainMenu .list-group-item-success {color: #3c763d; background-color: #efefef;}
+.leftMainMenu .list-group-item-success {color: #3c763d; background-color: #f4f4f4;}
+.leftMainMenu .collapse.in .list-group-item { padding-left: 14px; background: #efefef;}
 
 .leftMainMenu a.list-group-item-success:focus, 
-.leftMainMenu a.list-group-item-success:hover { background-color: #e3e3e3;}
+.leftMainMenu a.list-group-item-success.active, 
+.leftMainMenu a.list-group-item-success:hover { background-color: #ddd; border-color: #eee;}
+
+.leftMainMenu .list-group-submenu { margin-left:0px;}
+
+.leftMainMenu .list-group-submenu .list-group-item {
+    background: #fff !important;
+    padding-left: 20px !important;
+}
 
 .leftMainMenu .accordion-heading {  position: relative; }
 .leftMainMenu .accordion-heading .edit {
@@ -439,4 +555,8 @@ p img{ max-width: 100% }
 
 /* ------------------- End Documentation Style here*/
 
-  
\ No newline at end of file
+
+
+/* Media Style */
+
+

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/dashboard.html
----------------------------------------------------------------------
diff --git a/content/dashboard.html b/content/dashboard.html
index 2a33939..36a9964 100644
--- a/content/dashboard.html
+++ b/content/dashboard.html
@@ -36,29 +36,36 @@
         <div class="navbar-collapse collapse cd_navcontnt" id="navbar">         
            <ul class="nav navbar-nav navbar-right navlist-custom">
              <ul class="nav navbar-nav navbar-right navlist-custom">
-              <li><a href="#" ><i class="fa fa-home" aria-hidden="true"></i> </a></li>
+              <li><a href="index.html" ><i class="fa fa-home" aria-hidden="true"></i> </a></li>
             <!--  <li><a href="https://github.com/apache/incubator-carbondata">  </a>-->
                <li class="dropdown">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Download <span class="caret"></span></a>
+                  <a href="#" class="dropdown-toggle " data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Download <span class="caret"></span></a>
                   <ul class="dropdown-menu">
-                    <li><a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.2.0-incubating"  target="blank">Apache CarbonData 0.2.0</a></li>
-                    <li><a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.1-incubating"  target="blank">Apache CarbonData 0.1.1</a></li>
-                    <li><a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.0-incubating"  target="blank">Apache CarbonData 0.1.0</a></li>
+                    <li><a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.2.0-incubating"  target="_blank">Apache CarbonData 0.2.0</a></li>
+                    <li><a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.1-incubating"  target="_blank">Apache CarbonData 0.1.1</a></li>
+                    <li><a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.0-incubating"  target="_blank">Apache CarbonData 0.1.0</a></li>
                     </ul>
                 </li>
 
                </li>
-              <li><a href="#">OverView </a></li>
-              <li><a href="dashboard.html" target="blank" class="active">Documents </a></li>               
+              <!--<li><a href="#">OverView </a></li>-->
+              <li><a href="dashboard.html" class="active"> Documentation </a></li>
+              <!-- <li class="dropdown">
+                  <a href="#" class="dropdown-toggle " data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Documentation <span class="caret"></span></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="dashboard.html">Latest Release</a></li>
+                    <li><a href="#"  target="blank">Older Release</a></li>
+                    </ul>
+              </li>-->       
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
                   <ul class="dropdown-menu">
-                    <li><a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Contributing+to+CarbonData"  target="blank">Contributing to CarbonData</a></li>
-                    <li><a href="http://apache-carbondata-mailing-list-archive.1130556.n5.nabble.com/"  target="blank">CarbonData Mailing List</a></li>
+                    <li><a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Contributing+to+CarbonData"  target="_blank">Contributing to CarbonData</a></li>
+                    <li><a href="http://apache-carbondata-mailing-list-archive.1130556.n5.nabble.com/"  target="_blank">CarbonData Mailing List</a></li>
                     </ul>
                 </li>
 
-              <li><a href="http://www.apache.org/" class="apache_link" target="blank">apache</a>
+              <li><a href="http://www.apache.org/" class="apache_link" target="_blank">apache</a>
            </ul>
         </div><!--/.nav-collapse -->
       </div>
@@ -73,25 +80,24 @@
             <div class="dashboardlinkbox">
                <div class="col-md-12 col-sm-12">
                     <h2 class="heading"> CarbonData Documentation</h2>
-                  <div class="docs-searchbox">
+                  <!--<div class="docs-searchbox">
                   <form action="" method="">
                       <input class="docs-search" type="text" name="q" placeholder="Search by keyword">
                   </form>
                   </div>
+                -->
                </div>
                 <div class="col-md-4 col-sm-4">
-                   <a href="overview.html">
+                   <a href="overDoc.html">
                    <div class="cd-docsblock"> 
                        <h4 class="title">Overview</h4>
                        <p class="title-info">What is CarbonData<br/> Why CarbonData</p>
                    </div>
                    </a>
-                </div>
-
-             
+                </div>             
 
                 <div class="col-md-4 col-sm-4">
-                   <a href="quickstart.html">
+                   <a href="quickstartDoc.html">
                     <div class="cd-docsblock"> 
                        <h4 class="title">Quick start
                         
@@ -101,20 +107,19 @@
                   </a>
                 </div>
                  <div class="col-md-4 col-sm-4">
-                  <a href="usefultips.html">
+                  <a href="usefultipsDoc.html">
                    <div class="cd-docsblock"> 
                        <h4 class="title">Useful Tips
                         
                        </h4>
-                       <p class="title-info">Suggestion to create CarbonData table &   
-Configurations For Optimizing CarbonData Performance</p>
+                       <p class="title-info">Suggestion to create CarbonData table & Configurations For Optimizing CarbonData Performance</p>
                    </div>
                   </a>
                 </div>
 
 
                 <div class="col-md-4 col-sm-4">
-                   <a href="userguide.html">
+                   <a href="userguideDoc.html">
                     <div class="cd-docsblock"> 
                        <h4 class="title">User Guide
                        
@@ -125,7 +130,7 @@ Configurations For Optimizing CarbonData Performance</p>
                 </div>
 
                 <div class="col-md-4 col-sm-4">
-                   <a href="usingcarbondata.html">
+                   <a href="usingcarbondataDoc.html">
                     <div class="cd-docsblock"> 
                        <h4 class="title">Using CarbonData
                         
@@ -136,7 +141,7 @@ Configurations For Optimizing CarbonData Performance</p>
                 </div>
 
                 <div class="col-md-4 col-sm-4">
-                   <a href="faq.html">
+                   <a href="faqDoc.html">
                     <div class="cd-docsblock"> 
                        <h4 class="title">FAQ
                         
@@ -174,7 +179,8 @@ Configurations For Optimizing CarbonData Performance</p>
        <div class="container-fluid">
           <div class="col-md-8 col-sm-8">
             <p class="copyright-txt">Copyright © 2016. All rights reserved  &nbsp;&nbsp;|&nbsp;&nbsp;
-              <a href="#" class="term-links">Apache Software Foundation  </a>&nbsp;&nbsp;| &nbsp;&nbsp; <a href="#" class="term-links"> Privacy Policy </a>
+            <a href="http://www.apache.org/" class="term-links">Apache Software Foundation  </a>&nbsp;&nbsp;| &nbsp;&nbsp;
+               <a href="pageinprogress.html" class="term-links"> Privacy Policy </a>
             </p>
 
           </div>
@@ -193,8 +199,9 @@ Configurations For Optimizing CarbonData Performance</p>
 
   <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+    <script src="js/jquery.min.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="js/bootstrap.min.js"></script>
+    <script src="js/bootstrap.min.js"></script>    
+    <script src="js/custon.js"></script>
   </body>
   </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/docs/configuration.md
----------------------------------------------------------------------
diff --git a/content/docs/configuration.md b/content/docs/configuration.md
new file mode 100644
index 0000000..8af98bb
--- /dev/null
+++ b/content/docs/configuration.md
@@ -0,0 +1,135 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+# Configuring CarbonData
+ This tutorial will guide you through the advance configuration of CarbonData.
+ 
+##  System Configuration
+This section provides the details of all the configurations required for Carbon System.
+<b><p align="center">System Configuration in carbon.properties</p></b>
+
+| Parameter | Default Value | Description |
+|----------------------------|-------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.storelocation | /user/hive/warehouse/carbon.store | Location where Carbon will create the store, and write the data in its own format.NOTE: Store location should be in HDFS. |
+| carbon.ddl.base.hdfs.url | hdfs://hacluster/opt/data | This property is used to configure the HDFS relative path from the HDFS base path, configured in fs.defaultFS. The path configured in carbon.ddl.base.hdfs.url will be appended to the HDFS path configured in fs.defaultFS. If this path is configured, then user need not pass the complete path while dataload.For example: If absolute path of the csv file is hdfs://10.18.101.155:54310/data/cnbc/2016/xyz.csv,the path "hdfs://10.18.101.155:54310" will come from property fs.defaultFS and user can configure the /data/cnbc/ as carbon.ddl.base.hdfs.url.Now while dataload user can specify the csv path as/2016/xyz.csv. |
+| carbon.badRecords.location | /opt/Carbon/Spark/badrecords | Path where the bad records are stored. |
+| carbon.kettle.home | $SPARK_HOME/carbonlib/carbonplugins | Path used by Carbon internally to create graph for loading the data. |
+| carbon.data.file.version | 2 | If this parameter value is set to1, then the Carbon supports the data load which is in old format. If the value is set to 2, then the Carbon supports the data load of new format only.NOTE: The file format created before DataSight Spark V100R002C30 is considered as old format. |                    
+
+##  Performance Configuration
+This section provides the details of all the configurations required for Carbon Performance Optimization.
+<b><p align="center">Performance Configuration in carbon.properties</p></b>
+
+1. **Data Loading Configuration**
+
+| Parameter | Default Value | Description | Range |
+|--------------------------------------|---------------|----------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.sort.file.buffer.size | 20 | File read buffer size used during sorting. | The value is in MB.Min=1 and Max=100 |
+| carbon.graph.rowset.size | 100000 | Rowset size exchanged between data load graph steps. | Min=500 and Max=1000000 |
+| carbon.number.of.cores.while.loading | 6 | Number of cores to be used while data loading. |  |
+| carbon.sort.size | 500000 | Record count to sort and write to temp intermediate files. |  |
+| carbon.enableXXHash | true | Algorithm for hashmap for hashkey calculation. |  |
+| carbon.number.of.cores.block.sort | 7 | Number of cores to be used for block sort while dataloading. |  |
+| carbon.max.driver.lru.cache.size | -1 | Max LRU cache size upto which data will be loaded at the driver side. | The value is in MB. The default value is -1, means there is no memory limit for caching. Only integer values greater than 0 are accepted. |
+| carbon.max.executor.lru.cache.size | -1 | Max LRU cache size upto which data will be loaded at the executor side. | The value is in MB. The default value is -1, means there is no memory limit for caching. Only integer values greater than 0 are accepted. If this parameter is not configured, then thecarbon.max.driver.lru.cache.size value will be considered. |
+| carbon.merge.sort.prefetch | true | Enable prefetch of data during merge sort while reading data from sort temp files in data loading. |  |
+| carbon.update.persist.enable | true | Enabling this parameter considers persistent data. Enabling this will reduce the execution time of UPDATE operation. |  |
+
+2. **Compaction Configuration**
+
+| Parameter | Default Value | Description | Range |
+|-----------------------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------|
+| carbon.number.of.cores.while.compacting | 2 | Number of cores which is used to write data during compaction. |  |
+| carbon.compaction.level.threshold | 4,3 | This property is for minor compaction which decides how many segments to be merged.Example: if it is set as 2,3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment. | Valid values are from 0-100. |
+| carbon.major.compaction.size | 1024 | Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. The value is in MB. |  |
+| carbon.horizontal.compaction.enable | true | This property is used to turn ON/OFF horizontal compaction. After every DELETE and UPDATE statement, horizontal compaction may occur in case the delta (DELETE/ UPDATE) files becomes more than specified threshold. By default the horizontal compaction is Turned ON but can turn OFF the horizontal compaction by setting the value to false. |  |
+| carbon.horizontal.UPDATE.compaction.threshold | 1 | This property specifies the threshold limit on number of UPDATE delta files within a segment. In case the number of delta files goes beyond the threshold, the UPDATE delta files within the segment becomes eligible for horizontal compaction and compacted into single UPDATE delta file. | By default the value is set to 1 and can be altered to values between 1 to 10000. |
+| carbon.horizontal.DELETE.compaction.threshold | 1 | This property specifies the threshold limit on number of DELETE delta files within a block of a segment. In case the number of delta files goes beyond the threshold, the DELETE delta files for the particular block of the segment becomes eligible for horizontal compaction and compacted into single DELETE delta file. | By default the value is set to 1 and can be altered to values between 1 to 10000. |  
+
+3. **Query Configuration**
+
+| Parameter | Default Value | Description | Range |
+|--------------------------------------|---------------|---------------------------------------------------|---------------------------|
+| carbon.number.of.cores | 4 | Number of cores to be used while querying. |  |
+| carbon.inmemory.record.size | 120000 | Number of records to be in memory while querying. | Min=100000 and Max=240000 |
+| carbon.enable.quick.filter | false | Improves the performance of filter query. |  |
+| no.of.cores.to.load.blocks.in.driver | 10 | Number of core to load the blocks in driver. |  |
+
+
+##   Miscellaneous Configurations
+
+<b><p align="center">Extra Configuration in carbon.properties</p></b>
+
+1. **Time format for CarbonData** 
+
+| Parameter | Default Format | Description |
+|-------------------------|---------------------|--------------------------------------------------------------|
+| carbon.timestamp.format | yyyy-MM-dd HH:mm:ss | Timestamp format of input data used for timestamp data type. |
+
+2. **Dataload Configuration**
+  
+| Parameter | Default Value | Description |
+|---------------------------------------------|--------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.sort.file.write.buffer.size | 10485760 | File write buffer size used during sorting. |
+| carbon.lock.type | LOCALLOCK | This configuration specifies the type of lock to be acquired during concurrent operations on table.There are following types of lock implementation: - LOCALLOCK: Lock is created on local file system as file. This lock is useful when only one spark driver (thrift server) runs on a machine and no other Carbon spark application is launched concurrently. - HDFSLOCK: Lock is created on HDFS file system as file. This lock is useful when multiple carbon spark applications are launched and no ZooKeeper is running on cluster and HDFS supports file based locking. |
+| carbon.sort.intermediate.files.limit | 20 | Minimum no of intermediate files after which sort merged to be started. |
+| carbon.block.meta.size.reserved.percentage | 10 | space reserved in percentage for writing block meta data in carbon data file. |
+| carbon.csv.read.buffersize.byte | 1048576 | csv reading buffer size. |
+| high.cardinality.value | 100000 | To identify and apply compression for non-high cardinality columns. |
+| carbon.merge.sort.reader.thread | 3 | Maximum no of threads used for reading intermediate files for final merging. |
+| carbon.load.metadata.lock.retries | 3 | Maximum number of retries to get the metadata lock for loading data to table. |
+| carbon.load.metadata.lock.retry.timeout.sec | 5 | Interval between the retries to get the lock. |
+| carbon.tempstore.location | /opt/Carbon/TempStoreLoc | Temporary store location. By default it takes System.getProperty("java.io.tmpdir"). |
+| carbon.load.log.counter | 500000 | Data loading records count logger. |   
+
+3. **Compaction Configuration**
+
+| Parameter | Default Value | Description |
+|-----------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.numberof.preserve.segments | 0 | If the user wants to preserve some number of segments from being compacted then he can set this property.Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default. |
+| carbon.allowed.compaction.days | 0 | Compaction will merge the segments which are loaded with in the specific number of days configured.Example: if the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged.This is disabled by default. |
+| carbon.enable.auto.load.merge | false | To enable compaction while data loading. |
+  
+4. **Query Configuration**
+
+| Parameter | Default Value | Description |
+|--------------------------|---------------|-----------------------------------------------------------------------------------------------|
+| max.query.execution.time | 60 | Maximum time allowed for one query to be executed. The value is in minutes. |
+| carbon.enableMinMax | true | Min max is feature added to enhance query performance. To disable this feature, set it false. | 
+  
+5. **Global Dictionary Configurations**
+  
+| Parameter | Default Value | Description |
+|---------------------------------------|---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| high.cardinality.identify.enable | true | If the parameter is true, the high cardinality columns of the dictionary code are automatically recognized and these columns will not be used as global dictionary encoding. If the parameter is false, all dictionary encoding columns are used as dictionary encoding.The high cardinality column must meet the following requirements:value of cardinality > configured value of high.cardinalityEqually, the value of cardinality is higher than the threshold.value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageEqually, the ratio of the cardinality value to data row number is higher than the configured percentage. |
+| high.cardinality.threshold | 1000000 | Threshold to identify whether high cardinality column.Configuration value formula:Value of cardinality > configured value of high.cardinalityThe minimum value is 10000. |
+| high.cardinality.row.count.percentage | 80 | Percentage to identify whether column cardinality is more than configured percent of total row count.Configuration value formula:Value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageThe value of the parameter must be larger than 0. |
+| carbon.cutOffTimestamp | 1970-01-01 05:30:00 | Sets the start date for calculating the timestamp. Java counts the number of milliseconds from start of "1970-01-01 00:00:00". This property is used to customize the start of position. For example "2000-01-01 00:00:00".The date must be in the form "carbon.timestamp.format".NOTE: The Carbon supports data store up to 68 years from the cut-off time defined. For example, if the cut-off time is 1970-01-01 05:30:00, then the data can be stored up to 2038-01-01 05:30:00. |
+| carbon.timegranularity | SECOND | The property used to set the data granularity level DAY, HOUR, MINUTE, or SECOND. |
+  
+##  Spark Configuration
+ <b><p align="center">Spark Configuration Reference in spark-defaults.conf</p></b>
+ 
+| Parameter | Default Value | Description |
+|----------------------------------------|--------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| spark.driver.memory | 1g | Amount of memory to use for the driver process, i.e. where SparkContext is initialized.NOTE: In client mode, this config must not be set through the SparkConf directly in your application, because the driver JVM has already started at that point. Instead, please set this through the --driver-memory command line option or in your default properties file. |
+| spark.executor.memory | 1g | Amount of memory to use per executor process. |
+| spark.sql.bigdata.register.analyseRule | org.apache.spark.sql.hive.acl.CarbonAccessControlRules | CarbonAccessControlRules need to be set for enabling Access Control. |
+   
+ 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/docs/data_management.md
----------------------------------------------------------------------
diff --git a/content/docs/data_management.md b/content/docs/data_management.md
new file mode 100644
index 0000000..f56b577
--- /dev/null
+++ b/content/docs/data_management.md
@@ -0,0 +1,135 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+# Data Management
+This tutorial is going to introduce you to the conceptual details of data management like :
+
+* [Loading Data](#loading-data)
+* [Deleting Data](#deleting-data)
+* [Compacting data](#compacting-data)
+
+## Loading Data
+
+* **Scenario**
+
+   Once the table is created, data can be loaded into table using [LOAD DATA]() command and will be available for query. 
+   When data load is triggered, the data is encoded in Carbon format and copied into HDFS Carbon store path(specified in carbon.properties file) 
+   in compressed, multi dimensional columnar format for quick analysis queries. The same command can be used to load new data or to
+   update the existing data. Only one data load can be triggered for one table. The high cardinality columns of the dictionary encoding are 
+   automatically recognized and these columns will not be used for dictionary encoding.
+
+* **Procedure**
+  
+   Data loading is a process that involves execution of multiple steps to read, sort, and encode the date in Carbon store format.
+   Each step is executed on different threads. After data loading process is complete, the status (success/partial success) is updated to 
+   Carbon store metadata. The table below lists the possible load status 
+   
+| Status | Description |
+|-----------------|------------------------------------------------------------------------------------------------------------|
+| Success | All the data is loaded into table and no bad records found. |
+| Partial Success | Data is loaded into table and bad records are found. Bad records are stored at carbon.badrecords.location. |
+   
+   In case of failure, the error will be logged in error log. Details of loads can be seen with [SHOW SEGMENTS]() command. The show segment command output consists of :
+   
+   - SegmentSequenceID
+   - START_TIME OF LOAD
+   - END_TIME OF LOAD 
+   - LOAD STATUS
+ 
+   The latest load will be displayed first in the output.
+   
+   For load commands refer to [DML operations on Carbon Data]()
+   
+##Deleting Data  
+
+* **Scenario**
+   
+   If you have loaded wrong data into the table, or too many bad records and want to modify and reload the data, you can delete required data loads. 
+   The load can be deleted using the Segment Sequence Id or if the table contains date field then the data can be deleted using the date field.
+   
+* **Procedure** 
+
+   The loaded data can be deleted in the following two ways :
+   1. Delete by Segment ID
+     
+      After you get the segment ID of the segment that you want to delete, execute the [DELETE]() Command for the selected segment.
+      The Status of deleted segment is updated to Marked for delete / Marked for Update
+      
+      | SegmentSequenceId | Status            | Load Start Time      | Load End Time        |
+      |-------------------|-------------------|----------------------|----------------------|
+      | 0                 | Success           | 2015-11-19 19:14:... | 2015-11-19 19:14:... |
+      | 1                 | Marked for Update | 2015-11-19 19:54:... | 2015-11-19 20:08:... |
+      | 2                 | Marked for Delete | 2015-11-19 20:25:... | 2015-11-19 20:49:... |
+
+   2. Delete by Date Field
+   
+      If the table contains date field, you can delete the data based on a specific date.
+      
+      For delete commands refer to [DML operations on Carbon Data]()
+      
+    Note :
+    
+     - When the delete segment DML is called, segment will not be deleted physically from the file system. Instead the segment status will be marked as "Marked for Delete". For the query execution, this deleted segment will be excluded.
+     
+     - The deleted segment will be deleted physically during the next load operation and only after the maximum query execution time configured using "max.query.execution.time". By default it is 60 minutes.
+     
+     - If the user wants to force delete the segment physically then he can use [CLEAN FILES]() Command. This DML will physically delete the segment which are "Marked for delete" immediately.
+   
+   
+##Compacting Data
+      
+* **Scenario**
+  
+  Frequent data ingestion results in several fragmented carbon files in the store directory. Since data is sorted only within each load, the indices perform only within each 
+  load. This mean that there will be one index for each load and as number of data load increases, the number of indices also increases. As each index works only on one load, 
+  the performance of indices is reduced. Carbon provides provision for compacting the loads. Compaction process combines several segments into one large segment by merge sorting the data from across the segments.  
+      
+* **Procedure**
+
+  There are two types of compaction Minor and Major compaction.
+  
+  - **Minor Compaction**
+    
+     In minor compaction the user can specify how many loads to be merged. Minor compaction triggers for every data load if the parameter carbon.enable.auto.load.merge is set. If any segments are available to be merged, then compaction will 
+     run parallel with data load. There are 2 levels in minor compaction.
+     
+     - Level 1: Merging of the segments which are not yet compacted.
+     - Level 2: Merging of the compacted segments again to form a bigger segment. 
+  - **Major Compaction**
+     
+     In Major compaction, many segments can be merged into one big segment. User will specify the compaction size until which segments can be merged. Major compaction is usually done during the off-peak time. 
+      
+   There are number of parameters related to Compaction that can be set in carbon.properties file 
+   
+| Parameter | Default | Application | Description | Valid Values |
+|-----------------------------------------|---------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
+| carbon.compaction.level.threshold | 4,3 | Minor | Thisproperty is for minor compaction which decides how many segments to be merged.Example: if it is set as 2,3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment. | NA |
+| carbon.major.compaction.size | 1024 MB | Major | Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. | NA |
+| carbon.numberof.preserve.segments | 0 | Minor/Major | If the user wants to preserve some number of segments from being compacted then he can set this property.Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction.No segments will be preserved by default. | 0-100. |
+| carbon.allowed.compaction.days | 0 | Minor/Major | Compaction will merge the segments which are loaded with in the specific number of days configured.Example: if the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged.This is disabled by default. | 0-100. |
+| carbon.number.of.cores.while.compacting | 2 | Minor/Major | Number of cores which is used to write data during compaction. | 0-100. |   
+  
+   For compaction commands refer to [DDL operations on Carbon Data]()
+    
+
+
+
+
+ 
+ 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/docs/ddl.md
----------------------------------------------------------------------
diff --git a/content/docs/ddl.md b/content/docs/ddl.md
new file mode 100644
index 0000000..eafb257
--- /dev/null
+++ b/content/docs/ddl.md
@@ -0,0 +1,184 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+# DDL Operations on CarbonData
+This tutorial will guide you through the data definition language support provided by CarbonData.
+
+## Overview 
+The following DDL operations are supported in CarbonData :
+
+* [CREATE TABLE](#create-table)
+* [SHOW TABLE](#show-table)
+* [DROP TABLE](#drop-table)
+* [COMPACTION](#compaction)
+
+## CREATE TABLE
+  This command can be used to create carbon table by specifying the list of fields along with the table properties.
+   ```
+   CREATE TABLE [IF NOT EXISTS] [db_name.]table_name 
+                    [(col_name data_type , ...)]               
+              STORED BY 'carbondata'
+                    [TBLPROPERTIES (property_name=property_value, ...)]
+                    // All Carbon's additional table options will go into properties
+   ```
+   
+### Parameter Description
+
+| Parameter | Description | Optional |
+|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| db_name | Name of the Database. Database name should consist of Alphanumeric characters and underscore(_) special character. | Yes |
+| field_list | Comma separated List of fields with data type. The field names should consist of Alphanumeric characters and underscore(_) special character. | No |
+| table_name | The name of the table in Database. Table Name should consist of Alphanumeric characters and underscore(_) special character. | No |
+| STORED BY | "org.apache.carbondata.format", identifies and creates carbon table. | No |
+| TBLPROPERTIES | List of carbon table properties. |  |
+ 
+### Usage Guideline
+            
+   Following are the table properties usage.
+     
+   - **Dictionary Encoding Configuration**
+     
+        By Default dictionary encoding will be enabled for all String columns, and disabled for non-String columns. User can include and exclude columns for dictionary encoding.
+     
+       ```ruby
+       TBLPROPERTIES ("DICTIONARY_EXCLUDE"="column1, column2") 
+       TBLPROPERTIES ("DICTIONARY_INCLUDE"="column1, column2") 
+       ```
+     Here, DICTIONARY_EXCLUDE will exclude dictionary creation. This is applicable for high-cardinality columns and is an optional parameter. DICTIONARY_INCLUDE will generate dictionary for the columns specified in the list.
+     
+   - **Row/Column Format Configuration**
+     
+       Column groups with more than one column are stored in row format, instead of columnar format. By default, each column is a separate column group.
+     
+       ```ruby
+       TBLPROPERTIES ("COLUMN_GROUPS"="(column1,column3),(Column4,Column5,Column6)") 
+       ```
+   - **Table Block Size Configuration**
+        
+        The block size of table files can be defined using the property TABLE_BLOCKSIZE. It accepts only integer values. The default value is set to 1024MB and supports a range of 1MB to 2048MB.
+        If the user does'nt specify this value in the DDL command , default value is used. 
+     
+       ```
+       TBLPROPERTIES ("TABLE_BLOCKSIZE"="512 MB")
+       ```
+     Here 512 MB means the block size of this table is 512 MB, user also can set it as 512M or 512.
+   - **Inverted Index Configuration**
+     
+        Inverted index is very useful to improve compression ratio and query speed, especially for those low-cardinality columns who are in reward position.
+        By default inverted index is enabled. The user can disable the inverted index creation for some columns.
+     
+       ```
+       TBLPROPERTIES ("NO_INVERTED_INDEX"="column1,column3")
+       ```
+     No inverted index shall be generated for the columns specified in NO_INVERTED_INDEX. This property is applicable on columns with high-cardinality and is an optional parameter.
+
+     *Note :* 
+     - By default all columns other than numeric datatype are treated as dimensions and all columns of numeric datatype are treated as measures. 
+    
+     - All dimensions except complex datatype columns are part of multi dimensional key(MDK). This behavior can be overridden by using TBLPROPERTIES, If the user wants to keep any column (except columns of complex datatype) in multi dimensional key then he can keep the columns either in DICTIONARY_EXCLUDE or DICTIONARY_INCLUDE.
+     
+     
+### Example:
+   ```
+   CREATE TABLE IF NOT EXISTS productSchema.productSalesTable (
+                                productNumber Int,
+                                productName String, 
+                                storeCity String, 
+                                storeProvince String, 
+                                productCategory String, 
+                                productBatch String,
+                                saleQuantity Int,
+                                revenue Int)       
+                     STORED BY 'carbondata' 
+                     TBLPROPERTIES ('COLUMN_GROUPS'='(productName,productCategory)',
+                                   'DICTIONARY_EXCLUDE'='productName',
+                                   'DICTIONARY_INCLUDE'='productNumber',
+                                   'NO_INVERTED_INDEX'='productBatch')
+   ```
+    
+## SHOW TABLE
+
+  This command can be used to list all the tables in current database or all the tables of a specific database.
+  ```
+  SHOW TABLES [IN db_Name];
+  ```
+  
+### Parameter Description
+| Parameter  | Description                                                                               | Optional |
+|------------|-------------------------------------------------------------------------------------------|----------|
+| IN db_Name | Name of the database. Required only if tables of this specific database are to be listed. | Yes      |
+
+### Example:
+  
+  ```
+  SHOW TABLES IN ProductSchema;
+  ```
+
+## DROP TABLE
+
+ This command can be used to delete the existing table.
+
+  ```
+  DROP TABLE [IF EXISTS] [db_name.]table_name;
+  ```
+
+### Parameter Description
+| Parameter | Description | Optional |
+|-----------|-------------| -------- |
+| db_Name | Name of the database. If not specified, current database will be selected. | YES |
+| table_name | Name of the table to be deleted. | NO |
+
+### Example:
+
+  ```
+  DROP TABLE IF EXISTS productSchema.productSalesTable;
+  ```
+
+## COMPACTION
+
+This command will merge the specified number of segments into one segment. This will enhance the query performance of the table.
+
+  ```
+  ALTER TABLE [db_name.]table_name COMPACT 'MINOR/MAJOR';
+  ```
+  
+  To get details about Compaction refer to [Data Management]()
+  
+### Parameter Description
+
+| Parameter | Description | Optional |
+| ------------- | -----| ----------- |
+| 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 |
+
+### Syntax
+
+- **Minor Compaction**
+
+```
+ALTER TABLE carbontable COMPACT MINOR;
+```
+- **Major Compaction**
+
+```
+ALTER TABLE carbontable COMPACT MAJOR;
+```
+
+  
+  

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/docs/dml.md
----------------------------------------------------------------------
diff --git a/content/docs/dml.md b/content/docs/dml.md
new file mode 100644
index 0000000..8ab277c
--- /dev/null
+++ b/content/docs/dml.md
@@ -0,0 +1,207 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+# DML Operations on CarbonData
+This tutorial will guide you through the data manipulation language support provided by CarbonData.
+
+## Overview 
+The following DML operations are supported in CarbonData :
+
+* [LOAD DATA](#load-data)
+* [SHOW SEGMENTS](#show-segements)
+* [DELETE SEGMENT BY ID](#delete-segment-by-id)
+* [DELETE SEGMENT BY DATE](#delete-segment-by-date)
+
+## LOAD DATA
+
+This command loads the user data in raw format to the Carbon specific data format store, this allows Carbon to provides good performance while querying the data.
+Please visit [Data Management]() for more details on LOAD.
+
+### Syntax
+
+```
+LOAD DATA [LOCAL] INPATH 'folder_path' INTO TABLE [db_name.]table_name OPTIONS(property_name=property_value, ...)
+```
+
+OPTIONS are not mandatory for data loading process. Inside OPTIONS user can provide either of any options like DELIMITER,QUOTECHAR, ESCAPECHAR,MULTILINE as per requirement.
+
+Note: The path shall be canonical path.
+
+### Parameter Description
+
+| Parameter     | Description                                                          | Optional |
+| ------------- | ---------------------------------------------------------------------| -------- |
+| folder_path   | Path of raw csv data folder or file.                                 | NO       |
+| 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       |
+| OPTIONS       | Extra options provided to Load                                       | YES      |
+ 
+
+### Usage Guideline
+
+Following are the options that can be used for loading data:
+- **DELIMITER:** Delimiters can be provided in the load command.
+    
+    ``` 
+    OPTIONS('DELIMITER'=',')
+    ```
+- **QUOTECHAR:** Quote Characters can be provided in the load command.
+
+    ```
+    OPTIONS('QUOTECHAR'='"')
+    ```
+- **COMMENTCHAR:** Comment Characters can be provided in the load command if user want to comment lines.
+
+    ```
+    OPTIONS('COMMENTCHAR'='#')
+    ```
+- **FILEHEADER:** Headers can be provided in the LOAD DATA command if headers are missing in the source files.
+
+    ```
+    OPTIONS('FILEHEADER'='column1,column2') 
+    ```
+- **MULTILINE:** CSV with new line character in quotes.
+
+    ```
+    OPTIONS('MULTILINE'='true') 
+    ```
+- **ESCAPECHAR:** Escape char can be provided if user want strict validation of escape character on CSV.
+
+    ```
+    OPTIONS('ESCAPECHAR'='\') 
+    ```
+- **COMPLEX_DELIMITER_LEVEL_1:** Split the complex type data column in a row (eg., a$b$c --> Array = {a,b,c}).
+
+    ```
+    OPTIONS('COMPLEX_DELIMITER_LEVEL_1'='$') 
+    ```
+- **COMPLEX_DELIMITER_LEVEL_2:** Split the complex type nested data column in a row. Applies level_1 delimiter & applies level_2 based on complex data type (eg., a:b$c:d --> Array> = {{a,b},{c,d}}).
+
+    ```
+    OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':') 
+    ```
+- **ALL_DICTIONARY_PATH:** All dictionary files path.
+
+    ```
+    OPTIONS('ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary')
+    ```
+- **COLUMNDICT:** Dictionary file path for specified column.
+
+    ```
+    OPTIONS('COLUMNDICT'='column1:dictionaryFilePath1, column2:dictionaryFilePath2')
+    ```
+    Note: ALL_DICTIONARY_PATH and COLUMNDICT can't be used together.
+    
+- **DATEFORMAT:** Date format for specified column.
+
+    ```
+    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. Refer to [SimpleDateFormat](http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html).
+
+
+### Example:
+
+```
+LOAD DATA local inpath '/opt/rawdata/data.csv' INTO table carbontable
+                         options('DELIMITER'=',', 'QUOTECHAR'='"', 'COMMENTCHAR'='#',
+                                 'FILEHEADER'='empno,empname,
+ designation,doj,workgroupcategory,
+ workgroupcategoryname,deptno,deptname,projectcode,
+ projectjoindate,projectenddate,attendance,utilization,salary',
+                                 'MULTILINE'='true', 'ESCAPECHAR'='\', 
+ 'COMPLEX_DELIMITER_LEVEL_1'='$', 
+                                 'COMPLEX_DELIMITER_LEVEL_2'=':',
+                                 'ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary'
+                                 )
+
+```
+
+## SHOW SEGMENTS
+
+This command is used to get the segments of carbon table.
+
+```
+SHOW SEGMENTS FOR TABLE [db_name.]table_name LIMIT number_of_segments;
+```
+
+### Parameter Description
+
+| Parameter          | Description                                                          | Optional |
+| ------------------ | ---------------------------------------------------------------------| ---------|
+| 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_segments | limit the output to this number.                                     | YES      |
+
+### Example:
+```
+SHOW SEGMENTS FOR TABLE CarbonDatabase.CarbonTable LIMIT 4;
+```
+
+## DELETE SEGMENT BY ID
+
+This command is used to delete segment by using the segment ID. Each segment has a unique segment ID associated with it. 
+Using this segment ID, you can remove the segment.
+
+The following command will get the segmentID.
+```
+SHOW SEGMENTS FOR Table dbname.tablename LIMIT number_of_segments
+```
+After you retrieve the segment ID of the segment that you want to delete, execute the following command to delete the selected segment.
+```
+DELETE SEGMENT segment_sequence_id1, segments_sequence_id2, .... FROM TABLE tableName
+```
+
+### Parameter Description
+| Parameter  | Description                                                          | Optional |
+| -----------| ---------------------------------------------------------------------|----------|
+| segment_id | Segment Id of the load.                                              | NO       |
+| 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       |
+
+### Example:
+```
+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. 
+
+## DELETE SEGMENT BY DATE
+
+This command will allow to delete the Carbon segment(s) from the store based on the date provided by the user in the DML command. 
+The segment created before the particular date will be removed from the specific stores.
+
+```
+DELETE FROM TABLE [schema_name.]table_name WHERE[DATE_FIELD]BEFORE [DATE_VALUE]
+```
+
+### Parameter Description
+
+| Parameter  | Description                                                                                        | Optional |
+| ---------- | ---------------------------------------------------------------------------------------------------| -------- |
+| DATE_VALUE | Valid segement load start time value. All the segments before this specified date will be deleted. | NO       |
+| 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       |
+
+### Example:
+
+ ```
+ DELETE SEGMENTS FROM TABLE CarbonDatabase.CarbonTable WHERE STARTTIME BEFORE '2017-06-01 12:05:06';  
+ ```
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/docs/faq.md
----------------------------------------------------------------------
diff --git a/content/docs/faq.md b/content/docs/faq.md
new file mode 100644
index 0000000..51f85bc
--- /dev/null
+++ b/content/docs/faq.md
@@ -0,0 +1,18 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/docs/index.md
----------------------------------------------------------------------
diff --git a/content/docs/index.md b/content/docs/index.md
new file mode 100644
index 0000000..eaa3376
--- /dev/null
+++ b/content/docs/index.md
@@ -0,0 +1,45 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+![CarbonData_Logo](../docs/images/format/CarbonData_logo.png?raw=true)
+# Table of Contents
+
+* [Quick Start]()
+    * [Getting started with CarbonData]()
+    * [First CarbonData Project]()
+* [User Guide]()
+    * [Overview]()
+       * [Introduction]()
+       * [Features]()
+       * [Data Types]()
+       * [Compatibility]()
+       * [Packaging and Interfaces]()
+    * [Installing CarbonData]()
+       * [Standalone Spark Cluster]()
+       * [Spark on Yarn Cluster]()
+    * [Configuring CarbonData]()
+       * [System Configuration]()
+       * [Performance Configuration]()
+       * [Spark Configuration]()
+    * [Using CarbonData]()
+       * [Data Management]()
+       * [DDL Operations]()
+       * [DML Operations]()
+* [Use Cases]()
+* [Troubleshooting]()
+* [FAQ]()
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/c2ab1f0c/content/docs/installation.md
----------------------------------------------------------------------
diff --git a/content/docs/installation.md b/content/docs/installation.md
new file mode 100644
index 0000000..492a039
--- /dev/null
+++ b/content/docs/installation.md
@@ -0,0 +1,151 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+# Installation Guide
+This tutorial will guide you through the installation and configuration of CarbonData in the following two modes :
+
+* [On Standalone Spark cluster](https://cwiki.apache.org/confluence/display/CARBONDATA/Cluster+deployment+guide)  
+* [On Spark on Yarn cluster](https://cwiki.apache.org/confluence/display/CARBONDATA/Cluster+deployment+guide)
+
+followed by :
+* [Query Execution using Carbon Thrift Server](https://cwiki.apache.org/confluence/display/CARBONDATA/Cluster+deployment+guide)
+
+## Installing and Configuring CarbonData on "Standalone Spark" Cluster
+   
+   ### Prerequisite
+   * Hadoop HDFS and Yarn should be installed and running.
+   * Spark should be installed and running in all the clients.
+   * CarbonData user should have permission to access HDFS.
+   
+   ### Procedure
+   The following steps are only for Driver Nodes.(Driver nodes are the one which starts the spark context.)
+   1. [Build the CarbonData](https://cwiki.apache.org/confluence/display/CARBONDATA/Building+CarbonData+And+IDE+Configuration) project and get the assembly jar from "./assembly/target/scala-2.10/carbondata_xxx.jar" and put in the "<SPARK_HOME>/carbonlib" folder. 
+       
+       (Note: - Create the carbonlib folder if does not exists inside "<SPARK_HOME>" path.)
+      
+   2.  carbonlib folder path must be added in Spark classpath. (Edit "<SPARK_HOME>/conf/spark-env.sh" file and modify the value of SPARK_CLASSPATH by appending "<SPARK_HOME>/carbonlib/*" to the existing value)  
+   
+   3.  Copy the carbon.properties.template to "<SPARK_HOME>/conf/carbon.properties" folder from "./conf/" of CarbonData repository.
+     
+   4.  Copy "carbonplugins" folder  to "<SPARK_HOME>/carbonlib" folder from "./processing/" folder of CarbonData repository.
+       
+        (Note: -carbonplugins will contain .kettle folder.)
+   
+   5.  In Spark node, configure the properties mentioned as the below table in "<SPARK_HOME>/conf/spark-defaults.conf" file   
+         
+| Property | Description | Value |
+|---------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------|
+| carbon.kettle.home | Path that will be used by CarbonData internally to create graph for loading the data | $SPARK_HOME /carbonlib/carbonplugins |
+| spark.driver.extraJavaOptions | A string of extra JVM options to pass to the driver. For instance, GC settings or other logging. | -Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties |
+| spark.executor.extraJavaOptions | A string of extra JVM options to pass to executors. For instance, GC settings or other logging. NOTE: You can enter multiple values separated by space. | -Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties |
+    
+   6.  Add the following properties in "<SPARK_HOME>/conf/" carbon.properties:
+ 
+| Property | Required | Description | Example | Remark |
+|----------------------|----------|----------------------------------------------------------------------------------------|-------------------------------------|---------|
+| carbon.storelocation | NO | Location where data Carbon will create the store and write the data in its own format. | hdfs://IP:PORT/Opt/CarbonStore | Propose |
+| carbon.kettle.home | YES | Path that will used by Carbon internally to create graph for loading the data. | $SPARK_HOME/carbonlib/carbonplugins |  |
+     
+   7.  Installation verification,for example:
+   ```
+   ./spark-shell --master spark://IP:PORT --total-executor-cores 2 --executor-memory 2G
+   ``` 
+ Note: Make sure that user should have permission of carbon jars and files through which driver and executor will start.
+       
+To get started with CarbonData : [Quick Start](https://cwiki.apache.org/confluence/display/CARBONDATA/Quick+Start) ,[DDL Operations](https://cwiki.apache.org/confluence/display/CARBONDATA/DDL+operations+on+CarbonData)       
+
+## Installing and Configuring Carbon on "Spark on YARN" Cluster
+   
+   This section provides the procedure to install Carbon on "Spark on YARN" cluster.
+   ### Prerequisite
+   * Hadoop HDFS and Yarn should be installed and running.
+   * Spark should be installed and running in all the clients.
+   * CarbonData user should have permission to access HDFS.
+ 
+   ### Procedure
+   1. [Build the CarbonData](https://cwiki.apache.org/confluence/display/CARBONDATA/Building+CarbonData+And+IDE+Configuration) project and get the assembly jar from "./assembly/target/scala-2.10/carbondata_xxx.jar" and put in the "<SPARK_HOME>/carbonlib" folder. 
+             
+      (Note: - Create the carbonlib folder if does not exists inside "<SPARK_HOME>" path.)
+   
+   2. Copy the carbon.properties.template to "<SPARK_HOME>/conf/carbon.properties" folder from "./conf/" of CarbonData repository.
+      carbonplugins will contain .kettle folder. 
+   
+   3. Copy the "carbon.properties.template" to "<SPARK_HOME>/conf/carbon.properties" folder from conf folder of carbondata repository.
+  
+   4. Modify the parameters in "spark-default.conf" located in the "<SPARK_HOME>/conf"      
+
+| Property | Description | Value |
+|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------|
+| spark.master | Set this value to run the Spark in yarn cluster mode. | Set "yarn-client" to run the Spark in yarn cluster mode. |
+| spark.yarn.dist.files | Comma-separated list of files to be placed in the working directory of each executor. | "<YOUR_SPARK_HOME_PATH>"/conf/carbon.properties |
+| spark.yarn.dist.archives | Comma-separated list of archives to be extracted into the working directory of each executor. | "<YOUR_SPARK_HOME_PATH>"/carbonlib/carbondata_xxx.jar |
+| spark.executor.extraJavaOptions | A string of extra JVM options to pass to executors. For instance  NOTE: You can enter multiple values separated by space. | -Dcarbon.properties.filepath=carbon.properties |
+| spark.executor.extraClassPath | Extra classpath entries to prepend to the classpath of executors. NOTE: If SPARK_CLASSPATH is defined in spark-env.sh, then comment it and append the values in below parameter spark.driver.extraClassPath | "<YOUR_SPARK_HOME_PATH>"/carbonlib/carbonlib/carbondata_xxx.jar |
+| spark.driver.extraClassPath | Extra classpath entries to prepend to the classpath of the driver. NOTE: If SPARK_CLASSPATH is defined in spark-env.sh, then comment it and append the value in below parameter spark.driver.extraClassPath. | "<YOUR_SPARK_HOME_PATH>"/carbonlib/carbonlib/carbondata_xxx.jar |
+| spark.driver.extraJavaOptions | A string of extra JVM options to pass to the driver. For instance, GC settings or other logging. | -Dcarbon.properties.filepath="<YOUR_SPARK_HOME_PATH>"/conf/carbon.properties |
+| carbon.kettle.home | Path that will used by Carbon internally to create graph for loading the data. | "<YOUR_SPARK_HOME_PATH>"/carbonlib/carbonplugins |      
+      
+   5. Add the following properties in <SPARK_HOME>/conf/ carbon.properties:
+   
+| Property | Required | Description | Example | Default Value |
+|----------------------|----------|----------------------------------------------------------------------------------------|-------------------------------------|---------------|
+| carbon.storelocation | NO | Location where data Carbon will create the store and write the data in its own format. | hdfs://IP:PORT/Opt/CarbonStore | Propose |
+| carbon.kettle.home | YES | Path that will used by Carbon internally to create graph for loading the data. | $SPARK_HOME/carbonlib/carbonplugins |  |
+   
+   6. Installation verification 
+   ```
+   ./bin/spark-shell --master yarn-client --driver-memory 1g --executor-cores 2 --executor-memory 2G 
+   ```
+   Note: Make sure that user should have permission of carbon jars and files through which driver and executor will start.
+      
+To get started with CarbonData : [Quick Start](https://cwiki.apache.org/confluence/display/CARBONDATA/Quick+Start) ,[DDL Operations](https://cwiki.apache.org/confluence/display/CARBONDATA/DDL+operations+on+CarbonData)       
+      
+## Query execution using Carbon thrift server
+
+### Start Thrift server         
+   a. cd <SPARK_HOME>
+   
+   b. Run below command to start the Carbon thrift server
+   ```
+  ./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true --class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
+   $SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path>
+   ```  
+| Parameter | Description | Example |
+|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
+| CARBON_ASSEMBLY_JAR | Carbon assembly jar name present in the ""/carbonlib/ folder. | carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar |
+| carbon_store_path | This is parameter to the CarbonThriftServer class. This a HDFS path where carbon files will be kept. Strongly Recommended to put same as carbon.storelocation parameter of carbon.proeprties. | hdfs//hacluster/user/hive/warehouse/carbon.storehdfs//10.10.10.10:54310 /user/hive/warehouse/carbon.store |
+   
+### Examples
+   1. Start with default memory and executors
+   ```
+   ./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true --class org.apache.carbondata.spark.thriftserver.CarbonThriftServer $SPARK_HOME/carbonlib/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar hdfs://hacluster/user/hive/warehouse/carbon.store
+   ```
+   2. Start with Fixed executors and resources
+   ```
+   ./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true --class org.apache.carbondata.spark.thriftserver.CarbonThriftServer --num-executors 3 --driver-memory 20g --executor-memory 250g --executor-cores 32 /srv/OSCON/BigData/HACluster/install/spark/sparkJdbc/lib/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar hdfs://hacluster/user/hive/warehouse/carbon.store
+   ```
+### Connecting to Carbon Thrift Server Using Beeline
+   
+   ```
+   cd <SPARK_HOME>
+   ./bin/beeline jdbc:hive2://<thrftserver_host>:port
+    
+   Example 
+   ./bin/beeline jdbc:hive2://10.10.10.10:10000
+   ```


Mime
View raw message