http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/installation-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/installation-guide.html 
b/src/main/webapp/installation-guide.html
deleted file mode 100644
index 696db00..0000000
--- a/src/main/webapp/installation-guide.html
+++ /dev/null
@@ -1,455 +0,0 @@
-<!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</title>
-    <style>
-
-    </style>
-    <!-- Bootstrap -->
-
-    <link rel="stylesheet" href="css/bootstrap.min.css">
-    <link href="css/style.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.scom/respond/1.4.2/respond.min.js";></script>
-    <![endif]-->
-    <script src="js/jquery.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-
-
-</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://dist.apache.org/repos/dist/release/carbondata/1.4.1/";
-                                   target="_blank">Apache CarbonData 
1.4.1</a></li>
-                                                       <li>
-                                <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.4.0/";
-                                   target="_blank">Apache CarbonData 
1.4.0</a></li>
-                            <li>
-                                <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.3.1/";
-                                   target="_blank">Apache CarbonData 
1.3.1</a></li>
-                            <li>
-                                <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.3.0/";
-                                   target="_blank">Apache CarbonData 
1.3.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="mainpage.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">Community <span 
class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a 
href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md";
-                                   target="_blank">Contributing to 
CarbonData</a></li>
-                            <li>
-                                <a 
href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md";
-                                   target="_blank">Release Guide</a></li>
-                            <li>
-                                <a 
href="https://cwiki.apache.org/confluence/display/CARBONDATA/PMC+and+Committers+member+list";
-                                   target="_blank">Project PMC and 
Committers</a></li>
-                            <li>
-                                <a 
href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609";
-                                   target="_blank">CarbonData Meetups</a></li>
-                            <li><a href="security.html">Apache CarbonData 
Security</a></li>
-                            <li><a 
href="https://issues.apache.org/jira/browse/CARBONDATA"; target="_blank">Apache
-                                Jira</a></li>
-                            <li><a href="videogallery.html">CarbonData Videos 
</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>
-
-                    <li>
-                        <a href="#" id="search-icon"><i class="fa fa-search" 
aria-hidden="true"></i></a>
-
-                    </li>
-
-                </ul>
-            </div><!--/.nav-collapse -->
-            <div id="search-box">
-                <form method="get" action="http://www.google.com/search"; 
target="_blank">
-                    <div class="search-block">
-                        <table border="0" cellpadding="0" width="100%">
-                            <tr>
-                                <td style="width:80%">
-                                    <input type="text" name="q" size=" 5" 
maxlength="255" value=""
-                                           class="search-input"  
placeholder="Search...."    required/>
-                                </td>
-                                <td style="width:20%">
-                                    <input type="submit" value="Search"/></td>
-                            </tr>
-                            <tr>
-                                <td align="left" style="font-size:75%" 
colspan="2">
-                                    <input type="checkbox" name="sitesearch" 
value="carbondata.apache.org" checked/>
-                                    <span style=" position: relative; top: 
-3px;"> Only search for CarbonData</span>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </nav>
-</header> <!-- end Header part -->
-
-<div class="fixed-padding"></div> <!--  top padding with fixde header  -->
-
-<section><!-- Dashboard nav -->
-    <div class="container-fluid q">
-        <div class="col-sm-12  col-md-12 maindashboard">
-            <div class="row">
-                <section>
-                    <div style="padding:10px 15px;">
-                        <div id="viewpage" name="viewpage">
-                            <div class="row">
-                                <div class="col-sm-12  col-md-12">
-                                    <div>
-<h1>
-<a id="installation-guide" class="anchor" href="#installation-guide" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Installation Guide</h1>
-<p>This tutorial guides you through the installation and configuration of 
CarbonData in the following two modes :</p>
-<ul>
-<li><a 
href="#installing-and-configuring-carbondata-on-standalone-spark-cluster">Installing
 and Configuring CarbonData on Standalone Spark Cluster</a></li>
-<li><a 
href="#installing-and-configuring-carbondata-on-spark-on-yarn-cluster">Installing
 and Configuring CarbonData on Spark on YARN Cluster</a></li>
-</ul>
-<p>followed by :</p>
-<ul>
-<li><a href="#query-execution-using-carbondata-thrift-server">Query Execution 
using CarbonData Thrift Server</a></li>
-</ul>
-<h2>
-<a id="installing-and-configuring-carbondata-on-standalone-spark-cluster" 
class="anchor" 
href="#installing-and-configuring-carbondata-on-standalone-spark-cluster" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Installing and Configuring CarbonData on Standalone 
Spark Cluster</h2>
-<h3>
-<a id="prerequisites" class="anchor" href="#prerequisites" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Prerequisites</h3>
-<ul>
-<li>
-<p>Hadoop HDFS and Yarn should be installed and running.</p>
-</li>
-<li>
-<p>Spark should be installed and running on all the cluster nodes.</p>
-</li>
-<li>
-<p>CarbonData user should have permission to access HDFS.</p>
-</li>
-</ul>
-<h3>
-<a id="procedure" class="anchor" href="#procedure" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Procedure</h3>
-<ol>
-<li>
-<p><a href="https://github.com/apache/carbondata/blob/master/build/README.md"; 
target=_blank>Build the CarbonData</a> project and get the assembly jar from 
<code>./assembly/target/scala-2.1x/carbondata_xxx.jar</code>.</p>
-</li>
-<li>
-<p>Copy <code>./assembly/target/scala-2.1x/carbondata_xxx.jar</code> to 
<code>$SPARK_HOME/carbonlib</code> folder.</p>
-<p><strong>NOTE</strong>: Create the carbonlib folder if it does not exist 
inside <code>$SPARK_HOME</code> path.</p>
-</li>
-<li>
-<p>Add the carbonlib folder path in the Spark classpath. (Edit 
<code>$SPARK_HOME/conf/spark-env.sh</code> file and modify the value of 
<code>SPARK_CLASSPATH</code> by appending <code>$SPARK_HOME/carbonlib/*</code> 
to the existing value)</p>
-</li>
-<li>
-<p>Copy the <code>./conf/carbon.properties.template</code> file from 
CarbonData repository to <code>$SPARK_HOME/conf/</code> folder and rename the 
file to <code>carbon.properties</code>.</p>
-</li>
-<li>
-<p>Repeat Step 2 to Step 5 in all the nodes of the cluster.</p>
-</li>
-<li>
-<p>In Spark node[master], configure the properties mentioned in the following 
table in <code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</p>
-</li>
-</ol>
-<table>
-<thead>
-<tr>
-<th>Property</th>
-<th>Value</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>spark.driver.extraJavaOptions</td>
-<td><code>-Dcarbon.properties.filepath = 
$SPARK_HOME/conf/carbon.properties</code></td>
-<td>A string of extra JVM options to pass to the driver. For instance, GC 
settings or other logging.</td>
-</tr>
-<tr>
-<td>spark.executor.extraJavaOptions</td>
-<td><code>-Dcarbon.properties.filepath = 
$SPARK_HOME/conf/carbon.properties</code></td>
-<td>A string of extra JVM options to pass to executors. For instance, GC 
settings or other logging. <strong>NOTE</strong>: You can enter multiple values 
separated by space.</td>
-</tr>
-</tbody>
-</table>
-<ol start="7">
-<li>Add the following properties in 
<code>$SPARK_HOME/conf/carbon.properties</code> file:</li>
-</ol>
-<table>
-<thead>
-<tr>
-<th>Property</th>
-<th>Required</th>
-<th>Description</th>
-<th>Example</th>
-<th>Remark</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>carbon.storelocation</td>
-<td>NO</td>
-<td>Location where data CarbonData will create the store and write the data in 
its own format. If not specified then it takes spark.sql.warehouse.dir 
path.</td>
-<td>hdfs://HOSTNAME:PORT/Opt/CarbonStore</td>
-<td>Propose to set HDFS directory</td>
-</tr>
-</tbody>
-</table>
-<ol start="8">
-<li>Verify the installation. For example:</li>
-</ol>
-<pre><code>./spark-shell --master spark://HOSTNAME:PORT --total-executor-cores 
2
---executor-memory 2G
-</code></pre>
-<p><strong>NOTE</strong>: Make sure you have permissions for CarbonData JARs 
and files through which driver and executor will start.</p>
-<p>To get started with CarbonData : <a href="quick-start-guide.html">Quick 
Start</a>, <a href="data-management-on-carbondata.html">Data Management on 
CarbonData</a></p>
-<h2>
-<a id="installing-and-configuring-carbondata-on-spark-on-yarn-cluster" 
class="anchor" 
href="#installing-and-configuring-carbondata-on-spark-on-yarn-cluster" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Installing and Configuring CarbonData on Spark on YARN 
Cluster</h2>
-<p>This section provides the procedure to install CarbonData on "Spark on 
YARN" cluster.</p>
-<h3>
-<a id="prerequisites-1" class="anchor" href="#prerequisites-1" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Prerequisites</h3>
-<ul>
-<li>Hadoop HDFS and Yarn should be installed and running.</li>
-<li>Spark should be installed and running in all the clients.</li>
-<li>CarbonData user should have permission to access HDFS.</li>
-</ul>
-<h3>
-<a id="procedure-1" class="anchor" href="#procedure-1" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Procedure</h3>
-<p>The following steps are only for Driver Nodes. (Driver nodes are the one 
which starts the spark context.)</p>
-<ol>
-<li>
-<p><a href="https://github.com/apache/carbondata/blob/master/build/README.md"; 
target=_blank>Build the CarbonData</a> project and get the assembly jar from 
<code>./assembly/target/scala-2.1x/carbondata_xxx.jar</code> and copy to 
<code>$SPARK_HOME/carbonlib</code> folder.</p>
-<p><strong>NOTE</strong>: Create the carbonlib folder if it does not exists 
inside <code>$SPARK_HOME</code> path.</p>
-</li>
-<li>
-<p>Copy the <code>./conf/carbon.properties.template</code> file from 
CarbonData repository to <code>$SPARK_HOME/conf/</code> folder and rename the 
file to <code>carbon.properties</code>.</p>
-</li>
-<li>
-<p>Create <code>tar.gz</code> file of carbonlib folder and move it inside the 
carbonlib folder.</p>
-</li>
-</ol>
-<pre><code>cd $SPARK_HOME
-tar -zcvf carbondata.tar.gz carbonlib/
-mv carbondata.tar.gz carbonlib/
-</code></pre>
-<ol start="4">
-<li>Configure the properties mentioned in the following table in 
<code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</li>
-</ol>
-<table>
-<thead>
-<tr>
-<th>Property</th>
-<th>Description</th>
-<th>Value</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>spark.master</td>
-<td>Set this value to run the Spark in yarn cluster mode.</td>
-<td>Set yarn-client to run the Spark in yarn cluster mode.</td>
-</tr>
-<tr>
-<td>spark.yarn.dist.files</td>
-<td>Comma-separated list of files to be placed in the working directory of 
each executor.</td>
-<td><code>$SPARK_HOME/conf/carbon.properties</code></td>
-</tr>
-<tr>
-<td>spark.yarn.dist.archives</td>
-<td>Comma-separated list of archives to be extracted into the working 
directory of each executor.</td>
-<td><code>$SPARK_HOME/carbonlib/carbondata.tar.gz</code></td>
-</tr>
-<tr>
-<td>spark.executor.extraJavaOptions</td>
-<td>A string of extra JVM options to pass to executors. For instance  
<strong>NOTE</strong>: You can enter multiple values separated by space.</td>
-<td><code>-Dcarbon.properties.filepath = carbon.properties</code></td>
-</tr>
-<tr>
-<td>spark.executor.extraClassPath</td>
-<td>Extra classpath entries to prepend to the classpath of executors. 
<strong>NOTE</strong>: If SPARK_CLASSPATH is defined in spark-env.sh, then 
comment it and append the values in below parameter 
spark.driver.extraClassPath</td>
-<td><code>carbondata.tar.gz/carbonlib/*</code></td>
-</tr>
-<tr>
-<td>spark.driver.extraClassPath</td>
-<td>Extra classpath entries to prepend to the classpath of the driver. 
<strong>NOTE</strong>: If SPARK_CLASSPATH is defined in spark-env.sh, then 
comment it and append the value in below parameter 
spark.driver.extraClassPath.</td>
-<td><code>$SPARK_HOME/carbonlib/*</code></td>
-</tr>
-<tr>
-<td>spark.driver.extraJavaOptions</td>
-<td>A string of extra JVM options to pass to the driver. For instance, GC 
settings or other logging.</td>
-<td><code>-Dcarbon.properties.filepath = 
$SPARK_HOME/conf/carbon.properties</code></td>
-</tr>
-</tbody>
-</table>
-<ol start="5">
-<li>Add the following properties in 
<code>$SPARK_HOME/conf/carbon.properties</code>:</li>
-</ol>
-<table>
-<thead>
-<tr>
-<th>Property</th>
-<th>Required</th>
-<th>Description</th>
-<th>Example</th>
-<th>Default Value</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>carbon.storelocation</td>
-<td>NO</td>
-<td>Location where CarbonData will create the store and write the data in its 
own format. If not specified then it takes spark.sql.warehouse.dir path.</td>
-<td>hdfs://HOSTNAME:PORT/Opt/CarbonStore</td>
-<td>Propose to set HDFS directory</td>
-</tr>
-</tbody>
-</table>
-<ol start="6">
-<li>Verify the installation.</li>
-</ol>
-<pre><code> ./bin/spark-shell --master yarn-client --driver-memory 1g
- --executor-cores 2 --executor-memory 2G
-</code></pre>
-<p><strong>NOTE</strong>: Make sure you have permissions for CarbonData JARs 
and files through which driver and executor will start.</p>
-<p>Getting started with CarbonData : <a href="quick-start-guide.html">Quick 
Start</a>, <a href="data-management-on-carbondata.html">Data Management on 
CarbonData</a></p>
-<h2>
-<a id="query-execution-using-carbondata-thrift-server" class="anchor" 
href="#query-execution-using-carbondata-thrift-server" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Query Execution 
Using CarbonData Thrift Server</h2>
-<h3>
-<a id="starting-carbondata-thrift-server" class="anchor" 
href="#starting-carbondata-thrift-server" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Starting CarbonData 
Thrift Server.</h3>
-<p>a. cd <code>$SPARK_HOME</code></p>
-<p>b. Run the following command to start the CarbonData thrift server.</p>
-<pre><code>./bin/spark-submit
---class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
-$SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR &lt;carbon_store_path&gt;
-</code></pre>
-<table>
-<thead>
-<tr>
-<th>Parameter</th>
-<th>Description</th>
-<th>Example</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>CARBON_ASSEMBLY_JAR</td>
-<td>CarbonData assembly jar name present in the 
<code>$SPARK_HOME/carbonlib/</code> folder.</td>
-<td>carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar</td>
-</tr>
-<tr>
-<td>carbon_store_path</td>
-<td>This is a parameter to the CarbonThriftServer class. This a HDFS path 
where CarbonData files will be kept. Strongly Recommended to put same as 
carbon.storelocation parameter of carbon.properties. If not specified then it 
takes spark.sql.warehouse.dir path.</td>
-<td><code>hdfs://&lt;host_name&gt;:port/user/hive/warehouse/carbon.store</code></td>
-</tr>
-</tbody>
-</table>
-<p><strong>NOTE</strong>: From Spark 1.6, by default the Thrift server runs in 
multi-session mode. Which means each JDBC/ODBC connection owns a copy of their 
own SQL configuration and temporary function registry. Cached tables are still 
shared though. If you prefer to run the Thrift server in single-session mode 
and share all SQL configuration and temporary function registry, please set 
option <code>spark.sql.hive.thriftServer.singleSession</code> to 
<code>true</code>. You may either add this option to 
<code>spark-defaults.conf</code>, or pass it to <code>spark-submit.sh</code> 
via <code>--conf</code>:</p>
-<pre><code>./bin/spark-submit
---conf spark.sql.hive.thriftServer.singleSession=true
---class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
-$SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR &lt;carbon_store_path&gt;
-</code></pre>
-<p><strong>But</strong> in single-session mode, if one user changes the 
database from one connection, the database of the other connections will be 
changed too.</p>
-<p><strong>Examples</strong></p>
-<ul>
-<li>Start with default memory and executors.</li>
-</ul>
-<pre><code>./bin/spark-submit
---class org.apache.carbondata.spark.thriftserver.CarbonThriftServer 
-$SPARK_HOME/carbonlib
-/carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar
-hdfs://&lt;host_name&gt;:port/user/hive/warehouse/carbon.store
-</code></pre>
-<ul>
-<li>Start with Fixed executors and resources.</li>
-</ul>
-<pre><code>./bin/spark-submit
---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.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar
-hdfs://&lt;host_name&gt;:port/user/hive/warehouse/carbon.store
-</code></pre>
-<h3>
-<a id="connecting-to-carbondata-thrift-server-using-beeline" class="anchor" 
href="#connecting-to-carbondata-thrift-server-using-beeline" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Connecting to CarbonData Thrift Server Using 
Beeline.</h3>
-<pre><code>     cd $SPARK_HOME
-     ./sbin/start-thriftserver.sh
-     ./bin/beeline -u jdbc:hive2://&lt;thriftserver_host&gt;:port
-
-     Example
-     ./bin/beeline -u jdbc:hive2://10.10.10.10:10000
-</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="doc-footer">
-    <a href="#top" class="scroll-top">Top</a>
-</div>
-</div>
-</section>
-</div>
-</div>
-</div>
-</section><!-- End systemblock part -->
-<script src="js/custom.js"></script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/introduction.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/introduction.html 
b/src/main/webapp/introduction.html
index 29d2aa1..068d711 100644
--- a/src/main/webapp/introduction.html
+++ b/src/main/webapp/introduction.html
@@ -159,7 +159,7 @@
                         <div class="nav__inner">
                             <a class="b-nav__intro nav__item" 
href="./introduction.html">introduction</a>
                             <a class="b-nav__quickstart nav__item" 
href="./quick-start-guide.html">quick start</a>
-                            <a class="b-nav__uses nav__item" 
href="./usescases.html">use cases</a>
+                            <a class="b-nav__uses nav__item" 
href="./usecases.html">use cases</a>
 
                             <div class="nav__item nav__item__with__subs">
                                 <a class="b-nav__docs nav__item 
nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Support</a>
                             <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
                             <a class="b-nav__perf nav__item" 
href="./performance-tuning.html">Performance Tuning</a>
+                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Storage</a>
                             <a class="b-nav__faq nav__item" 
href="./faq.html">FAQ</a>
                             <a class="b-nav__contri nav__item" 
href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
                             <a class="b-nav__security nav__item" 
href="./security.html">Security</a>
@@ -194,9 +194,9 @@
                         <div class="b-nav__uses navindicator__item"></div>
                         <div class="b-nav__docs navindicator__item"></div>
                         <div class="b-nav__datamap navindicator__item"></div>
-                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__api navindicator__item"></div>
                         <div class="b-nav__perf navindicator__item"></div>
+                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__faq navindicator__item"></div>
                         <div class="b-nav__contri navindicator__item"></div>
                         <div class="b-nav__security navindicator__item"></div>
@@ -228,122 +228,128 @@
 </li>
 </ul>
 <h2>
-<a id="architecture" class="anchor" href="#architecture" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Architecture</h2>
-<p><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_architecture.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_architecture.png"
 alt="" style="max-width:100%;"></a></p>
-<h4>
-<a id="spark-interface-layer" class="anchor" href="#spark-interface-layer" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Spark Interface Layer:</h4>
-<p>CarbonData has deep integration with Apache Spark.CarbonData integrates 
custom Parser,Strategies,Optimization rules into Spark to take advantage of 
computing performed closer to data.</p>
-<p><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_spark_integration.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_spark_integration.png"
 alt="" style="max-width:100%;"></a></p>
-<ol>
+<a id="carbondata-features--functions" class="anchor" 
href="#carbondata-features--functions" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>CarbonData Features 
&amp; Functions</h2>
+<p>CarbonData has rich set of featues to support various use cases in Big Data 
analytics.The below table lists the major features supported by CarbonData.</p>
+<h3>
+<a id="table-management" class="anchor" href="#table-management" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Table Management</h3>
+<ul>
 <li>
-<strong>Carbon parser</strong> Enhances Spark?s SQL parser to support Carbon 
specific DDL and DML commands to create carbon table, create aggregate tables, 
manage data loading, data retention and cleanup.</li>
+<h5>
+<a id="ddl-create-alterdropctas" class="anchor" 
href="#ddl-create-alterdropctas" aria-hidden="true"><span aria-hidden="true" 
class="octicon octicon-link"></span></a>DDL (Create, Alter,Drop,CTAS)</h5>
+</li>
+</ul>
+<p>?   CarbonData provides its own DDL to create and manage carbondata 
tables.These DDL conform to                     Hive,Spark SQL format and 
support additional properties and configuration to take advantages of 
CarbonData functionalities.</p>
+<ul>
 <li>
-<strong>Carbon Strategies</strong>:- Modify Spark SQL?s physical query 
execution plan to push down possible operations to Carbon for example:- 
Grouping, Distinct Count, Top N etc.. for improving query performance.</li>
+<h5>
+<a id="dmlloadinsert" class="anchor" href="#dmlloadinsert" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>DML(Load,Insert)</h5>
+<p>CarbonData provides its own DML to manage data in carbondata tables.It adds 
many customizations through configurations to completely customize the behavior 
as per user requirement scenarios.</p>
+</li>
 <li>
-<strong>Carbon Data RDD</strong>:- Makes the data present in Carbon tables 
visible to Spark as a RDD which enables spark to perform distributed 
computation on Carbon tables.</li>
-</ol>
-<h4>
-<a id="carbon-processor" class="anchor" href="#carbon-processor" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Carbon Processor:</h4>
-<p>Receives a query execution fragment from spark and executes the same on the 
Carbon storage. This involves Scanning the carbon store files for matching 
record, using the indices to directly locate the row sets and even the rows 
that may containing the data being searched for. The Carbon processor also 
performs all pushed down operations such as</p>
-<p>Aggregation/Group By</p>
-<p>Distinct Count</p>
-<p>Top N</p>
-<p>Expression Evaluation</p>
-<p>And many more?</p>
-<h4>
-<a id="carbon-storage" class="anchor" href="#carbon-storage" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Carbon Storage:</h4>
-<p>Custom columnar data store which is heavily compressed, binary, dictionary 
encoded and heavily indexed.Usaually stored in HDFS.</p>
-<h2>
-<a id="carbondata-features" class="anchor" href="#carbondata-features" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>CarbonData Features</h2>
-<p>CarbonData has rich set of featues to support various use cases in Big Data 
analytics.</p>
-<h2>
-<a id="design" class="anchor" href="#design" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Design</h2>
-<ul>
+<h5>
+<a id="update-and-delete" class="anchor" href="#update-and-delete" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Update and Delete</h5>
+<p>CarbonData supports Update and Delete on Big Data.CarbonData provides the 
syntax similar to Hive to support IUD operations on CarbonData tables.</p>
+</li>
 <li>
-<h3>
-<a id="dictionary-encoding" class="anchor" href="#dictionary-encoding" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Dictionary Encoding</h3>
+<h5>
+<a id="segment-management" class="anchor" href="#segment-management" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Segment Management</h5>
+<p>CarbonData has unique concept of segments to manage incremental loads to 
CarbonData tables effectively.Segment management helps to easily control the 
table, perform easy retention, and is also used to provide transaction 
capability for operations being performed.</p>
+</li>
+<li>
+<h5>
+<a id="partition" class="anchor" href="#partition" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Partition</h5>
+<p>CarbonData supports 2 kinds of partitions.1.partition similar to hive 
partition.2.CarbonData partition supporting hash,list,range partitioning.</p>
+</li>
+<li>
+<h5>
+<a id="compaction" class="anchor" href="#compaction" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Compaction</h5>
+<p>CarbonData manages incremental loads as segments.Compaction help to compact 
the growing number of segments and also to improve query filter pruning.</p>
+</li>
+<li>
+<h5>
+<a id="external-tables" class="anchor" href="#external-tables" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>External Tables</h5>
+<p>CarbonData can read any carbondata file and automatically infer schema from 
the file and provide a relational table view to perform sql queries using Spark 
or any other applicaion.</p>
 </li>
 </ul>
-<p>CarbonData supports encoding of data with suggogate values to reduce 
storage space and speed up processing.Most databases and big data SQL data 
stores adopt dictionary encoding(integer surrogate numbers) to achieve data 
compression.Unlike other column store databases where the dictionary is local 
to each data block, CarbonData maintains a global dictionary which provides 
opportunity for lazy conversion to actual values enabling all computation to be 
performed on the lightweight surrogate values.</p>
+<h3>
+<a id="datamaps" class="anchor" href="#datamaps" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>DataMaps</h3>
+<ul>
+<li>
 <h5>
-<a id="dictionary-generation" class="anchor" href="#dictionary-generation" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Dictionary generation</h5>
-<p><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_dict_encoding.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_dict_encoding.png"
 alt="" style="max-width:100%;"></a></p>
+<a id="pre-aggregate" class="anchor" href="#pre-aggregate" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Pre-Aggregate</h5>
+<p>CarbonData has concept of datamaps to assist in pruning of data while 
querying so that performance is faster.Pre Aggregate tables are kind of 
datamaps which can improve the query performance by order of 
magnitude.CarbonData will automatically pre-aggregae the incremental data and 
re-write the query to automatically fetch from the most appropriate 
pre-aggregate table to serve the query faster.</p>
+</li>
+<li>
 <h5>
-<a id=.htmlk-indexing" class="anchor" href=".htmlk-indexing" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>MDK Indexing</h5>
-<p>All the surrogate keys are byte packed to generate an MDK (Multi 
Dimensional Key) Index.</p>
-<p>Any non surrogate columns of String data types are compressed using one of 
the configured compression algorithms and stored.For those numeric columns 
where surrogates are not generated, such data is stored as it is after 
compression.</p>
-<p><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata.htmlk.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata.htmlk.png"
 alt="image-20180903212418381" style="max-width:100%;"></a></p>
+<a id="time-series" class="anchor" href="#time-series" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Time Series</h5>
+<p>CarbonData has built in understanding of time order(Year, month,day,hour, 
minute,second).Time series is a pre-aggregate table which can automatically 
roll-up the data to the desired level during incremental load and serve the 
query from the most appropriate pre-aggregate table.</p>
+</li>
+<li>
+<h5>
+<a id="bloom-filter" class="anchor" href="#bloom-filter" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Bloom filter</h5>
+<p>CarbonData supports bloom filter as a datamap in order to quickly and 
efficiently prune the data for scanning and acheive faster query 
performance.</p>
+</li>
+<li>
 <h5>
-<a id="sorted.htmlk" class="anchor" href="#sorted.htmlk" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Sorted MDK</h5>
-<p>The data is sorted based on the MDK Index.Sorting helps for logical 
grouping of similar data and there by aids in faster look up during query.</p>
-<h4>
-<a id="" class="anchor" href="#" aria-hidden="true"><span aria-hidden="true" 
class="octicon octicon-link"></span></a><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata.htmlk_sort.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata.htmlk_sort.png"
 alt="image-20180903212525214" style="max-width:100%;"></a>
-</h4>
+<a id="lucene" class="anchor" href="#lucene" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Lucene</h5>
+<p>Lucene is popular for indexing text data which are long.CarbonData provides 
a lucene datamap so that text columns can be indexed using lucene and use the 
index result for efficient pruning of data to be retrieved during query.</p>
+</li>
+<li>
 <h5>
-<a id="custom-columnar-encoding" class="anchor" 
href="#custom-columnar-encoding" aria-hidden="true"><span aria-hidden="true" 
class="octicon octicon-link"></span></a>Custom Columnar Encoding</h5>
-<p>The Sorted MDK Index is split into each column.Unlike other stores where 
the column is compressed and stored as it is, CarbonData sorts this column data 
so that Binary Search can be performed on individual column data based on the 
filter conditions.This aids in magnitude increase in query performance and also 
in better compression.Since the individual column's data gets sorted, it is 
necessary to maintain the row mapping with the sorted MDK Index data in order 
to retrieve data from other columns which are not participating in filter.This 
row mapping is termed as <strong>Inverted Index</strong> and is stored along 
with the column data.The below picture depicts the logical column view.User has 
the option to <strong>turn off</strong> Inverted Index for such columns where 
filters are never applied or is very rare.In such cases, scanning would be 
sequential, but can aid in reducing the storage size(occupied due to inverted 
index data).</p>
-<h4>
-<a id="-1" class="anchor" href="#-1" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_blocklet_view.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_blocklet_view.png"
 alt="" style="max-width:100%;"></a>
-</h4>
+<a id="mv-materialized-views" class="anchor" href="#mv-materialized-views" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>MV (Materialized Views)</h5>
+<p>MVs are kind of pre-aggregate tables which can support efficent query 
re-write and processing.CarbonData provides MV which can rewrite query to fetch 
from any table(including non-carbondata tables).Typical usecase is to store the 
aggregated data of a non-carbondata fact table into carbondata and use mv to 
rewrite the query to fetch from carbondata.</p>
+</li>
+</ul>
+<h3>
+<a id="streaming" class="anchor" href="#streaming" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Streaming</h3>
 <ul>
 <li>
+<h5>
+<a id="spark-streaming" class="anchor" href="#spark-streaming" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Spark Streaming</h5>
+<p>CarbonData supports streaming of data into carbondata in near-realtime and 
make it immediately available for query.CarbonData provides a DSL to create 
source and sink tables easily without the need for the user to write his 
application.</p>
+</li>
+</ul>
 <h3>
-<a id="carbondata-storage-format" class="anchor" 
href="#carbondata-storage-format" aria-hidden="true"><span aria-hidden="true" 
class="octicon octicon-link"></span></a>CarbonData Storage Format</h3>
-<p>CarbonData has a unique storage structure which aids in efficient storage 
and retrieval of data.Please refer to <a 
href="#./file-structure-of-carbondata.html">File Structure of CarbonData</a> 
for detailed information on the format.</p>
+<a id="sdk" class="anchor" href="#sdk" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>SDK</h3>
+<ul>
+<li>
+<h5>
+<a id="carbondata-writer" class="anchor" href="#carbondata-writer" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>CarbonData writer</h5>
+<p>CarbonData supports writing data from non-spark application using SDK.Users 
can use SDK to generate carbondata files from custom applications.Typical 
usecase is to write the streaming application plugged in to kafka and use 
carbondata as sink(target) table for storing.</p>
 </li>
 <li>
-<h3>
-<a id="indexing" class="anchor" href="#indexing" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Indexing</h3>
-<p>CarbonData maintains multiple indexes at multiple levels to assist in 
efficient pruning of unwanted data from scan during query.Also CarbonData has 
support for plugging in external indexing solutions to speed up the query 
process.</p>
 <h5>
-<a id="min-max-indexing" class="anchor" href="#min-max-indexing" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Min-Max Indexing</h5>
-<p>Storing data along with index significantly accelerates query performance 
and reduces the I/O scans and CPU resources in case of filters in the query. 
CarbonData index consists of multiple levels of indices, a processing framework 
can leverage this index to reduce the number of tasks it needs to schedule and 
process. It can also do skip scan in more fine grained units (called blocklet) 
in task side scanning instead of scanning the whole file.  <strong>CarbonData 
maintains Min-Max Index for all the columns.</strong></p>
-<p>CarbonData maintains a separate index file which contains the footer 
information for efficient IO reads.</p>
-<p>Using the Min-Max info in these index files, two levels of filtering can be 
achieved.</p>
-<p>Min-Max at the carbondata file level,to efficiently prune the files when 
the filter condition doesn't fall in the range.This information when maintained 
at the Spark Driver, will help to efficiently schedule the tasks for 
scanning</p>
-<p>Min-Max at the blocklet level, to efficiently prune the blocklets when the 
filter condition doesn't fall in the range.This information when maintained at 
the executor can significantly reduce the amount unnecessary data processed by 
the executor tasks.</p>
-<p><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata-minmax-blocklet.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata-minmax-blocklet.png"
 alt="" style="max-width:100%;"></a></p>
+<a id="carbondata-reader" class="anchor" href="#carbondata-reader" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>CarbonData reader</h5>
+<p>CarbonData supports reading of data from non-spark application using 
SDK.Users can use the SDK to read the carbondata files from their application 
and do custom processing.</p>
 </li>
+</ul>
+<h3>
+<a id="storage" class="anchor" href="#storage" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Storage</h3>
+<ul>
 <li>
-<h4>
-<a id="datamaps" class="anchor" href="#datamaps" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>DataMaps</h4>
-<p>DataMap is a framework for indexing and also for statistics that can be 
used to add primary index (Blocklet Index) , secondary index type and 
statistical type to CarbonData.</p>
-<p>DataMap is a standardized general interface which CarbonData uses to prune 
data blocks for scanning.</p>
-<p>DataMaps are of 2 types:</p>
-<p><strong>CG(Coarse Grained) DataMaps</strong> Can prune data to the blocklet 
or to Page level.ie., Holds information for deciding which blocks/blocklets to 
be scanned.This DataMap is used in Spark Driver to decide the number of tasks 
to be scheduled.</p>
-<p><strong>FG(Fine Grained) DataMaps</strong> Can prune data to row level.This 
DataMap is used in Spark executor for scanning an fetching the data much 
faster.</p>
-<p>Since DataMap interfaces are generalised, We can write a thin adaptor 
called as <strong>DataMap Providers</strong> to interface between CarbonData 
and other external Indexing engines. For eg., Lucene, Solr,ES,...</p>
-<p>CarbonData has its own DSL to create and manage DataMaps.Please refer to <a 
href="#./datamap/datamap-management.html#overview">CarbonData DSL</a> for more 
information.</p>
-<p>The below diagram explains about the DataMap execution in CarbonData.</p>
-<p><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata-datamap.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata-datamap.png"
 alt="" style="max-width:100%;"></a></p>
+<h5>
+<a id="s3" class="anchor" href="#s3" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>S3</h5>
+<p>CarbonData can write to S3, OBS or any cloud storage confirming to S3 
protocol.CarbonData uses the HDFS api to write to cloud object stores.</p>
 </li>
 <li>
-<h4>
-<a id="update--delete" class="anchor" href="#update--delete" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Update &amp; Delete</h4>
+<h5>
+<a id="hdfs" class="anchor" href="#hdfs" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>HDFS</h5>
+<p>CarbonData uses HDFS api to write and read data from HDFS.CarbonData can 
take advantage of the locality information to efficiently suggest spark to run 
tasks near to the data.</p>
 </li>
 </ul>
-<p>CarbonData supports Update and delete operations over big data.This 
functionality is not targetted for OLTP scenarios where high concurrent 
update/delete are required.Following are the assumptions considered when this 
feature is designed.</p>
-<ol>
-<li>Updates or Deletes are periodic and in Bulk</li>
-<li>Updates or Deletes are atomic</li>
-<li>Data is immediately visible</li>
-<li>Concurrent query to be allowed during an update or delete operation</li>
-<li>Single statement auto-commit support (not OLTP-style transaction)</li>
-</ol>
-<p>Since data stored in HDFS are immutable,data blocks cannot be updated 
in-place.Re-write of entire data block is not efficient for IO and also is a 
slow process.</p>
-<p>To over come these limitations, CarbonData adopts methodology of writing a 
delta file containing the rows to be deleted and another delta file containing 
the values to be updated with.During processing, These two delta files are 
merged with the main carbondata file and the correct result is returned for the 
query.</p>
-<p>The below diagram describes the process.</p>
-<p><a 
href="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_update_delete.png"
 target="_blank" rel="noopener noreferrer"><img 
src="/Users/aditi_advith/Documents/code/carbondata/docs/images/carbondata_update_delete.png"
 alt="" style="max-width:100%;"></a></p>
 <h2>
 <a id="integration-with-big-data-ecosystem" class="anchor" 
href="#integration-with-big-data-ecosystem" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Integration with Big 
Data ecosystem</h2>
-<p>Refer to Integration with <a 
href="#./quick-start-guide.html#spark">Spark</a>, <a 
href="#./quick-start-guide.html#presto">Presto</a> for detailed information on 
integrating CarbonData with these execution engines.</p>
+<p>Refer to Integration with <a 
href="./quick-start-guide.html#spark">Spark</a>, <a 
href="./quick-start-guide.html#presto">Presto</a> for detailed information on 
integrating CarbonData with these execution engines.</p>
 <h2>
 <a id="scenarios-where-carbondata-is-suitable" class="anchor" 
href="#scenarios-where-carbondata-is-suitable" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Scenarios where 
CarbonData is suitable</h2>
+<p>CarbonData is useful in various analytical work loads.Some of the most 
typical usecases where CarbonData is being used is <a 
href="./usecases.html">documented here</a>.</p>
+<h2>
+<a id="performance-results" class="anchor" href="#performance-results" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Performance Results</h2>
+<p><a href="../docs/images/carbondata-performance.png?raw=true" 
target="_blank" rel="noopener noreferrer"><img 
src="https://github.com/apache/carbondata/blob/master/docs/images/carbondata-performance.png?raw=true";
 alt="Performance Results" style="max-width:100%;"></a></p>
 <script>
 // Show selected style on nav item
 $(function() { $('.b-nav__intro').addClass('selected'); });
-</script>
-</div>
+</script></div>
 </div>
 </div>
 </div>
@@ -358,4 +364,4 @@ $(function() { $('.b-nav__intro').addClass('selected'); });
 </section><!-- End systemblock part -->
 <script src="js/custom.js"></script>
 </body>
-</html>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/language-manual.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/language-manual.html 
b/src/main/webapp/language-manual.html
index 54c29ac..a0ea674 100644
--- a/src/main/webapp/language-manual.html
+++ b/src/main/webapp/language-manual.html
@@ -159,7 +159,7 @@
                         <div class="nav__inner">
                             <a class="b-nav__intro nav__item" 
href="./introduction.html">introduction</a>
                             <a class="b-nav__quickstart nav__item" 
href="./quick-start-guide.html">quick start</a>
-                            <a class="b-nav__uses nav__item" 
href="./usescases.html">use cases</a>
+                            <a class="b-nav__uses nav__item" 
href="./usecases.html">use cases</a>
 
                             <div class="nav__item nav__item__with__subs">
                                 <a class="b-nav__docs nav__item 
nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Support</a>
                             <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
                             <a class="b-nav__perf nav__item" 
href="./performance-tuning.html">Performance Tuning</a>
+                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Storage</a>
                             <a class="b-nav__faq nav__item" 
href="./faq.html">FAQ</a>
                             <a class="b-nav__contri nav__item" 
href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
                             <a class="b-nav__security nav__item" 
href="./security.html">Security</a>
@@ -194,9 +194,9 @@
                         <div class="b-nav__uses navindicator__item"></div>
                         <div class="b-nav__docs navindicator__item"></div>
                         <div class="b-nav__datamap navindicator__item"></div>
-                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__api navindicator__item"></div>
                         <div class="b-nav__perf navindicator__item"></div>
+                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__faq navindicator__item"></div>
                         <div class="b-nav__contri navindicator__item"></div>
                         <div class="b-nav__security navindicator__item"></div>
@@ -220,7 +220,6 @@
 <li>
 <a href="./ddl-of-carbondata.html">DDL:</a><a 
href="./ddl-of-carbondata.html#create-table">Create</a>,<a 
href="./ddl-of-carbondata.html#drop-table">Drop</a>,<a 
href="./ddl-of-carbondata.html#partition">Partition</a>,<a 
href="./ddl-of-carbondata.html#bucketing">Bucketing</a>,<a 
href="./ddl-of-carbondata.html#alter-table">Alter</a>,<a 
href="./ddl-of-carbondata.html#create-table-as-select">CTAS</a>,<a 
href="./ddl-of-carbondata.html#create-external-table">External Table</a>
 </li>
-<li>Indexes</li>
 <li>
 <a href="./datamap-management.html">DataMaps</a>
 <ul>
@@ -254,8 +253,7 @@ $(function() {
     $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
   }
 });
-</script>
-</div>
+</script></div>
 </div>
 </div>
 </div>
@@ -270,4 +268,4 @@ $(function() {
 </section><!-- End systemblock part -->
 <script src="js/custom.js"></script>
 </body>
-</html>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/lucene-datamap-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/lucene-datamap-guide.html 
b/src/main/webapp/lucene-datamap-guide.html
index 038cb9d..b8164a2 100644
--- a/src/main/webapp/lucene-datamap-guide.html
+++ b/src/main/webapp/lucene-datamap-guide.html
@@ -159,7 +159,7 @@
                         <div class="nav__inner">
                             <a class="b-nav__intro nav__item" 
href="./introduction.html">introduction</a>
                             <a class="b-nav__quickstart nav__item" 
href="./quick-start-guide.html">quick start</a>
-                            <a class="b-nav__uses nav__item" 
href="./usescases.html">use cases</a>
+                            <a class="b-nav__uses nav__item" 
href="./usecases.html">use cases</a>
 
                             <div class="nav__item nav__item__with__subs">
                                 <a class="b-nav__docs nav__item 
nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Support</a>
                             <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
                             <a class="b-nav__perf nav__item" 
href="./performance-tuning.html">Performance Tuning</a>
+                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Storage</a>
                             <a class="b-nav__faq nav__item" 
href="./faq.html">FAQ</a>
                             <a class="b-nav__contri nav__item" 
href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
                             <a class="b-nav__security nav__item" 
href="./security.html">Security</a>
@@ -194,9 +194,9 @@
                         <div class="b-nav__uses navindicator__item"></div>
                         <div class="b-nav__docs navindicator__item"></div>
                         <div class="b-nav__datamap navindicator__item"></div>
-                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__api navindicator__item"></div>
                         <div class="b-nav__perf navindicator__item"></div>
+                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__faq navindicator__item"></div>
                         <div class="b-nav__contri navindicator__item"></div>
                         <div class="b-nav__security navindicator__item"></div>
@@ -248,7 +248,7 @@ search tokenized word or pattern of it using lucene query 
on text content.</p>
   age int,
   city string,
   country string)
-STORED BY 'carbondata'
+STORED AS carbondata
 </code></pre>
 <p>User can create Lucene datamap using the Create DataMap DDL:</p>
 <pre><code>CREATE DATAMAP dm
@@ -328,7 +328,7 @@ select * from datamap_test where TEXT_MATCH('name:*n*')
 
 select * from datamap_test where TEXT_MATCH('name:*10 -name:*n*')
 </code></pre>
-<p><strong>Note:</strong> For lucene queries and syntax, refer to <a 
href="www.lucenetutorial.com/lucene-query-syntax.html">lucene-syntax</a></p>
+<p><strong>Note:</strong> For lucene queries and syntax, refer to <a 
href="http://www.lucenetutorial.com/lucene-query-syntax.html"; target=_blank 
rel="nofollow">lucene-syntax</a></p>
 <h2>
 <a id="data-management-with-lucene-datamap" class="anchor" 
href="#data-management-with-lucene-datamap" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Data Management with 
lucene datamap</h2>
 <p>Once there is lucene datamap is created on the main table, following 
command on the main
@@ -363,8 +363,7 @@ $(function() {
     
$('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
   }
 });
-</script>
-</div>
+</script></div>
 </div>
 </div>
 </div>
@@ -379,4 +378,4 @@ $(function() {
 </section><!-- End systemblock part -->
 <script src="js/custom.js"></script>
 </body>
-</html>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/mainpage.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/mainpage.html b/src/main/webapp/mainpage.html
deleted file mode 100644
index d515853..0000000
--- a/src/main/webapp/mainpage.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!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</title>
-    <style>
-
-    </style>
-    <!-- Bootstrap -->
-
-    <link rel="stylesheet" href="css/bootstrap.min.css">
-    <link href="css/style.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.scom/respond/1.4.2/respond.min.js";></script>
-    <![endif]-->
-    <script src="js/jquery.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-
-
-</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://dist.apache.org/repos/dist/release/carbondata/1.4.1/";
-                                   target="_blank">Apache CarbonData 
1.4.1</a></li>
-                                                       <li>
-                                <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.4.0/";
-                                   target="_blank">Apache CarbonData 
1.4.0</a></li>
-                            <li>
-                                <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.3.1/";
-                                   target="_blank">Apache CarbonData 
1.3.1</a></li>
-                            <li>
-                                <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.3.0/";
-                                   target="_blank">Apache CarbonData 
1.3.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="mainpage.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">Community <span 
class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a 
href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md";
-                                   target="_blank">Contributing to 
CarbonData</a></li>
-                            <li>
-                                <a 
href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md";
-                                   target="_blank">Release Guide</a></li>
-                            <li>
-                                <a 
href="https://cwiki.apache.org/confluence/display/CARBONDATA/PMC+and+Committers+member+list";
-                                   target="_blank">Project PMC and 
Committers</a></li>
-                            <li>
-                                <a 
href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609";
-                                   target="_blank">CarbonData Meetups</a></li>
-                            <li><a href="security.html">Apache CarbonData 
Security</a></li>
-                            <li><a 
href="https://issues.apache.org/jira/browse/CARBONDATA"; target="_blank">Apache
-                                Jira</a></li>
-                            <li><a href="videogallery.html">CarbonData Videos 
</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>
-
-                    <li>
-                        <a href="#" id="search-icon"><i class="fa fa-search" 
aria-hidden="true"></i></a>
-
-                    </li>
-
-                </ul>
-            </div><!--/.nav-collapse -->
-            <div id="search-box">
-                <form method="get" action="http://www.google.com/search";>
-                    <div class="search-block">
-                        <table border="0" cellpadding="0" width="100%">
-                            <tr>
-                                <td style="width:80%">
-                                    <input type="text" name="q" size=" 5" 
maxlength="255" value=""
-                                           class="search-input" 
placeholder="Search...."    required/>
-                                </td>
-                                <td style="width:20%">
-                                    <input type="submit" value="Search"/></td>
-                            </tr>
-                            <tr>
-                                <td align="left" style="font-size:75%" 
colspan="2">
-                                    <input type="checkbox" name="sitesearch" 
value="carbondata.apache.org" checked/>
-                                    <span style=" position: relative; top: 
-3px;"> Only search for CarbonData</span>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </nav>
-</header> <!-- end Header part -->
-
-<div class="fixed-padding"></div> <!--  top padding with fixde header  -->
-
-<section><!-- Dashboard nav -->
-    <div class="container-fluid q">
-        <div class="col-sm-12  col-md-12 maindashboard">
-            <div class="row">
-                <section>
-                    <div style="padding:10px 15px;">
-                        <div id="viewpage" name="viewpage">
-                            <div class="doc-heading">
-                                <h4 class="title">Documentation
-                                    <span class="title-underline"></span>
-                                </h4>
-                            </div>
-
-                            <div class="row">
-
-                                <div class="col-sm-12  col-md-12">
-                                    <span class="text-justify">
-                                        Welcome to Apache CarbonData. Apache 
CarbonData is a new big data file format for faster interactive query using 
advanced columnar storage, index, compression and encoding techniques to 
improve computing efficiency, which helps in speeding up queries by an order of 
magnitude faster over PetaBytes of data. This user guide provides a detailed 
description about the CarbonData and its features.
-                                        Let's get started !
-                                    </span>
-                                    <hr style="margin: 12px 0 8px">
-                                    <div>
-                                        <ul class="sub-nav">
-                                            <li><a 
href="quick-start-guide.html">Quick Start</a></li>
-                                            <li><a 
href="file-structure-of-carbondata.html">CarbonData File Structure</a></li>
-                                            <li><a 
href="supported-data-types-in-carbondata.html">Data Types</a></li>
-                                            <li><a 
href="data-management-on-carbondata.html">Data Management On CarbonData</a></li>
-                                            <li><a 
href="installation-guide.html">Installation Guide</a></li>
-                                            <li><a 
href="configuration-parameters.html">Configuring CarbonData</a></li>
-                                            <li><a 
href="streaming-guide.html">Streaming Guide</a></li>
-                                            <li><a href="sdk-guide.html">SDK 
Guide</a></li>
-                                                                               
        <li><a href="s3-guide.html">S3 Guide (Alpha Feature)</a></li>
-                                            <li><a 
href="datamap-developer-guide.html">DataMap Developer Guide</a></li>
-                                                                               
        <li><a href="datamap-management.html">CarbonData DataMap 
Management</a></li>
-                                            <li><a 
href="bloomfilter-datamap-guide.html">CarbonData BloomFilter DataMap (Alpha 
Feature)</a></li>
-                                            <li><a 
href="lucene-datamap-guide.html">CarbonData Lucene DataMap (Alpha 
Feature)</a></li>
-                                            <li><a 
href="preaggregate-datamap-guide.html">CarbonData Pre-aggregate DataMap</a></li>
-                                            <li><a 
href="timeseries-datamap-guide.html">CarbonData Timeseries DataMap</a></li>
-                                            <li><a 
href="faq.html">FAQs</a></li>
-                                            <li><a 
href="troubleshooting.html">Troubleshooting</a></li>
-                                            <li><a 
href="useful-tips-on-carbondata.html">Useful Tips</a></li>
-
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="doc-footer">
-                            <a href="#top" class="scroll-top">Top</a>
-                        </div>
-                    </div>
-                </section>
-            </div>
-        </div>
-    </div>
-</section><!-- End systemblock part -->
-</div>
-</div>
-</div>
-</section><!-- End systemblock part -->
-<script src="js/custom.js"></script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/performance-tuning.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/performance-tuning.html 
b/src/main/webapp/performance-tuning.html
index 49b3d3a..480911c 100644
--- a/src/main/webapp/performance-tuning.html
+++ b/src/main/webapp/performance-tuning.html
@@ -159,7 +159,7 @@
                         <div class="nav__inner">
                             <a class="b-nav__intro nav__item" 
href="./introduction.html">introduction</a>
                             <a class="b-nav__quickstart nav__item" 
href="./quick-start-guide.html">quick start</a>
-                            <a class="b-nav__uses nav__item" 
href="./usescases.html">use cases</a>
+                            <a class="b-nav__uses nav__item" 
href="./usecases.html">use cases</a>
 
                             <div class="nav__item nav__item__with__subs">
                                 <a class="b-nav__docs nav__item 
nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Support</a>
                             <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
                             <a class="b-nav__perf nav__item" 
href="./performance-tuning.html">Performance Tuning</a>
+                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Storage</a>
                             <a class="b-nav__faq nav__item" 
href="./faq.html">FAQ</a>
                             <a class="b-nav__contri nav__item" 
href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
                             <a class="b-nav__security nav__item" 
href="./security.html">Security</a>
@@ -194,9 +194,9 @@
                         <div class="b-nav__uses navindicator__item"></div>
                         <div class="b-nav__docs navindicator__item"></div>
                         <div class="b-nav__datamap navindicator__item"></div>
-                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__api navindicator__item"></div>
                         <div class="b-nav__perf navindicator__item"></div>
+                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__faq navindicator__item"></div>
                         <div class="b-nav__contri navindicator__item"></div>
                         <div class="b-nav__security navindicator__item"></div>
@@ -218,6 +218,7 @@ The following sections will elaborate on the below topics 
:</p>
 <li><a href="#suggestions-to-create-carbondata-table">Suggestions to create 
CarbonData Table</a></li>
 <li><a 
href="#configuration-for-optimizing-data-loading-performance-for-massive-data">Configuration
 for Optimizing Data Loading performance for Massive Data</a></li>
 <li><a href="#configurations-for-optimizing-carbondata-performance">Optimizing 
Query Performance</a></li>
+<li><a 
href="#compaction-configurations-for-optimizing-carbondata-query-performance">Compaction
 Configurations for Optimizing CarbonData Query Performance</a></li>
 </ul>
 <h2>
 <a id="suggestions-to-create-carbondata-table" class="anchor" 
href="#suggestions-to-create-carbondata-table" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Suggestions to 
Create CarbonData Table</h2>
@@ -299,7 +300,7 @@ The create table command can be modified as suggested below 
:</p>
   counter_1, Decimal
   ...
   
-  )STORED BY 'carbondata'
+  )STORED AS carbondata
   TBLPROPERTIES ('SORT_COLUMNS'='msisdn, Dime_1')
 </code></pre>
 <p>Now the query with MSISDN in the filter will be more efficient.</p>
@@ -320,7 +321,7 @@ The create table command can be modified as suggested below 
:</p>
     counter_1, Decimal
     ...
     
-    )STORED BY 'carbondata'
+    )STORED AS carbondata
     TBLPROPERTIES ('SORT_COLUMNS'='Dime_1, HOST, MSISDN')
 </code></pre>
 <ul>
@@ -337,7 +338,7 @@ The create table command can be modified as below :</p>
     counter_1 decimal,
     counter_2 double,
     ...
-    )STORED BY 'carbondata'
+    )STORED AS carbondata
     TBLPROPERTIES ('SORT_COLUMNS'='Dime_1, HOST, MSISDN')
 </code></pre>
 <p>The result of performance analysis of test-case shows reduction in query 
execution time from 15 to 3 seconds, thereby improving performance by nearly 5 
times.</p>
@@ -356,12 +357,12 @@ Incremental values are efficient in using min/max index. 
The create table comman
   END_TIME bigint,
   ...
   counter_100 double
-  )STORED BY 'carbondata'
+  )STORED AS carbondata
   TBLPROPERTIES ('SORT_COLUMNS'='Dime_1, HOST, MSISDN')
 </code></pre>
 <p><strong>NOTE:</strong></p>
 <ul>
-<li>BloomFilter can be created to enhance performance for queries with precise 
equal/in conditions. You can find more information about it in BloomFilter 
datamap <a 
href="https://github.com/apache/carbondata/blob/master/docs/datamap/bloomfilter-datamap-guide.html";
 target=_blank>document</a>.</li>
+<li>BloomFilter can be created to enhance performance for queries with precise 
equal/in conditions. You can find more information about it in BloomFilter 
datamap <a href="./bloomfilter-datamap-guide.html">document</a>.</li>
 </ul>
 <h2>
 <a id="configuration-for-optimizing-data-loading-performance-for-massive-data" 
class="anchor" 
href="#configuration-for-optimizing-data-loading-performance-for-massive-data" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Configuration for Optimizing Data Loading performance 
for Massive Data</h2>
@@ -507,11 +508,72 @@ scenarios. After the completion of POC, some of the 
configurations impacting the
 </tbody>
 </table>
 <p>Note: If your CarbonData instance is provided only for query, you may 
specify the property 'spark.speculation=true' which is in conf directory of 
spark.</p>
+<h2>
+<a id="compaction-configurations-for-optimizing-carbondata-query-performance" 
class="anchor" 
href="#compaction-configurations-for-optimizing-carbondata-query-performance" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Compaction Configurations for Optimizing CarbonData 
Query Performance</h2>
+<p>CarbonData provides many configurations to tune the compaction behavior so 
that query peformance is improved.</p>
+<p>Based on the number of cores available in the node, it is recommended to 
tune the configuration     
<em><strong>carbon.number.of.cores.while.compacting</strong></em> 
appropriately.Configuring a higher value will improve the overall compaction 
performance.</p>
+<p> </p>
+<table>
+<tbody>
+<tr>
+<td>No</td>
+<td> Data Loading frequency</td>
+<td>Data Size of each load</td>
+<td>Minor Compaction configuration</td>
+<td> Major compaction configuration</td>
+</tr>
+<tr>
+<td>1</td>
+<td> Batch(Once is several Hours)</td>
+<td>Big</td>
+<td> Not Suggested</td>
+<td>Configure Major Compaction size of 3-4 load size.Perform Major compaction 
once in a day</td>
+</tr>
+<tr>
+<td rowspan="2">2</td>
+<td rowspan="2"> Batch(Once in few minutes) </td>
+<td>Big </td>
+<td>
+<p> Minor compaction (2,2).</p>
+<p>Enable Auto compaction, if high rate data loading speed is not required or 
the time between loads is sufficient to run the compaction</p>
+</td>
+<td>Major compaction size of 10 load size.Perform Major compaction once in a 
day</td>
+</tr>
+<tr>
+<td>Small</td>
+<td>
+<p>Minor compaction (6,6).</p>
+<p>Enable Auto compaction, if high rate data loading speed is not required or 
the time between loads is sufficient to run the compaction</p>
+</td>
+<td>Major compaction size of 10 load size.Perform Major compaction once in a 
day</td>
+</tr>
+<tr>
+<td>3</td>
+<td> History data loaded as single load,incremental loads matches (1) or 
(2)</td>
+<td>Big</td>
+<td>
+<p> Configure ALLOWED_COMPACTION_DAYS to exclude the History load.</p>
+<p>Configure Minor compaction configuration based condition (1) or (2)</p>
+</td>
+<td> Configure Major compaction size smaller than the history load size.</td>
+</tr>
+<tr>
+<td>4</td>
+<td> There can be error in recent data loaded.Need reload sometimes</td>
+<td> (1) or (2)</td>
+<td>
+<p> Configure COMPACTION_PRESERVE_SEGMENTS</p>
+<p>to exclude the recent few segments from compacting.</p>
+<p>Configure Minor compaction configuration based condition (1) or (2)</p>
+</td>
+<td>Same as (1) or (2) </td>
+</tr>
+</tbody>
+</table>
 <script>
 // Show selected style on nav item
 $(function() { $('.b-nav__perf').addClass('selected'); });
-</script>
-</div>
+</script></div>
 </div>
 </div>
 </div>
@@ -526,4 +588,4 @@ $(function() { $('.b-nav__perf').addClass('selected'); });
 </section><!-- End systemblock part -->
 <script src="js/custom.js"></script>
 </body>
-</html>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/preaggregate-datamap-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/preaggregate-datamap-guide.html 
b/src/main/webapp/preaggregate-datamap-guide.html
index 9220c84..6b0783e 100644
--- a/src/main/webapp/preaggregate-datamap-guide.html
+++ b/src/main/webapp/preaggregate-datamap-guide.html
@@ -159,7 +159,7 @@
                         <div class="nav__inner">
                             <a class="b-nav__intro nav__item" 
href="./introduction.html">introduction</a>
                             <a class="b-nav__quickstart nav__item" 
href="./quick-start-guide.html">quick start</a>
-                            <a class="b-nav__uses nav__item" 
href="./usescases.html">use cases</a>
+                            <a class="b-nav__uses nav__item" 
href="./usecases.html">use cases</a>
 
                             <div class="nav__item nav__item__with__subs">
                                 <a class="b-nav__docs nav__item 
nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Support</a>
                             <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
                             <a class="b-nav__perf nav__item" 
href="./performance-tuning.html">Performance Tuning</a>
+                            <a class="b-nav__s3 nav__item" 
href="./s3-guide.html">S3 Storage</a>
                             <a class="b-nav__faq nav__item" 
href="./faq.html">FAQ</a>
                             <a class="b-nav__contri nav__item" 
href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
                             <a class="b-nav__security nav__item" 
href="./security.html">Security</a>
@@ -194,9 +194,9 @@
                         <div class="b-nav__uses navindicator__item"></div>
                         <div class="b-nav__docs navindicator__item"></div>
                         <div class="b-nav__datamap navindicator__item"></div>
-                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__api navindicator__item"></div>
                         <div class="b-nav__perf navindicator__item"></div>
+                        <div class="b-nav__s3 navindicator__item"></div>
                         <div class="b-nav__faq navindicator__item"></div>
                         <div class="b-nav__contri navindicator__item"></div>
                         <div class="b-nav__security navindicator__item"></div>
@@ -256,7 +256,7 @@
 <span class="pl-s">      | country string,</span>
 <span class="pl-s">      | quantity int,</span>
 <span class="pl-s">      | price bigint)</span>
-<span class="pl-s">      | STORED BY 'carbondata'</span>
+<span class="pl-s">      | STORED AS carbondata</span>
 <span class="pl-s">    <span class="pl-pds">"""</span></span>.stripMargin)
  
  <span class="pl-c"><span class="pl-c">//</span> Create pre-aggregate table on 
the main table</span>
@@ -347,7 +347,7 @@ in production SQLs.</p>
   country string,
   quantity int,
   price bigint)
-STORED BY 'carbondata'
+STORED AS carbondata
 </code></pre>
 <p>User can create pre-aggregate tables using the Create DataMap DDL</p>
 <pre><code>CREATE DATAMAP agg_sales
@@ -476,8 +476,7 @@ $(function() {
     
$('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
   }
 });
-</script>
-</div>
+</script></div>
 </div>
 </div>
 </div>
@@ -492,4 +491,4 @@ $(function() {
 </section><!-- End systemblock part -->
 <script src="js/custom.js"></script>
 </body>
-</html>
+</html>
\ No newline at end of file

Reply via email to