carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [01/35] incubator-carbondata-site git commit: Updated website for CarbonData release 1.0.0
Date Sat, 04 Feb 2017 02:38:00 GMT
Repository: incubator-carbondata-site
Updated Branches:
  refs/heads/asf-site 38e962ca6 -> 619aeca43


http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/main/webapp/meetup.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/meetup.html b/src/main/webapp/meetup.html
index 4c157ca..8e6c74a 100644
--- a/src/main/webapp/meetup.html
+++ b/src/main/webapp/meetup.html
@@ -1,207 +1,215 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href='images/favicon.ico' rel='shortcut icon' type='image/x-icon'>
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <title>CarbonData:Meetup</title>
-
-    <!-- Bootstrap -->
-  
-    <link rel="stylesheet" href="css/bootstrap.min.css">
-    <link href="css/style.css" rel="stylesheet">      
-    <link href="css/print.css" rel="stylesheet" >   
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-  </head>
-  <body>
-    <header>
-     <nav class="navbar navbar-default navbar-custom cd-navbar-wrapper" >
-      <div class="container">
-        <div class="navbar-header">
-          <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-toggle="collapse" class="navbar-toggle collapsed" type="button">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a href="index.html" class="logo">
-             <img src="images/CarbonDataLogo.png" alt="CarbonData logo" title="CarbocnData logo"  />      
-          </a>
-        </div>
-        <div class="navbar-collapse collapse cd_navcontnt" id="navbar">         
-           <ul class="nav navbar-nav navbar-right navlist-custom">
-              <li><a href="index.html" class="hidden-xs"><i class="fa fa-home" aria-hidden="true"></i> </a></li>
-              <li><a href="index.html" class="hidden-lg hidden-md hidden-sm">Home</a></li>
-              <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>
-                  <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://cwiki.apache.org/confluence/display/CARBONDATA/Releases"  target="_blank">Release Archive</a></li>
-                    </ul>
-                </li>
-                <li><a href="docs/latest/mainpage.html" class="">Documentation</a></li>
-                <li class="dropdown">
-                  <a href="#" class="dropdown-toggle active" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>                  
-                  <ul class="dropdown-menu">
-                    <li><a href="contributingDoc.html">Contributing to CarbonData</a></li>
-                    <li><a href="contributingDoc.html#Mailing_List">Mailing Lists</a></li>
-                    <li><a href="contributingDoc.html#Apache_Jira">Issue Tracker</a></li>
-                    <li><a href="contributingDoc.html#Committers">Project Committers</a></li>
-                    <li><a href="jenkins.html">Jenkins  for Apache CarbonData</a></li>
-                    <li><a href="meetup.html">CarbonData Meetups </a></li>
-                  </ul>
-                </li>
-                <li class="dropdown">
-                  <a href="http://www.apache.org/" class="apache_link hidden-xs dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a>
-                   <ul class="dropdown-menu">
-                      <li><a href="http://www.apache.org/"  target="_blank">Apache Homepage</a></li>
-                      <li><a href="http://www.apache.org/licenses/"  target="_blank">License</a></li>
-                      <li><a href="http://www.apache.org/foundation/sponsorship.html"  target="_blank">Sponsorship</a></li>
-                      <li><a href="http://www.apache.org/foundation/thanks.html"  target="_blank">Thanks</a></li>                      
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  <a href="http://www.apache.org/" class="hidden-lg hidden-md hidden-sm dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a>
-                   <ul class="dropdown-menu">
-                      <li><a href="http://www.apache.org/"  target="_blank">Apache Homepage</a></li>
-                      <li><a href="http://www.apache.org/licenses/"  target="_blank">License</a></li>
-                      <li><a href="http://www.apache.org/foundation/sponsorship.html"  target="_blank">Sponsorship</a></li>
-                      <li><a href="http://www.apache.org/foundation/thanks.html"  target="_blank">Thanks</a></li>                      
-                    </ul>
-                </li>
-           </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </nav>
-     </header> <!-- end Header part -->
-   
-   <div class="fixed-padding"></div> <!--  top padding with fixde header  -->
- 
-   <section style="position:relative; overflow:hidden ">
-    <div class="meetup-banber-bg">
-      <img src="images/CDbannerSliderbg.jpg" alt="CarbonData banner" />  
-    </div>
-
-    <div class="meetup-banber"> 
-        <div class="container-fluid"> 
-            <div class="col-md-12 col-sm-12">              
-                     <h1 class="title-heading">ComingUp Meetups
-                       <span class="title-underline"></span> 
-                     </h1>
-                    <p class="text-center">
-                      <span class="txt"> Venue  </span>
-                      <span class="txt"> To be Scheduled </span>
-                     </p>
-                   
-                    <!-- <p class="text-center">
-                        <a href="#" class="cominguplink"> </a>
-                     </p>-->
-            </div>
-        </div>     
-    </div>    
-   </section>
-
-   <section>
-      <div class="container-fluid"> 
-            <div class="col-md-12 col-sm-12">
-              <div class="meetup-details">
-                <h2 class="title-heading"> Premiure Events
-                  <span class="title-underline"></span> 
-                </h2>
-                <div class="meetup-info">
-                  <div class="row">                     
-                  <div class="col-md-10 col-sm-9">  
-                      <h2 class="meetup-title">Oscon - Austin TX<span class="meetup-date">May 2016</span></h2>
-                      <!--<p class="meetup-location"> </p>-->
-                      <p>The agenda for the meetup was 'Carbondata : A New Hadoop File Format for Faster Data Analysis'. It focused on the inception and introduction of CarbonData to the open source community.</p>
-                  </div>
-                  <div class="col-md-2 col-sm-3">                                           
-                    <div class="meetup-icon">
-                     <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609" target="blank">
-                            <i class="fa fa-file-pdf-o" aria-hidden="true"></i> 
-                          </a>
-                     
-                    </div>
-                  </div>
-                 </div>
-                </div>
-                <div class="meetup-info">
-                  <div class="row">                     
-                      <div class="col-md-10 col-sm-9">  
-                          <h2 class="meetup-title">Beijing<span class="meetup-date">Oct 2016</span></h2>
-                         <!--  <p class="meetup-location"> </p>-->
-                          <p>The agenda for the meetup was 'CarbonData : An Indexed Columnar File Format for Interactive query'. It detailedly introduced the  architecture and techniques of Apache CarbonData ,followed by a tutorial session and open discussion about future plans of Apache Carbondata.</p>
-                      </div>
-                      <div class="col-md-2 col-sm-3">                                           
-                        <div class="meetup-icon">
-                           <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/10.29+Beijing+Apache+CarbonData+Meetup+PPT" target="blank">
-                            <i class="fa fa-file-pdf-o" aria-hidden="true"></i> 
-                           </a>
-
-
-
-                        </div>
-                      </div>
-                 </div>
-                </div>
-              </div>
-            </div>
-      </div>
-   </section>
-  
-<!--
-  <footer>
-    <div class="topcontant">
-      <div class="container-fluid">
-          <div class="col-md-4 col-sm-4">
-            <p class="footext">
-              Apache CarbonData, CarbonData, Apache, the Apache feather logo, and the Apache CarbonData project logo are trademarks of The Apache Software Foundation
-            </p>
- 
-          </div>
-          <div class="col-md-8 col-sm-8">
-             <ul class="footer-nav">
-              <li><a href="">Site Map</a></li>
-              <li><a href="">Service</a></li>
-              <li><a href="">Contact us</a></li>
-             </ul>
-          </div>
-       </div>
-    </div>
-    <div class="bottomcontant">
-       <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="http://www.apache.org/" class="term-links">Apache Software Foundation  </a>&nbsp;&nbsp;| &nbsp;&nbsp;
-               <a href="http://www.apache.org/foundation/policies/privacy.html" class="term-links" target="blank"> Privacy Policy </a>
-            </p>
-
-          </div>
-          <div class="col-md-4 col-sm-4">
-                 <div class="social-icon">
-                  <a href="#" class="icons"><i class="fa fa-facebook" aria-hidden="true"></i></a>
-                  <a href="#" class="icons"><i class="fa fa-twitter" aria-hidden="true"></i></a>
-                  <a href="#" class="icons"><i class="fa fa-linkedin" aria-hidden="true"></i></a>
-                 </div>
-          </div>
-    </div>
-     </div>
-  </footer>  -->
-
-  <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-
-    <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/custom.js"></script>
-  </body>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href='images/favicon.ico' rel='shortcut icon' type='image/x-icon'>
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <title>CarbonData:Meetup</title>
+
+    <!-- Bootstrap -->
+  
+    <link rel="stylesheet" href="css/bootstrap.min.css">
+    <link href="css/style.css" rel="stylesheet">      
+    <link href="css/print.css" rel="stylesheet" >   
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+  </head>
+  <body>
+    <header>
+     <nav class="navbar navbar-default navbar-custom cd-navbar-wrapper" >
+      <div class="container">
+        <div class="navbar-header">
+          <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-toggle="collapse" class="navbar-toggle collapsed" type="button">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a href="index.html" class="logo">
+             <img src="images/CarbonDataLogo.png" alt="CarbonData logo" title="CarbocnData logo"  />      
+          </a>
+        </div>
+        <div class="navbar-collapse collapse cd_navcontnt" id="navbar">         
+           <ul class="nav navbar-nav navbar-right navlist-custom">
+              <li><a href="index.html" class="hidden-xs"><i class="fa fa-home" aria-hidden="true"></i> </a></li>
+              <li><a href="index.html" class="hidden-lg hidden-md hidden-sm">Home</a></li>
+              <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>
+                  <ul class="dropdown-menu">
+                      <li>
+                          <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/1.0.0-incubating"
+                             target="_blank">Apache CarbonData 1.0.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>
+                      <li>
+                          <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Releases"
+                             target="_blank">Release Archive</a></li>
+                  </ul>
+                </li>
+                <li><a href="docs/latest/mainpage.html?page=userguide" class="">Documentation</a></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="https://cwiki.apache.org/confluence/display/CARBONDATA/Committers" target="_blank">Project Committers</a></li>
+                       <li><a href="meetup.html">CarbonData Meetups </a></li>
+                   </ul>
+               </li>
+                <li class="dropdown">
+                  <a href="http://www.apache.org/" class="apache_link hidden-xs dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a>
+                   <ul class="dropdown-menu">
+                      <li><a href="http://www.apache.org/"  target="_blank">Apache Homepage</a></li>
+                      <li><a href="http://www.apache.org/licenses/"  target="_blank">License</a></li>
+                      <li><a href="http://www.apache.org/foundation/sponsorship.html"  target="_blank">Sponsorship</a></li>
+                      <li><a href="http://www.apache.org/foundation/thanks.html"  target="_blank">Thanks</a></li>                      
+                    </ul>
+                </li>
+                <li class="dropdown">
+                  <a href="http://www.apache.org/" class="hidden-lg hidden-md hidden-sm dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a>
+                   <ul class="dropdown-menu">
+                      <li><a href="http://www.apache.org/"  target="_blank">Apache Homepage</a></li>
+                      <li><a href="http://www.apache.org/licenses/"  target="_blank">License</a></li>
+                      <li><a href="http://www.apache.org/foundation/sponsorship.html"  target="_blank">Sponsorship</a></li>
+                      <li><a href="http://www.apache.org/foundation/thanks.html"  target="_blank">Thanks</a></li>                      
+                    </ul>
+                </li>
+           </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </nav>
+     </header> <!-- end Header part -->
+   
+   <div class="fixed-padding"></div> <!--  top padding with fixde header  -->
+ 
+   <section style="position:relative; overflow:hidden ">
+    <div class="meetup-banber-bg">
+      <img src="images/CDbannerSliderbg.jpg" alt="CarbonData banner" />  
+    </div>
+
+    <div class="meetup-banber"> 
+        <div class="container-fluid"> 
+            <div class="col-md-12 col-sm-12">              
+                     <h1 class="title-heading">ComingUp Meetups
+                       <span class="title-underline"></span> 
+                     </h1>
+                    <p class="text-center">
+                      <span class="txt"> Venue  </span>
+                      <span class="txt"> To be Scheduled </span>
+                     </p>
+                   
+                    <!-- <p class="text-center">
+                        <a href="#" class="cominguplink"> </a>
+                     </p>-->
+            </div>
+        </div>     
+    </div>    
+   </section>
+
+   <section>
+      <div class="container-fluid"> 
+            <div class="col-md-12 col-sm-12">
+              <div class="meetup-details">
+                <h2 class="title-heading"> Premiure Events
+                  <span class="title-underline"></span> 
+                </h2>
+                <div class="meetup-info">
+                  <div class="row">                     
+                  <div class="col-md-10 col-sm-9">  
+                      <h2 class="meetup-title">Oscon - Austin TX<span class="meetup-date">May 2016</span></h2>
+                      <!--<p class="meetup-location"> </p>-->
+                      <p>The agenda for the meetup was 'Carbondata : A New Hadoop File Format for Faster Data Analysis'. It focused on the inception and introduction of CarbonData to the open source community.</p>
+                  </div>
+                  <div class="col-md-2 col-sm-3">                                           
+                    <div class="meetup-icon">
+                     <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609" target="blank">
+                            <i class="fa fa-file-pdf-o" aria-hidden="true"></i> 
+                          </a>
+                     
+                    </div>
+                  </div>
+                 </div>
+                </div>
+                <div class="meetup-info">
+                  <div class="row">                     
+                      <div class="col-md-10 col-sm-9">  
+                          <h2 class="meetup-title">Beijing<span class="meetup-date">Oct 2016</span></h2>
+                         <!--  <p class="meetup-location"> </p>-->
+                          <p>The agenda for the meetup was 'CarbonData : An Indexed Columnar File Format for Interactive query'. It detailedly introduced the  architecture and techniques of Apache CarbonData ,followed by a tutorial session and open discussion about future plans of Apache Carbondata.</p>
+                      </div>
+                      <div class="col-md-2 col-sm-3">                                           
+                        <div class="meetup-icon">
+                           <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/10.29+Beijing+Apache+CarbonData+Meetup+PPT" target="blank">
+                            <i class="fa fa-file-pdf-o" aria-hidden="true"></i> 
+                           </a>
+
+
+
+                        </div>
+                      </div>
+                 </div>
+                </div>
+              </div>
+            </div>
+      </div>
+   </section>
+  
+<!--
+  <footer>
+    <div class="topcontant">
+      <div class="container-fluid">
+          <div class="col-md-4 col-sm-4">
+            <p class="footext">
+              Apache CarbonData, CarbonData, Apache, the Apache feather logo, and the Apache CarbonData project logo are trademarks of The Apache Software Foundation
+            </p>
+ 
+          </div>
+          <div class="col-md-8 col-sm-8">
+             <ul class="footer-nav">
+              <li><a href="">Site Map</a></li>
+              <li><a href="">Service</a></li>
+              <li><a href="">Contact us</a></li>
+             </ul>
+          </div>
+       </div>
+    </div>
+    <div class="bottomcontant">
+       <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="http://www.apache.org/" class="term-links">Apache Software Foundation  </a>&nbsp;&nbsp;| &nbsp;&nbsp;
+               <a href="http://www.apache.org/foundation/policies/privacy.html" class="term-links" target="blank"> Privacy Policy </a>
+            </p>
+
+          </div>
+          <div class="col-md-4 col-sm-4">
+                 <div class="social-icon">
+                  <a href="#" class="icons"><i class="fa fa-facebook" aria-hidden="true"></i></a>
+                  <a href="#" class="icons"><i class="fa fa-twitter" aria-hidden="true"></i></a>
+                  <a href="#" class="icons"><i class="fa fa-linkedin" aria-hidden="true"></i></a>
+                 </div>
+          </div>
+    </div>
+     </div>
+  </footer>  -->
+
+  <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+
+    <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/custom.js"></script>
+  </body>
   </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/configuration-parameters.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/configuration-parameters.md b/src/site/markdown/configuration-parameters.md
index bc6919a..71fddf7 100644
--- a/src/site/markdown/configuration-parameters.md
+++ b/src/site/markdown/configuration-parameters.md
@@ -34,10 +34,10 @@ This section provides the details of all the configurations required for the Car
 | Property | Default Value | Description |
 |----------------------------|-------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | carbon.storelocation | /user/hive/warehouse/carbon.store | Location where CarbonData 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.ddl.base.hdfs.url | hdfs://hacluster/opt/data | This property is used to configure the HDFS relative path, 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 CarbonData internally to create graph for loading the data. |
-| carbon.data.file.version | 2 | If this parameter value is set to 1, then CarbonData will support the data load which is in old format. If the value is set to 2, then CarbonData will support the data load of new format only. NOTE: The file format created before DataSight Spark V100R002C30 is considered as old format. |                    
+| carbon.kettle.home | $SPARK_HOME/carbonlib/carbonplugins | Configuration for loading the data with kettle. |
+| carbon.data.file.version | 2 | If this parameter value is set to 1, then CarbonData will support the data load which is in old format(0.x version). If the value is set to 2(1.x onwards version), then CarbonData will support the data load of new format only. |
 
 ##  Performance Configuration
 This section provides the details of all the configurations required for CarbonData Performance Optimization.
@@ -132,7 +132,7 @@ This section provides the details of all the configurations required for CarbonD
 | 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.cardinality. The minimum value is 10000. |
+| high.cardinality.threshold | 1000000 | It is a threshold to identify high cardinality of the columns.If the value of columns' cardinality > the configured value, then the columns are excluded from dictionary encoding. |
 | 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 CarbonData 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. |
@@ -140,10 +140,9 @@ This section provides the details of all the configurations required for CarbonD
 ##  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. |
-   
+| Parameter 	| Default Value 	| Description 	|
+|----------------------------------------	|--------------------------------------------------------	|----------------------------------------------------------------------	|
+| spark.driver.memory 	| 1g 	| Amount of memory to be used for the driver process. 	|
+| spark.executor.memory 	| 1g 	| Amount of memory to be used 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/0d4cdb1c/src/site/markdown/data-management.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/data-management.md b/src/site/markdown/data-management.md
old mode 100644
new mode 100755
index 70f4d28..2663aff
--- a/src/site/markdown/data-management.md
+++ b/src/site/markdown/data-management.md
@@ -73,7 +73,7 @@ This tutorial is going to introduce you to the conceptual details of data manage
    
    * Delete by Segment ID
       
-      After you get the segment ID of the segment that you want to delete, execute the [DELETE](dml-operation-on-carbondata.md ) command for the selected segment.
+      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        |

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/ddl-operation-on-carbondata.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/ddl-operation-on-carbondata.md b/src/site/markdown/ddl-operation-on-carbondata.md
index d261963..ec3008b 100644
--- a/src/site/markdown/ddl-operation-on-carbondata.md
+++ b/src/site/markdown/ddl-operation-on-carbondata.md
@@ -27,13 +27,14 @@ The following DDL operations are supported in CarbonData :
 * [SHOW TABLE](#show-table)
 * [DROP TABLE](#drop-table)
 * [COMPACTION](#compaction)
+* [BUCKETING](#bucketing)
 
 ## CREATE TABLE
   This command can be used to create a CarbonData 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 , ...)]               
+                    [(col_name data_type, ...)]
    STORED BY 'carbondata'
    [TBLPROPERTIES (property_name=property_value, ...)]
    // All Carbon's additional table options will go into properties
@@ -70,14 +71,14 @@ The following DDL operations are supported in CarbonData :
        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.
      
 ```
-TBLPROPERTIES ("COLUMN_GROUPS"="(column1,column3),
+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 1024 MB and supports a range of 1 MB to 2048 MB.
-     If you do not specify this value in the DDL command , default value is used. 
+     If you do not specify this value in the DDL command, default value is used.
      
 ```
        TBLPROPERTIES ("TABLE_BLOCKSIZE"="512 MB")
@@ -91,7 +92,7 @@ TBLPROPERTIES ("COLUMN_GROUPS"="(column1,column3),
       By default inverted index is enabled. The user can disable the inverted index creation for some columns.
      
 ```
-       TBLPROPERTIES ("NO_INVERTED_INDEX"="column1,column3")
+       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.
@@ -189,5 +190,60 @@ ALTER TABLE table_name COMPACT 'MINOR';
 ALTER TABLE table_name COMPACT 'MAJOR';
 ```
 
+
+## BUCKETING
+
+Bucketing feature can be used to distribute/organize the table/partition data into multiple files such
+that similar records are present in the same file. While creating a table, a user needs to specify the
+columns to be used for bucketing and the number of buckets. For the selction of bucket the Hash value
+of columns is used.
+
+```
+   CREATE TABLE [IF NOT EXISTS] [db_name.]table_name
+                    [(col_name data_type, ...)]
+   STORED BY 'carbondata'
+   TBLPROPERTIES(“BUCKETNUMBER”=”noOfBuckets”,
+   “BUCKETCOLUMNS”=’’columnname”, “TABLENAME”=”tablename”)
+
+```
   
-  
+## Parameter Description
+
+| Parameter 	| Description 	| Optional 	|
+|---------------	|------------------------------------------------------------------------------------------------------------------------------	|----------	|
+| BUCKETNUMBER 	| Specifies the number of Buckets to be created. 	| No 	|
+| BUCKETCOLUMNS 	| Specify the columns to be considered for Bucketing  	| No 	|
+| TABLENAME 	| The name of the table in Database. Table Name should consist of alphanumeric characters and underscore(_) special character. 	| Yes 	|
+
+## Usage Guidelines
+
+- The feature is supported for Spark 1.6.2 onwards, but the performance optimization is evident from Spark 2.1 onwards.
+
+- Bucketing can not be performed for columns of Complex Data Types.
+
+- Columns in the BUCKETCOLUMN parameter must be either a dimension or a measure but combination of both is not supported.
+
+
+## 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',
+                  'BUCKETNUMBER'='4',
+                  'BUCKETCOLUMNS'='productNumber,saleQuantity',
+                  'TABLENAME'='productSalesTable')
+
+  ```
+

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/dml-operation-on-carbondata.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/dml-operation-on-carbondata.md b/src/site/markdown/dml-operation-on-carbondata.md
index 0523d95..6fdfcde 100644
--- a/src/site/markdown/dml-operation-on-carbondata.md
+++ b/src/site/markdown/dml-operation-on-carbondata.md
@@ -87,7 +87,7 @@ You can use the following options to load data:
     ```
 
 - **MULTILINE:** CSV with new line character in quotes.
-
+5
     ```
     OPTIONS('MULTILINE'='true') 
     ```
@@ -123,7 +123,7 @@ You can use the following options to load data:
     column2:dictionaryFilePath2')
     ```
 
-    NOTE: ALL_DICTIONARY_PATH and COLUMNDICT can't be used together.
+    NOTE: ALL_DICTIONARY_PATH and COLUMNDICT can not be used together.
     
 - **DATEFORMAT:** Date format for specified column.
 
@@ -133,6 +133,28 @@ You can use the following options to load data:
 
     NOTE: Date formats are specified by date pattern strings. The date pattern letters in CarbonData are same as in JAVA. Refer to [SimpleDateFormat](http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html).
 
+- **USE_KETTLE:** This option is used to specify whether to use kettle for loading data or not. By default kettle is not used for data loading.
+
+    ```
+    OPTIONS('USE_KETTLE'='FALSE')
+    ```
+
+   Note :  It is recommended to set the value for this option as false.
+
+- **SINGLE_PASS:** Single Pass Loading enables single job to finish data loading with dictionary generation on the fly. It enhances performance
+   in the scenarios where the subsequent data loading after initial load involves fewer incremental updates on the dictionary.
+
+   This option specifies whether to use single pass for loading data or not. By default this option is set to FALSE.
+
+    ```
+    OPTIONS('SINGLE_PASS'='TRUE')
+    ```
+
+   Note :
+
+   * If this option is set to TRUE then data loading will take less time.
+
+   * If this option is set to some invalid value other than TRUE or FALSE then it uses the default value.
 
 ### Example:
 
@@ -144,7 +166,9 @@ options('DELIMITER'=',', 'QUOTECHAR'='"','COMMENTCHAR'='#',
  projectjoindate,projectenddate,attendance,utilization,salary',
 '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',
+'USE_KETTLE'='FALSE',
+'SINGLE_PASS'='TRUE'
 )
 ```
 
@@ -198,7 +222,7 @@ By default the above configuration will be false.
 
 ### Examples
 ```
-INSERT INTO table1 SELECT item1 ,sum(item2 + 1000) as result FROM 
+INSERT INTO table1 SELECT item1, sum(item2 + 1000) as result FROM
 table2 group by item1;
 ```
 
@@ -304,7 +328,7 @@ This command will allow to update the carbon table based on the column expressio
 ```
  UPDATE <table_name>
  SET (column_name1, column_name2, ... column_name n) =
- (column1_expression , column2_expression . .. column n_expression )
+ (column1_expression, column2_expression . .. column n_expression )
  [ WHERE { <filter_condition> } ];
 ```
 
@@ -352,7 +376,7 @@ Here the Update Operation fails as the query contains aggregate function sum(b.p
 
 ```
 UPDATE carbonTable1 d
-SET(d.column3,d.column5 ) = (SELECT s.c33 ,s.c55
+SET(d.column3,d.column5 ) = (SELECT s.c33, s.c55
 FROM sourceTable1 s WHERE d.column1 = s.c11)
 WHERE d.column1 = 'china' EXISTS( SELECT * from table3 o where o.c2 > 1);
 ```
@@ -366,7 +390,7 @@ WHERE exists( select * from iud.other o where o.c2 > 1);
 
 
 ```
-UPDATE carbonTable1 SET (c2, c5 ) = (c2 + 1, concat(c5 , "y" ));
+UPDATE carbonTable1 SET (c2, c5 ) = (c2 + 1, concat(c5, "y" ));
 ```
 
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/faq.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/faq.md b/src/site/markdown/faq.md
old mode 100644
new mode 100755
index a72a96f..c7956db
--- a/src/site/markdown/faq.md
+++ b/src/site/markdown/faq.md
@@ -40,8 +40,10 @@
     
 * **Did anyone try to run CarbonData on windows? Is it supported on Windows?**
     
-    We may provide support for windows in future. You are welcome to contribute if you want to add the support :) 
+    We may provide support for windows in future. You are welcome to contribute if you want to add the support :)
+
+* **Can we execute Concurrent Operations(Load,Insert,Update) on table by multiple workers.**
    
-    
+    Concurrency is not supported in current release of CarbonData.
     
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/file-structure-of-carbondata.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/file-structure-of-carbondata.md b/src/site/markdown/file-structure-of-carbondata.md
new file mode 100644
index 0000000..482c57c
--- /dev/null
+++ b/src/site/markdown/file-structure-of-carbondata.md
@@ -0,0 +1,17 @@
+#  CarbonData File Structure
+
+CarbonData files contain groups of data called blocklets, along with all required information like schema, offsets and indices etc, in a file footer, co-located in HDFS.
+
+The file footer can be read once to build the indices in memory, which can be utilized for optimizing the scans and processing for all subsequent queries.
+
+Each blocklet in the file is further divided into chunks of data called data chunks. Each data chunk is organized either in columnar format or row format, and stores the data of either a single column or a set of columns. All blocklets in a file contain the same number and type of data chunks.
+
+![CarbonData File Structure](../../../src/site/markdown/images/carbon_data_file_structure_new.png?raw=true)
+
+Each data chunk contains multiple groups of data called as pages. There are three types of pages.
+
+* Data Page: Contains the encoded data of a column/group of columns.
+* Row ID Page (optional): Contains the row ID mappings used when the data page is stored as an inverted index.
+* RLE Page (optional): Contains additional metadata used when the data page is RLE coded.
+
+![CarbonData File Format](../../../src/site/markdown/images/carbon_data_format_new.png?raw=true)

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/images/CarbonData_logo.png
----------------------------------------------------------------------
diff --git a/src/site/markdown/images/CarbonData_logo.png b/src/site/markdown/images/CarbonData_logo.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/images/carbon_data_file_structure_new.png
----------------------------------------------------------------------
diff --git a/src/site/markdown/images/carbon_data_file_structure_new.png b/src/site/markdown/images/carbon_data_file_structure_new.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/images/carbon_data_format_new.png
----------------------------------------------------------------------
diff --git a/src/site/markdown/images/carbon_data_format_new.png b/src/site/markdown/images/carbon_data_format_new.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/images/carbon_data_full_scan.png
----------------------------------------------------------------------
diff --git a/src/site/markdown/images/carbon_data_full_scan.png b/src/site/markdown/images/carbon_data_full_scan.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/images/carbon_data_motivation.png
----------------------------------------------------------------------
diff --git a/src/site/markdown/images/carbon_data_motivation.png b/src/site/markdown/images/carbon_data_motivation.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/images/carbon_data_olap_scan.png
----------------------------------------------------------------------
diff --git a/src/site/markdown/images/carbon_data_olap_scan.png b/src/site/markdown/images/carbon_data_olap_scan.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/images/carbon_data_random_scan.png
----------------------------------------------------------------------
diff --git a/src/site/markdown/images/carbon_data_random_scan.png b/src/site/markdown/images/carbon_data_random_scan.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/installation-guide.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/installation-guide.md b/src/site/markdown/installation-guide.md
index 4d38f2f..c2194ac 100644
--- a/src/site/markdown/installation-guide.md
+++ b/src/site/markdown/installation-guide.md
@@ -77,7 +77,7 @@ followed by :
 
 NOTE: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.
 
-To get started with CarbonData : [Quick Start](quick-start-guide.md) , [DDL Operations on CarbonData](ddl-operation-on-carbondata.md)
+To get started with CarbonData : [Quick Start](quick-start-guide.md), [DDL Operations on CarbonData](ddl-operation-on-carbondata.md)
 
 ## Installing and Configuring CarbonData on "Spark on YARN" Cluster
 
@@ -129,7 +129,7 @@ To get started with CarbonData : [Quick Start](quick-start-guide.md) , [DDL Oper
 ```
   NOTE: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.
 
-  Getting started with CarbonData : [Quick Start](quick-start-guide.md) , [DDL Operations on CarbonData](ddl-operation-on-carbondata.md)
+  Getting started with CarbonData : [Quick Start](quick-start-guide.md), [DDL Operations on CarbonData](ddl-operation-on-carbondata.md)
 
 ## Query Execution Using CarbonData Thrift Server
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/overview-of-carbondata.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/overview-of-carbondata.md b/src/site/markdown/overview-of-carbondata.md
index 5e983cb..33f6de2 100644
--- a/src/site/markdown/overview-of-carbondata.md
+++ b/src/site/markdown/overview-of-carbondata.md
@@ -20,10 +20,7 @@
 This tutorial provides a detailed overview about :
 
 * [Introduction](#introduction)
-* [CarbonData File Structure](#carbondata-file-structure)
 * [Features](#features)
-* [Data Types](#data-types)
-* [Interfaces](#interfaces)
 
 ##  Introduction
 
@@ -38,24 +35,6 @@ Some of the salient features of CarbonData are :
 * Space efficiency.
 * General format available on Hadoop-ecosystem.
 
-##  CarbonData File Structure
-
-CarbonData files contain groups of data called blocklets, along with all required information like schema, offsets and indices etc, in a file footer, co-located in HDFS.
-
-The file footer can be read once to build the indices in memory, which can be utilized for optimizing the scans and processing for all subsequent queries.
-
-Each blocklet in the file is further divided into chunks of data called data chunks. Each data chunk is organized either in columnar format or row format, and stores the data of either a single column or a set of columns. All blocklets in a file contain the same number and type of data chunks.
-
-![CarbonData File Structure](../../../src/site/markdown/images/carbon_data_file_structure_new.png?raw=true)
-
-Each data chunk contains multiple groups of data called as pages. There are three types of pages.
-
-* Data Page: Contains the encoded data of a column/group of columns.
-* Row ID Page (optional): Contains the row ID mappings used when the data page is stored as an inverted index.
-* RLE Page (optional): Contains additional metadata used when the data page is RLE coded.
-
-![CarbonData File Format](../../../src/site/markdown/images/carbon_data_format_new.png?raw=true)
-
 ##  Features
 
 CarbonData file format is a columnar store in HDFS. It has many features that a modern columnar format has, such as splittable, compression schema, complex data type etc and CarbonData has following unique features:
@@ -66,17 +45,19 @@ CarbonData file format is a columnar store in HDFS. It has many features that a
 
 * Multi Level Indexing: CarbonData uses multiple indices at various levels to enable faster search and speed up query processing.
 
-* Global Multi Dimensional Keys(MDK) based B+Tree Index for all non- measure columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
+* Dictionary Encoding: Most databases and big data SQL data stores employ columnar encoding to achieve data compression by storing small integers numbers (surrogate value) instead of full string values. However, almost all existing databases and data stores divide the data into row groups containing anywhere from few thousand to a million rows and employ dictionary encoding only within each row group. Hence, the same column value can have different surrogate values in different row groups. So, while reading the data, conversion from surrogate value to actual value needs to be done immediately after the data is read from the disk. But CarbonData employs global surrogate key which means that a common dictionary is maintained for the full store on one machine/node. So CarbonData can perform all the query processing work such as grouping/aggregation, sorting etc on light weight surrogate values. The conversion from surrogate to actual values needs to be done only on the final result. Th
 is procedure improves performance on two aspects.	Conversion from surrogate values to actual values is done only for the final result rows which are much less than the actual rows read from the store. All query processing and computation such as grouping/aggregation, sorting, and so on is done on lightweight surrogate values which requires less memory and CPU time compared to actual values.
 
-* Min-Max Index for all columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
+* Deep Spark Integration: It has built-in spark integration for Spark 1.6.2, 2.1 and interfaces for Spark SQL, DataFrame API and query optimization. It supports bulk data ingestion and allows saving of spark dataframes as CarbonData files.
 
-* Data Block level Inverted Index for all columns: Aids in quickly locating the rows that contain the data matching search/filter criteria within a row group(Data Blocks).
+* Update Delete Support: It supports batch updates like daily update scenarios for OLAP and Base+Delta file based design.
 
-* Dictionary Encoding: Most databases and big data SQL data stores employ columnar encoding to achieve data compression by storing small integers numbers (surrogate value) instead of full string values. However, almost all existing databases and data stores divide the data into row groups containing anywhere from few thousand to a million rows and employ dictionary encoding only within each row group. Hence, the same column value can have different surrogate values in different row groups. So, while reading the data, conversion from surrogate value to actual value needs to be done immediately after the data is read from the disk. But CarbonData employs global surrogate key which means that a common dictionary is maintained for the full store on one machine/node. So CarbonData can perform all the query processing work such as grouping/aggregation, sorting etc on light weight surrogate values. The conversion from surrogate to actual values needs to be done only on the final result. Th
 is procedure improves performance on two aspects.	Conversion from surrogate values to actual values is done only for the final result rows which are much less than the actual rows read from the store. All query processing and computation such as grouping/aggregation, sorting, and so on is done on lightweight surrogate values which requires less memory and CPU time compared to actual values.
+* Bucketing :  It is a technique that is used for uniform distribution of data across files in CarbonData. It enhances the performance of join queries. While loading the data, records are placed into buckets based on hashing algorithm. During the execution of join queries the records can be fetched from buckets with out need of shuffling.This feature is used to distribute/organize the table/partition data into multiple files placing similar records in same file.
 
-* Deep Spark Integration: It has built-in spark integration for Spark 1.5, 1.6 and interfaces for Spark SQL, DataFrame API and query optimization. It supports bulk data ingestion and allows saving of spark dataframes as CarbonData files.
+* Global Multi Dimensional Keys(MDK) based B+Tree Index for all non- measure columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
 
-* Update Delete Support: It supports batch updates like daily update scenarios for OLAP and Base+Delta file based design.
+* Min-Max Index for all columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
+
+* Data Block level Inverted Index for all columns: Aids in quickly locating the rows that contain the data matching search/filter criteria within a row group(Data Blocks).
 
 * Store data along with index: Significantly accelerates query performance and reduces the I/O scans and CPU resources, when there are filters in the query. CarbonData index consists of multiple levels of indices. A processing framework can leverage this index to reduce the task it needs to schedule and process. It can also do skip scan in more finer grain units (called blocklet) in task side scanning instead of scanning the whole file.
 
@@ -86,93 +67,3 @@ CarbonData file format is a columnar store in HDFS. It has many features that a
 
 * Support for various use cases with one single Data format: Examples are interactive OLAP-style query, Sequential Access (big scan) and Random Access (narrow scan).
 
-##  Data Types
-
-#### CarbonData supports the following data types:
-
-  * Numeric Types
-  * SMALLINT
-  * INT/INTEGER
-  * BIGINT
-  * DOUBLE
-  * DECIMAL
-
-  * Date/Time Types
-  * TIMESTAMP
-
-  * String Types
-  * STRING
-
-  * Complex Types
-    * arrays: ARRAY``<data_type>``
-    * structs: STRUCT``<col_name : data_type COMMENT col_comment, ...>``
-
-##  Interfaces
-
-####  API
-CarbonData can be used in following scenarios:
-
-* For MapReduce application user
-
-   This User API is provided by carbon-hadoop. In this scenario, user can process CarbonData files in his MapReduce application by choosing CarbonInput/OutputFormat, and is responsible for using it correctly. Currently only CarbonInputFormat is provided and OutputFormat will be provided soon.
-
-* For Spark user
-
-   This User API is provided by Spark itself. There are two levels of APIs
-
-   * **CarbonData File**
-
-      Similar to parquet, json, or other data source in Spark, CarbonData can be used with data source API. For example (please refer to DataFrameAPIExample for more detail):
-      
-```
-      // User can create a DataFrame from any data source 
-      // or transformation.
-      val df = ...
-
-      // Write data
-      // User can write a DataFrame to a CarbonData file
-      df.write
-      .format("carbondata")
-      .option("tableName", "carbontable")
-      .mode(SaveMode.Overwrite)
-      .save()
-
-
-      // read CarbonData by data source API
-      df = carbonContext.read
-      .format("carbondata")
-      .option("tableName", "carbontable")
-      .load("/path")
-
-      // User can then use DataFrame for analysis
-      df.count
-      SVMWithSGD.train(df, numIterations)
-
-      // User can also register the DataFrame with a table name, 
-      // and use SQL for analysis
-      df.registerTempTable("t1")  // register temporary table 
-                                  // in SparkSQL catalog
-      df.registerHiveTable("t2")  // Or, use a implicit funtion 
-                                  // to register to Hive metastore
-      sqlContext.sql("select count(*) from t1").show
-```
-
-   * **Managed CarbonData Table**
-
-      CarbonData has in built support for high level concept like Table, Database, and supports full data lifecycle management, instead of dealing with just files user can use CarbonData specific DDL to manipulate data in Table and Database level. Please refer [DDL](https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DDL) and [DML](https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DML).
-      
-```
-      // Use SQL to manage table and query data
-      create database db1;
-      use database db1;
-      show databases;
-      create table tbl1 using org.apache.carbondata.spark;
-      load data into table tlb1 path 'some_files';
-      select count(*) from tbl1;
-```
-
-*   For developer who want to integrate CarbonData into processing engines like spark, hive or flink, use API provided by carbon-hadoop and carbon-processing:
-       - **Query** : Integrate carbon-hadoop with engine specific API, like spark data source API.
-
-       - **Data life cycle management** : CarbonData provides utility functions in carbon-processing to manage data life cycle, like data loading, compact, retention, schema evolution. Developer can implement DDLs of their choice and leverage these utility function to do data life cycle management.
-

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/quick-start-guide.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/quick-start-guide.md b/src/site/markdown/quick-start-guide.md
index 50582d1..d98ad39 100644
--- a/src/site/markdown/quick-start-guide.md
+++ b/src/site/markdown/quick-start-guide.md
@@ -20,48 +20,21 @@
 # Quick Start
 This tutorial provides a quick introduction to using CarbonData.
 
-## Getting started with Apache CarbonData
-
-* [Installation](#installation)
-* [Prerequisites](#prerequisites)
-* [Interactive Analysis with Spark Shell Version 2.1](#interactive-analysis-with-spark-shell)
-  - Basics
-  - Executing Queries
-      * Creating a Table
-      * Loading Data to a Table
-      * Query Data from a Table
-* Interactive Analysis with Spark Shell Version 1.6
-   - Basics
-   - Executing Queries
-     * Creating a Table
-     * Loading Data to a Table
-     * Query Data from a Table
-* [Building CarbonData](#building-carbondata)
-
-
-##  Installation
-* Download a released package of [Spark 1.6.2 or 2.1.0](http://spark.apache.org/downloads.html).
-* Download and install [Apache Thrift 0.9.3](http://thrift-tutorial.readthedocs.io/en/latest/installation.html), make sure Thrift is added to system path.
-* Download [Apache CarbonData code](https://github.com/apache/incubator-carbondata) and build it. Please visit [Building CarbonData And IDE Configuration](https://cwiki.apache.org/confluence/display/CARBONDATA/Building+CarbonData+And+IDE+Configuration) for more information.
-
 ##  Prerequisites
-
+* [Installation and building CarbonData](https://github.com/apache/incubator-carbondata/blob/master/build).
 * Create a sample.csv file using the following commands. The CSV file is required for loading data into CarbonData.
 
 ```
-$ cd carbondata
-$ cat > sample.csv << EOF
-  id,name,city,age
-  1,david,shenzhen,31
-  2,eason,shenzhen,27
-  3,jarry,wuhan,35
-  EOF
+cd carbondata
+cat > sample.csv << EOF
+id,name,city,age
+1,david,shenzhen,31
+2,eason,shenzhen,27
+3,jarry,wuhan,35
+EOF
 ```
 
-
-## Interactive Analysis with Spark Shell
-
-## Version 2.1
+## Interactive Analysis with Spark Shell Version 2.1
 
 Apache Spark Shell provides a simple way to learn the API, as well as a powerful tool to analyze data interactively. Please visit [Apache Spark Documentation](http://spark.apache.org/docs/latest/) for more details on Spark shell.
 
@@ -70,7 +43,7 @@ Apache Spark Shell provides a simple way to learn the API, as well as a powerful
 Start Spark shell by running the following command in the Spark directory:
 
 ```
-./bin/spark-shell --jars <carbondata jar path>
+./bin/spark-shell --jars <carbondata assembly jar path>
 ```
 
 In this shell, SparkSession is readily available as 'spark' and Spark context is readily available as 'sc'.
@@ -87,9 +60,10 @@ import org.apache.spark.sql.CarbonSession._
 * Create a CarbonSession :
 
 ```
-val carbon = SparkSession.builder()
-             .config(sc.getConf)
-             .getOrCreateCarbonSession()
+val carbon = SparkSession
+            .builder()
+            .config(sc.getConf)
+            .getOrCreateCarbonSession()
 ```
 
 #### Executing Queries
@@ -97,39 +71,35 @@ val carbon = SparkSession.builder()
 ##### Creating a Table
 
 ```
-scala>carbon.sql("create table if not exists test_table
-                (id string, name string, city string, age Int)
-                STORED BY 'carbondata'")
+scala>carbon.sql("CREATE TABLE IF NOT EXISTS test_table
+     (id string, name string, city string, age Int)
+     STORED BY 'carbondata'")
 ```
 
 ##### Loading Data to a Table
 
 ```
-scala>carbon.sql(s"load data inpath
-'${new java.io.File("../carbondata/sample.csv").getCanonicalPath}'
-into table test_table")
+scala>carbon.sql("LOAD DATA INPATH 'sample.csv file path' INTO TABLE test_table")
 ```
+NOTE:Please provide the real file path of sample.csv for the above script.
 
 ###### Query Data from a Table
 
 ```
-scala>spark.sql("select * from test_table").show
+scala>carbon.sql("SELECT * FROM test_table").show()
 
-scala>spark.sql("select city, avg(age),
-sum(age) from test_table group by city").show
+scala>carbon.sql("SELECT city, avg(age), sum(age)
+      FROM test_table GROUP BY city").show()
 ```
 
-
-## Interactive Analysis with Spark Shell
-## Version 1.6
-
+## Interactive Analysis with Spark Shell Version 1.6
 
 #### Basics
 
 Start Spark shell by running the following command in the Spark directory:
 
 ```
-./bin/spark-shell --jars <carbondata jar path>
+./bin/spark-shell --jars <carbondata assembly jar path>
 ```
 
 NOTE: In this shell, SparkContext is readily available as sc.
@@ -153,34 +123,28 @@ NOTE: By default store location is pointed to "../carbon.store", user can provid
 ##### Creating a Table
 
 ```
-scala>cc.sql("create table if not exists test_table
-(id string, name string, city string, age Int) STORED BY 'carbondata'")
+scala>cc.sql("CREATE TABLE IF NOT EXISTS test_table
+     (id string, name string, city string, age Int)
+     STORED BY 'carbondata'")
 ```
 To see the table created :
 
 ```
-scala>cc.sql("show tables").show
+scala>cc.sql("SHOW TABLES").show()
 ```
 
 ##### Loading Data to a Table
 
 ```
-scala>cc.sql(s"load data inpath
-'${new java.io.File("../carbondata/sample.csv").getCanonicalPath}'
-into table test_table")
+scala>cc.sql("LOAD DATA INPATH 'sample.csv file path'
+      INTO TABLE test_table")
 ```
+NOTE:Please provide the real file path of sample.csv for the above script.
 
 ##### Query Data from a Table
 
 ```
-scala>cc.sql("select * from test_table").show
-scala>cc.sql("select city, avg(age), sum(age)
-from test_table group by city").show
-```
-
-## Building CarbonData
-
-To get started, get CarbonData from the [downloads](http://carbondata.incubator.apache.org/) section on the [http://carbondata.incubator.apache.org.](http://carbondata.incubator.apache.org.)
-CarbonData uses Hadoop’s client libraries for HDFS and YARN and Spark's libraries. Downloads are pre-packaged for a handful of popular Spark versions.
-
-If you’d like to build CarbonData from source, visit [Building CarbonData And IDE Configuration](https://cwiki.apache.org/confluence/display/CARBONDATA/Building+CarbonData+And+IDE+Configuration).
\ No newline at end of file
+scala>cc.sql("SELECT * FROM test_table").show()
+scala>cc.sql("SELECT city, avg(age), sum(age)
+      FROM test_table GROUP BY city").show()
+```
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/supported-data-types-in-carbondata.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/supported-data-types-in-carbondata.md b/src/site/markdown/supported-data-types-in-carbondata.md
new file mode 100644
index 0000000..01bd6e3
--- /dev/null
+++ b/src/site/markdown/supported-data-types-in-carbondata.md
@@ -0,0 +1,20 @@
+#  Data Types
+
+#### CarbonData supports the following data types:
+
+  * Numeric Types
+  * SMALLINT
+  * INT/INTEGER
+  * BIGINT
+  * DOUBLE
+  * DECIMAL
+
+  * Date/Time Types
+  * TIMESTAMP
+
+  * String Types
+  * STRING
+
+  * Complex Types
+    * arrays: ARRAY``<data_type>``
+    * structs: STRUCT``<col_name : data_type COMMENT col_comment, ...>``

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/table-of-content.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/table-of-content.md b/src/site/markdown/table-of-content.md
deleted file mode 100644
index cbec50b..0000000
--- a/src/site/markdown/table-of-content.md
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-    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.
--->
-# Table of Contents
-
-* [Quick Start](quick-start-guide.md)
-    * [Getting started with Apache CarbonData]()
-* [User Guide](user-guide-toc.md)
-    * [Overview](overview-of-carbondata.md)
-       * Introduction
-       * CarbonData File Structure
-       * Features
-       * Data Types
-       * Interfaces
-    * [Installation Guide](installation-guide.md)
-       * Installing and Configuring CarbonData on Standalone Spark Cluster
-       * Installing and Configuring CarbonData on “Spark on YARN” Cluster
-    * [Configuring CarbonData](configuration-parameters.md)
-       * System Configuration
-       * Performance Configuration
-       * Miscellaneous Configuration
-       * Spark Configuration
-    * [Using CarbonData](using-carbondata.md)
-       * [Data Management](data-management.md)
-       * [DDL Operations on CarbonData](ddl-operation-on-carbondata.md )
-       * [DML Operations on CarbonData](dml-operation-on-carbondata.md )
-* [Useful Tips](useful-tips-on-carbondata.md)
-    * Suggestion to create CarbonData Table
-    * Configurations for Optimizing CarbonData Performance
-* [CarbonData Use Cases](use-cases-of-carbondata.md)
-* [Troubleshooting](troubleshooting.md)
-* [FAQs](faq.md)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/troubleshooting.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/troubleshooting.md b/src/site/markdown/troubleshooting.md
index 21d3db6..b1bc9fa 100644
--- a/src/site/markdown/troubleshooting.md
+++ b/src/site/markdown/troubleshooting.md
@@ -18,13 +18,249 @@
 -->
 
 # Troubleshooting
-This tutorial is designed to provide troubleshooting for end users and developers 
+This tutorial is designed to provide troubleshooting for end users and developers
 who are building, deploying, and using CarbonData.
 
-### General Prevention and Best Practices
- * When trying to create a table with a single numeric column, table creation fails: 
-   One column that can be considered as dimension is mandatory for table creation.
-         
- * "Files locked for updation" when same table is accessed from two or more instances: 
-    Remove metastore_db from the examples folder.
+## Failed to load thrift libraries
 
+  **Symptom**
+
+  Thrift throws following exception :
+
+  ```
+  thrift: error while loading shared libraries:
+  libthriftc.so.0: cannot open shared object file: No such file or directory
+  ```
+
+  **Possible Cause**
+
+  The complete path to the directory containing the libraries is not configured correctly.
+
+  **Procedure**
+
+  Follow the steps below to ensure loading of libraries appropriately :
+
+  1. For ubuntu you have to add a custom.conf file to /etc/ld.so.conf.d
+     For example,
+
+     ```
+     sudo gedit /etc/ld.so.conf.d/randomLibs.conf
+     ```
+
+     Inside this file you are supposed to configure the complete path to the directory that contains all the libraries that you wish to add to the system, let us say /home/ubuntu/localLibs
+
+  2. To ensure your library location ,check for existence of libthrift.so
+
+  3. Save and run the following command to update the system with this libs.
+
+      ```
+      sudo ldconfig
+      ```
+
+    Note : Remember to add only the path to the directory, not the full path for that file, all the libraries inside that path will be automatically indexed.
+
+## Failed to launch the Spark Shell
+
+  **Symptom**
+
+  The shell prompts the following error :
+
+  ```
+  org.apache.spark.sql.CarbonContext$$anon$$apache$spark$sql$catalyst$analysis
+  $OverrideCatalog$_setter_$org$apache$spark$sql$catalyst$analysis
+  $OverrideCatalog$$overrides_$e
+  ```
+
+  **Possible Cause**
+
+  The Spark Version and the selected Spark Profile do not match.
+
+  **Procedure**
+
+  1. Ensure your spark version and selected profile for spark are correct.
+
+  2. Use the following command :
+
+    ```
+     "mvn -Pspark-2.1 -Dspark.version {yourSparkVersion} clean package"
+    ```
+
+    Note :  Refrain from using "mvn clean package" without specifying the profile.
+
+## Failed to execute load query on cluster.
+
+  **Symptom**
+
+  Load query failed with the following exception:
+
+  ```
+  Dictionary file is locked for updation.
+  ```
+
+  **Possible Cause**
+
+  The carbon.properties file is not identical in all the nodes of the cluster.
+
+  **Procedure**
+
+  Follow the steps to ensure the carbon.properties file is consistent across all the nodes:
+
+  1. Copy the carbon.properties file from the master node to all the other nodes in the cluster.
+     For example, you can use ssh to copy this file to all the nodes.
+
+  2. For the changes to take effect, restart the Spark cluster.
+
+## Failed to execute insert query on cluster.
+
+  **Symptom**
+
+  Load query failed with the following exception:
+
+  ```
+  Dictionary file is locked for updation.
+  ```
+
+  **Possible Cause**
+
+  The carbon.properties file is not identical in all the nodes of the cluster.
+
+  **Procedure**
+
+  Follow the steps to ensure the carbon.properties file is consistent across all the nodes:
+
+  1. Copy the carbon.properties file from the master node to all the other nodes in the cluster.
+       For example, you can use scp to copy this file to all the nodes.
+
+  2. For the changes to take effect, restart the Spark cluster.
+
+## Failed to connect to hiveuser with thrift
+
+  **Symptom**
+
+  We get the following exception :
+
+  ```
+  Cannot connect to hiveuser.
+  ```
+
+  **Possible Cause**
+
+  The external process does not have permission to access.
+
+  **Procedure**
+
+  Ensure that the Hiveuser in mysql must allow its access to the external processes.
+
+## Failure to read the metastore db during table creation.
+
+  **Symptom**
+
+  We get the following exception on trying to connect :
+
+  ```
+  Cannot read the metastore db
+  ```
+
+  **Possible Cause**
+
+  The metastore db is dysfunctional.
+
+  **Procedure**
+
+  Remove the metastore db from the carbon.metastore in the Spark Directory.
+
+## Failed to load data on the cluster
+
+  **Symptom**
+
+  Data loading fails with the following exception :
+
+   ```
+   Data Load failure exeception
+   ```
+
+  **Possible Cause**
+
+  The following issue can cause the failure :
+
+  1. The core-site.xml, hive-site.xml, yarn-site and carbon.properties are not consistent across all nodes of the cluster.
+
+  2. Path to hdfs ddl is not configured correctly in the carbon.properties.
+
+  **Procedure**
+
+   Follow the steps to ensure the following configuration files are consistent across all the nodes:
+
+   1. Copy the core-site.xml, hive-site.xml, yarn-site,carbon.properties files from the master node to all the other nodes in the cluster.
+      For example, you can use scp to copy this file to all the nodes.
+
+      Note : Set the path to hdfs ddl in carbon.properties in the master node.
+
+   2. For the changes to take effect, restart the Spark cluster.
+
+
+
+## Failed to insert data on the cluster
+
+  **Symptom**
+
+  Insertion fails with the following exception :
+
+   ```
+   Data Load failure exeception
+   ```
+
+  **Possible Cause**
+
+  The following issue can cause the failure :
+
+  1. The core-site.xml, hive-site.xml, yarn-site and carbon.properties are not consistent across all nodes of the cluster.
+
+  2. Path to hdfs ddl is not configured correctly in the carbon.properties.
+
+  **Procedure**
+
+   Follow the steps to ensure the following configuration files are consistent across all the nodes:
+
+   1. Copy the core-site.xml, hive-site.xml, yarn-site,carbon.properties files from the master node to all the other nodes in the cluster.
+      For example, you can use scp to copy this file to all the nodes.
+
+      Note : Set the path to hdfs ddl in carbon.properties in the master node.
+
+   2. For the changes to take effect, restart the Spark cluster.
+
+## Failed to execute Concurrent Operations(Load,Insert,Update) on table by multiple workers.
+
+  **Symptom**
+
+  Execution fails with the following exception :
+
+   ```
+   Table is locked for updation.
+   ```
+
+  **Possible Cause**
+
+  Concurrency not supported.
+
+  **Procedure**
+
+  Worker must wait for the query execution to complete and the table to release the lock for another query execution to succeed..
+
+## Failed to create a table with a single numeric column.
+
+  **Symptom**
+
+  Execution fails with the following exception :
+
+   ```
+   Table creation fails.
+   ```
+
+  **Possible Cause**
+
+  Behavior not supported.
+
+  **Procedure**
+
+  A single column that can be considered as dimension is mandatory for table creation.

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/use-cases-of-carbondata.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/use-cases-of-carbondata.md b/src/site/markdown/use-cases-of-carbondata.md
deleted file mode 100644
index 112b6bc..0000000
--- a/src/site/markdown/use-cases-of-carbondata.md
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
-    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 Use Cases
-This tutorial discusses about the problems that CarbonData addresses. It shall take you through the identified top use cases of CarbonData.
-
-## Introduction
-For big data interactive analysis scenarios, many customers expect sub-second response to query TB-PB level data on general hardware clusters with just a few nodes.
-
-In the current big data ecosystem, there are few columnar storage formats such as ORC and Parquet that are designed for SQL on Big Data. Apache Hive’s ORC format is a columnar storage format with basic indexing capability. However, ORC cannot meet the sub-second query response expectation on TB level data, as it performs only stride level dictionary encoding and all analytical operations such as filtering and aggregation is done on the actual data. Apache Parquet is a columnar storage format that can improve performance in comparison to ORC due to its more efficient storage organization. Though Parquet can provide query response on TB level data in a few seconds, it is still far from the sub-second expectation of interactive analysis users. Cloudera Kudu can effectively solve some query performance issues, but kudu is not hadoop native, can’t seamlessly integrate historic HDFS data into new kudu system.
-
-However, CarbonData uses specially engineered optimizations targeted to improve performance of analytical queries which can include filters, aggregation and distinct counts,
-the required data to be stored in an indexed, well organized, read-optimized format, CarbonData’s query performance can achieve sub-second response.
-
-## Motivation: Single Format to provide Low Latency Response for all Use Cases
-The main motivation behind CarbonData is to provide a single storage format for all the usecases of querying big data on Hadoop. Thus CarbonData is able to cover all use-cases 
-into a single storage format.
-
-  ![Motivation](../../../src/site/markdown/images/carbon_data_motivation.png?raw=true)
-
-## Use Cases
-### Sequential Access
-  - Supports queries that select only a few columns with a group by clause but do not contain any filters. 
-  This results in full scan over the complete store for the selected columns.
-  
-  ![Sequential_Scan](../../../src/site/markdown/images/carbon_data_full_scan.png?raw=true)
-  
-  **Scenario**
-  
-  - ETL jobs
-  - Log Analysis
-    
-### Random Access
-  - Supports Point Query. These are queries used from operational applications and usually select all or most of the columns and involves a large number of 
-  filters which reduce the result to a small size. Such queries generally do not involve any aggregation or group by clause.
-    - Row-key query(like HBase)
-    - Narrow Scan
-    - Requires second/sub-second level low latency
-    
-   ![random_access](../../../src/site/markdown/images/carbon_data_random_scan.png?raw=true)
-    
-  **Scenario**
-
-   - Operational Query
-   - User Profiling
-    
-### Olap Style Query
-  - Supports Interactive data analysis for any dimensions. These are queries which are typically fired from Interactive Analysis tools. 
-  Such queries often select a few columns and involves filters and group by on a column or a grouping expression. 
-  It also supports queries that :
-    - Involves aggregation/join
-    - Roll-up,Drill-down,Slicing and Dicing
-    - Low-latency ad-hoc query
-    
-   ![Olap_style_query](../../../src/site/markdown/images/carbon_data_olap_scan.png?raw=true)
-    
-   **Scenario**
-    
-  - Dash-board reporting
-  - Fraud & Ad-hoc Analysis
-    

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/markdown/user-guide-toc.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/user-guide-toc.md b/src/site/markdown/user-guide-toc.md
old mode 100644
new mode 100755
index c05fb09..5771e10
--- a/src/site/markdown/user-guide-toc.md
+++ b/src/site/markdown/user-guide-toc.md
@@ -24,10 +24,9 @@ Let's get started !
 
 * [Overview](overview-of-carbondata.md)
     * Introduction
-    * CarbonData File Structure
     * Features
-    * Data Types
-    * Interfaces
+    * [Data Types](supported-data-types-in-carbondata.md)
+    * [CarbonData File Structure](file-structure-of-carbondata.md)
 * [Installation Guide](installation-guide.md)
     * Installing and Configuring CarbonData on Standalone Spark Cluster
     * Installing and Configuring CarbonData on "Spark on YARN Cluster

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/pdf.xml
----------------------------------------------------------------------
diff --git a/src/site/pdf.xml b/src/site/pdf.xml
index d81808b..710e7c7 100644
--- a/src/site/pdf.xml
+++ b/src/site/pdf.xml
@@ -12,6 +12,8 @@
     <item name="Quick Start" ref='quick-start-guide.md'/>
     <item name="User Guide" ref='user-guide-toc.md'/>
     <item name="Overview" ref='overview-of-carbondata.md'/>
+    <item name="CarbonData File Structure" ref='file-structure-of-carbondata.md'/>
+    <item name="Data Types" ref='supported-data-types-in-carbondata.md'/>
     <item name="Installation" ref='installation-guide.md'/>
     <item name="Configuring CarbonData" ref='configuration-parameters.md'/>
     <item name="Using CarbonData" ref='using-carbondata.md'/>
@@ -19,7 +21,6 @@
     <item name="DDL" ref='ddl-operation-on-carbondata.md'/>
     <item name="DML" ref='dml-operation-on-carbondata.md '/>
     <item name="Useful Tips" ref='useful-tips-on-carbondata.md'/>
-    <item name="Use Cases" ref='use-cases-of-carbondata.md'/>
     <item name="Troubleshooting" ref='troubleshooting.md'/>
     <item name="FAQs" ref='faq.md'/>
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/0d4cdb1c/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index fdc7901..997caa6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache CarbonData">
-<bannerLeft>
-
-</bannerLeft>
-<bannerRight>
-
-</bannerRight>
-<body>
-</body>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Apache CarbonData">
+<bannerLeft>
+
+</bannerLeft>
+<bannerRight>
+
+</bannerRight>
+<body>
+</body>
+</project>


Mime
View raw message