http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/content/troubleshooting.html
----------------------------------------------------------------------
diff --git a/content/troubleshooting.html b/content/troubleshooting.html
deleted file mode 100644
index c668dc9..0000000
--- a/content/troubleshooting.html
+++ /dev/null
@@ -1,366 +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="troubleshooting" class="anchor" href="#troubleshooting" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Troubleshooting</h1>
-<p>This tutorial is designed to provide troubleshooting for end users and 
developers
-who are building, deploying, and using CarbonData.</p>
-<h2>
-<a id="when-loading-data-gets-tablestatuslock-issues" class="anchor" 
href="#when-loading-data-gets-tablestatuslock-issues" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>When loading data, 
gets tablestatus.lock issues:</h2>
-<p><strong>Symptom</strong></p>
-<pre><code>17/11/11 16:48:13 ERROR LocalFileLock: main 
hdfs:/localhost:9000/carbon/store/default/hdfstable/tablestatus.lock (No such 
file or directory)
-java.io.FileNotFoundException: 
hdfs:/localhost:9000/carbon/store/default/hdfstable/tablestatus.lock (No such 
file or directory)
-       at java.io.FileOutputStream.open0(Native Method)
-       at java.io.FileOutputStream.open(FileOutputStream.java:270)
-       at java.io.FileOutputStream.&lt;init&gt;(FileOutputStream.java:213)
-       at java.io.FileOutputStream.&lt;init&gt;(FileOutputStream.java:101)
-</code></pre>
-<p><strong>Possible Cause</strong>
-If you use <code>&lt;hdfs path&gt;</code> as store path when creating 
carbonsession, may get the errors,because the default is LOCALLOCK.</p>
-<p><strong>Procedure</strong>
-Before creating carbonsession, sets as below:</p>
-<pre><code>import org.apache.carbondata.core.util.CarbonProperties
-import org.apache.carbondata.core.constants.CarbonCommonConstants
-CarbonProperties.getInstance().addProperty(CarbonCommonConstants.LOCK_TYPE, 
"HDFSLOCK")
-</code></pre>
-<h2>
-<a id="failed-to-load-thrift-libraries" class="anchor" 
href="#failed-to-load-thrift-libraries" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Failed to load 
thrift libraries</h2>
-<p><strong>Symptom</strong></p>
-<p>Thrift throws following exception :</p>
-<pre><code>thrift: error while loading shared libraries:
-libthriftc.so.0: cannot open shared object file: No such file or directory
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The complete path to the directory containing the libraries is not 
configured correctly.</p>
-<p><strong>Procedure</strong></p>
-<p>Follow the Apache thrift docs at <a 
href="https://thrift.apache.org/docs/install"; target=_blank 
rel="nofollow">https://thrift.apache.org/docs/install</a> to install thrift 
correctly.</p>
-<h2>
-<a id="failed-to-launch-the-spark-shell" class="anchor" 
href="#failed-to-launch-the-spark-shell" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Failed to launch the 
Spark Shell</h2>
-<p><strong>Symptom</strong></p>
-<p>The shell prompts the following error :</p>
-<pre><code>org.apache.spark.sql.CarbonContext$$anon$$apache$spark$sql$catalyst$analysis
-$OverrideCatalog$_setter_$org$apache$spark$sql$catalyst$analysis
-$OverrideCatalog$$overrides_$e
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The Spark Version and the selected Spark Profile do not match.</p>
-<p><strong>Procedure</strong></p>
-<ol>
-<li>
-<p>Ensure your spark version and selected profile for spark are correct.</p>
-</li>
-<li>
-<p>Use the following command :</p>
-</li>
-</ol>
-<pre><code>"mvn -Pspark-2.1 -Dspark.version {yourSparkVersion} clean package"
-</code></pre>
-<p>Note :  Refrain from using "mvn clean package" without specifying the 
profile.</p>
-<h2>
-<a id="failed-to-execute-load-query-on-cluster" class="anchor" 
href="#failed-to-execute-load-query-on-cluster" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Failed to execute 
load query on cluster.</h2>
-<p><strong>Symptom</strong></p>
-<p>Load query failed with the following exception:</p>
-<pre><code>Dictionary file is locked for updation.
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The carbon.properties file is not identical in all the nodes of the 
cluster.</p>
-<p><strong>Procedure</strong></p>
-<p>Follow the steps to ensure the carbon.properties file is consistent across 
all the nodes:</p>
-<ol>
-<li>
-<p>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.</p>
-</li>
-<li>
-<p>For the changes to take effect, restart the Spark cluster.</p>
-</li>
-</ol>
-<h2>
-<a id="failed-to-execute-insert-query-on-cluster" class="anchor" 
href="#failed-to-execute-insert-query-on-cluster" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Failed to execute 
insert query on cluster.</h2>
-<p><strong>Symptom</strong></p>
-<p>Load query failed with the following exception:</p>
-<pre><code>Dictionary file is locked for updation.
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The carbon.properties file is not identical in all the nodes of the 
cluster.</p>
-<p><strong>Procedure</strong></p>
-<p>Follow the steps to ensure the carbon.properties file is consistent across 
all the nodes:</p>
-<ol>
-<li>
-<p>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.</p>
-</li>
-<li>
-<p>For the changes to take effect, restart the Spark cluster.</p>
-</li>
-</ol>
-<h2>
-<a id="failed-to-connect-to-hiveuser-with-thrift" class="anchor" 
href="#failed-to-connect-to-hiveuser-with-thrift" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Failed to connect to 
hiveuser with thrift</h2>
-<p><strong>Symptom</strong></p>
-<p>We get the following exception :</p>
-<pre><code>Cannot connect to hiveuser.
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The external process does not have permission to access.</p>
-<p><strong>Procedure</strong></p>
-<p>Ensure that the Hiveuser in mysql must allow its access to the external 
processes.</p>
-<h2>
-<a id="failed-to-read-the-metastore-db-during-table-creation" class="anchor" 
href="#failed-to-read-the-metastore-db-during-table-creation" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Failed to read the metastore db during table 
creation.</h2>
-<p><strong>Symptom</strong></p>
-<p>We get the following exception on trying to connect :</p>
-<pre><code>Cannot read the metastore db
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The metastore db is dysfunctional.</p>
-<p><strong>Procedure</strong></p>
-<p>Remove the metastore db from the carbon.metastore in the Spark 
Directory.</p>
-<h2>
-<a id="failed-to-load-data-on-the-cluster" class="anchor" 
href="#failed-to-load-data-on-the-cluster" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Failed to load data 
on the cluster</h2>
-<p><strong>Symptom</strong></p>
-<p>Data loading fails with the following exception :</p>
-<pre><code>Data Load failure exception
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The following issue can cause the failure :</p>
-<ol>
-<li>
-<p>The core-site.xml, hive-site.xml, yarn-site and carbon.properties are not 
consistent across all nodes of the cluster.</p>
-</li>
-<li>
-<p>Path to hdfs ddl is not configured correctly in the carbon.properties.</p>
-</li>
-</ol>
-<p><strong>Procedure</strong></p>
-<p>Follow the steps to ensure the following configuration files are consistent 
across all the nodes:</p>
-<ol>
-<li>
-<p>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.</p>
-<p>Note : Set the path to hdfs ddl in carbon.properties in the master node.</p>
-</li>
-<li>
-<p>For the changes to take effect, restart the Spark cluster.</p>
-</li>
-</ol>
-<h2>
-<a id="failed-to-insert-data-on-the-cluster" class="anchor" 
href="#failed-to-insert-data-on-the-cluster" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Failed to insert 
data on the cluster</h2>
-<p><strong>Symptom</strong></p>
-<p>Insertion fails with the following exception :</p>
-<pre><code>Data Load failure exception
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>The following issue can cause the failure :</p>
-<ol>
-<li>
-<p>The core-site.xml, hive-site.xml, yarn-site and carbon.properties are not 
consistent across all nodes of the cluster.</p>
-</li>
-<li>
-<p>Path to hdfs ddl is not configured correctly in the carbon.properties.</p>
-</li>
-</ol>
-<p><strong>Procedure</strong></p>
-<p>Follow the steps to ensure the following configuration files are consistent 
across all the nodes:</p>
-<ol>
-<li>
-<p>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.</p>
-<p>Note : Set the path to hdfs ddl in carbon.properties in the master node.</p>
-</li>
-<li>
-<p>For the changes to take effect, restart the Spark cluster.</p>
-</li>
-</ol>
-<h2>
-<a 
id="failed-to-execute-concurrent-operationsloadinsertupdate-on-table-by-multiple-workers"
 class="anchor" 
href="#failed-to-execute-concurrent-operationsloadinsertupdate-on-table-by-multiple-workers"
 aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Failed to execute Concurrent 
Operations(Load,Insert,Update) on table by multiple workers.</h2>
-<p><strong>Symptom</strong></p>
-<p>Execution fails with the following exception :</p>
-<pre><code>Table is locked for updation.
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>Concurrency not supported.</p>
-<p><strong>Procedure</strong></p>
-<p>Worker must wait for the query execution to complete and the table to 
release the lock for another query execution to succeed.</p>
-<h2>
-<a id="failed-to-create-a-table-with-a-single-numeric-column" class="anchor" 
href="#failed-to-create-a-table-with-a-single-numeric-column" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Failed to create a table with a single numeric 
column.</h2>
-<p><strong>Symptom</strong></p>
-<p>Execution fails with the following exception :</p>
-<pre><code>Table creation fails.
-</code></pre>
-<p><strong>Possible Cause</strong></p>
-<p>Behaviour not supported.</p>
-<p><strong>Procedure</strong></p>
-<p>A single column that can be considered as dimension is mandatory for table 
creation.</p>
-</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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/content/usecases.html
----------------------------------------------------------------------
diff --git a/content/usecases.html b/content/usecases.html
index cb309dd..3ff114a 100644
--- a/content/usecases.html
+++ b/content/usecases.html
@@ -52,6 +52,9 @@
                            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.5.0/";
+                                   target="_blank">Apache CarbonData 
1.5.0</a></li>
+                            <li>
                                 <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.4.1/";
                                    target="_blank">Apache CarbonData 
1.4.1</a></li>
                                                        <li>
@@ -179,7 +182,12 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
+                            <div class="nav__item nav__item__with__subs">
+                                <a class="b-nav__api nav__item 
nav__sub__anchor" href="./sdk-guide.html">API</a>
+                                <a class="nav__item nav__sub__item" 
href="./sdk-guide.html">Java SDK</a>
+                                <a class="nav__item nav__sub__item" 
href="./CSDK-guide.html">C++ SDK</a>
+                            </div>
+
                             <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>
@@ -258,7 +266,7 @@
 <a id="detailed-queries-in-the-telecom-scenario" class="anchor" 
href="#detailed-queries-in-the-telecom-scenario" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Detailed Queries in 
the Telecom scenario</h2>
 <h3>
 <a id="scenario" class="anchor" href="#scenario" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Scenario</h3>
-<p>User wants to analyse all the CHR(Call History Record) and MR(Measurement 
Records) of the mobile subscribers in order to identify the service failures 
within 10 secs.Also user wants to run machine learning models on the data to 
fairly estimate the reasons and time of probable failures and take action ahead 
to meet the SLA(Service Level Agreements) of VIP customers.</p>
+<p>User wants to analyse all the CHR(Call History Record) and MR(Measurement 
Records) of the mobile subscribers in order to identify the service failures 
within 10 secs. Also user wants to run machine learning models on the data to 
fairly estimate the reasons and time of probable failures and take action ahead 
to meet the SLA(Service Level Agreements) of VIP customers.</p>
 <h3>
 <a id="challenges" class="anchor" href="#challenges" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Challenges</h3>
 <ul>
@@ -271,7 +279,7 @@
 <a id="solution" class="anchor" href="#solution" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Solution</h3>
 <p>Setup a Hadoop + Spark + CarbonData cluster managed by YARN.</p>
 <p>Proposed the following configurations for CarbonData.(These tunings were 
proposed before CarbonData introduced SORT_COLUMNS parameter using which the 
sort order and schema order could be different.)</p>
-<p>Add the frequently used columns to the left of the table definition.Add it 
in the increasing order of cardinality.It was suggested to keep msisdn,imsi 
columns in the beginning of the schema.With latest CarbonData, SORT_COLUMNS 
needs to be configured msisdn,imsi in the beginning.</p>
+<p>Add the frequently used columns to the left of the table definition. Add it 
in the increasing order of cardinality. It was suggested to keep msisdn,imsi 
columns in the beginning of the schema. With latest CarbonData, SORT_COLUMNS 
needs to be configured msisdn,imsi in the beginning.</p>
 <p>Add timestamp column to the right of the schema as it is naturally 
increasing.</p>
 <p>Create two separate YARN queues for Query and Data Loading.</p>
 <p>Apart from these, the following CarbonData configuration was suggested to 
be configured in the cluster.</p>
@@ -319,7 +327,7 @@
 <td>Data Loading</td>
 <td>carbon.use.local.dir</td>
 <td>TRUE</td>
-<td>yarn application directory will be usually on a single disk.YARN would be 
configured with multiple disks to be used as temp or to assign randomly to 
applications.Using the yarn temp directory will allow carbon to use multiple 
disks and improve IO performance</td>
+<td>yarn application directory will be usually on a single disk.YARN would be 
configured with multiple disks to be used as temp or to assign randomly to 
applications. Using the yarn temp directory will allow carbon to use multiple 
disks and improve IO performance</td>
 </tr>
 <tr>
 <td>Data Loading</td>
@@ -381,7 +389,7 @@
 <a id="detailed-queries-in-the-smart-city-scenario" class="anchor" 
href="#detailed-queries-in-the-smart-city-scenario" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Detailed Queries in 
the Smart City scenario</h2>
 <h3>
 <a id="scenario-1" class="anchor" href="#scenario-1" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Scenario</h3>
-<p>User wants to analyse the person/vehicle movement and behavior during a 
certain time period.This output data needs to be joined with a external table 
for Human details extraction.The query will be run with different time period 
as filter to identify potential behavior mismatch.</p>
+<p>User wants to analyse the person/vehicle movement and behavior during a 
certain time period. This output data needs to be joined with a external table 
for Human details extraction. The query will be run with different time period 
as filter to identify potential behavior mismatch.</p>
 <h3>
 <a id="challenges-1" class="anchor" href="#challenges-1" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Challenges</h3>
 <p>Data generated per day is very huge.Data needs to be loaded multiple times 
per day to accomodate the incoming data size.</p>
@@ -414,13 +422,13 @@
 <td>Data Loading</td>
 <td>enable.unsafe.sort</td>
 <td>TRUE</td>
-<td>Temporary data generated during sort is huge which causes GC 
bottlenecks.Using unsafe reduces the pressure on GC</td>
+<td>Temporary data generated during sort is huge which causes GC bottlenecks. 
Using unsafe reduces the pressure on GC</td>
 </tr>
 <tr>
 <td>Data Loading</td>
 <td>enable.offheap.sort</td>
 <td>TRUE</td>
-<td>Temporary data generated during sort is huge which causes GC 
bottlenecks.Using offheap reduces the pressure on GC.offheap can be accessed 
through java unsafe.hence enable.unsafe.sort needs to be true</td>
+<td>Temporary data generated during sort is huge which causes GC bottlenecks. 
Using offheap reduces the pressure on GC.offheap can be accessed through java 
unsafe.hence enable.unsafe.sort needs to be true</td>
 </tr>
 <tr>
 <td>Data Loading</td>
@@ -444,7 +452,7 @@
 <td>Data Loading</td>
 <td>table_blocksize</td>
 <td>512</td>
-<td>To efficiently schedule multiple tasks during query.This size depends on 
data scenario.If data is such that the filters would select less number of 
blocklets to scan, keeping higher number works well.If the number blocklets to 
scan is more, better to reduce the size as more tasks can be scheduled in 
parallel.</td>
+<td>To efficiently schedule multiple tasks during query. This size depends on 
data scenario.If data is such that the filters would select less number of 
blocklets to scan, keeping higher number works well.If the number blocklets to 
scan is more, better to reduce the size as more tasks can be scheduled in 
parallel.</td>
 </tr>
 <tr>
 <td>Data Loading</td>
@@ -456,7 +464,7 @@
 <td>Data Loading</td>
 <td>carbon.use.local.dir</td>
 <td>TRUE</td>
-<td>yarn application directory will be usually on a single disk.YARN would be 
configured with multiple disks to be used as temp or to assign randomly to 
applications.Using the yarn temp directory will allow carbon to use multiple 
disks and improve IO performance</td>
+<td>yarn application directory will be usually on a single disk.YARN would be 
configured with multiple disks to be used as temp or to assign randomly to 
applications. Using the yarn temp directory will allow carbon to use multiple 
disks and improve IO performance</td>
 </tr>
 <tr>
 <td>Data Loading</td>
@@ -468,7 +476,7 @@
 <td>Data Loading</td>
 <td>sort.inmemory.size.in.mb</td>
 <td>92160</td>
-<td>Memory allocated to do inmemory sorting.When more memory is available in 
the node, configuring this will retain more sort blocks in memory so that the 
merge sort is faster due to no/very less IO</td>
+<td>Memory allocated to do inmemory sorting. When more memory is available in 
the node, configuring this will retain more sort blocks in memory so that the 
merge sort is faster due to no/very less IO</td>
 </tr>
 <tr>
 <td>Compaction</td>
@@ -486,7 +494,7 @@
 <td>Compaction</td>
 <td>carbon.enable.auto.load.merge</td>
 <td>FALSE</td>
-<td>Doing auto minor compaction is costly process as data size is huge.Perform 
manual compaction when  the cluster is less loaded</td>
+<td>Doing auto minor compaction is costly process as data size is huge.Perform 
manual compaction when the cluster is less loaded</td>
 </tr>
 <tr>
 <td>Query</td>
@@ -498,13 +506,13 @@
 <td>Query</td>
 <td>enable.unsafe.in.query.procressing</td>
 <td>true</td>
-<td>Data that needs to be scanned in huge which in turn generates more short 
lived Java objects.This cause pressure of GC.using unsafe and offheap will 
reduce the GC overhead</td>
+<td>Data that needs to be scanned in huge which in turn generates more short 
lived Java objects. This cause pressure of GC.using unsafe and offheap will 
reduce the GC overhead</td>
 </tr>
 <tr>
 <td>Query</td>
 <td>use.offheap.in.query.processing</td>
 <td>true</td>
-<td>Data that needs to be scanned in huge which in turn generates more short 
lived Java objects.This cause pressure of GC.using unsafe and offheap will 
reduce the GC overhead.offheap can be accessed through java unsafe.hence 
enable.unsafe.in.query.procressing needs to be true</td>
+<td>Data that needs to be scanned in huge which in turn generates more short 
lived Java objects. This cause pressure of GC.using unsafe and offheap will 
reduce the GC overhead.offheap can be accessed through java unsafe.hence 
enable.unsafe.in.query.procressing needs to be true</td>
 </tr>
 <tr>
 <td>Query</td>
@@ -516,7 +524,7 @@
 <td>Query</td>
 <td>carbon.unsafe.working.memory.in.mb</td>
 <td>10240</td>
-<td>Amount of memory to use for offheap operations.Can increase this memory 
based on the data size</td>
+<td>Amount of memory to use for offheap operations, you can increase this 
memory based on the data size</td>
 </tr>
 </tbody>
 </table>
@@ -565,7 +573,7 @@
 <li>Create pre-aggregate tables for non timestamp based group by queries</li>
 <li>For queries containing group by date, create timeseries based 
Datamap(pre-aggregate) tables so that the data is rolled up during creation and 
fetch is faster</li>
 <li>Reduce the Spark shuffle partitions.(In our configuration on 14 node 
cluster, it was reduced to 35 from default of 200)</li>
-<li>Enable global dictionary for columns which have less 
cardinalities.Aggregation can be done on encoded data, there by improving the 
performance</li>
+<li>Enable global dictionary for columns which have less cardinalities. 
Aggregation can be done on encoded data, there by improving the performance</li>
 <li>For columns whose cardinality is high,enable the local dictionary so that 
store size is less and can take dictionary benefit for scan</li>
 </ul>
 <h2>
@@ -575,13 +583,13 @@
 <p>Need to support storing of continously arriving data and make it available 
immediately for query.</p>
 <h3>
 <a id="challenges-3" class="anchor" href="#challenges-3" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Challenges</h3>
-<p>When the data ingestion is near real time and the data needs to be 
available for query immediately, usual scenario is to do data loading in micro 
batches.But this causes the problem of generating many small files.This poses 
two problems:</p>
+<p>When the data ingestion is near real time and the data needs to be 
available for query immediately, usual scenario is to do data loading in micro 
batches.But this causes the problem of generating many small files. This poses 
two problems:</p>
 <ol>
 <li>Small file handling in HDFS is inefficient</li>
 <li>CarbonData will suffer in query performance as all the small files will 
have to be queried when filter is on non time column</li>
 </ol>
 <p>CarbonData will suffer in query performance as all the small files will 
have to be queried when filter is on non time column.</p>
-<p>Since data is continouly arriving, allocating resources for compaction 
might not be feasible.</p>
+<p>Since data is continously arriving, allocating resources for compaction 
might not be feasible.</p>
 <h3>
 <a id="goal-1" class="anchor" href="#goal-1" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>Goal</h3>
 <ol>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/content/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --git a/content/useful-tips-on-carbondata.html 
b/content/useful-tips-on-carbondata.html
deleted file mode 100644
index 912cb48..0000000
--- a/content/useful-tips-on-carbondata.html
+++ /dev/null
@@ -1,480 +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="useful-tips" class="anchor" href="#useful-tips" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Useful Tips</h1>
-<p>This tutorial guides you to create CarbonData Tables and optimize 
performance.
-The following sections will elaborate on the below topics :</p>
-<ul>
-<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 
Mass Data Loading</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>
-<p>For example, the results of the analysis for table creation with dimensions 
ranging from 10 thousand to 10 billion rows and 100 to 300 columns have been 
summarized below.
-The following table describes some of the columns from the table used.</p>
-<ul>
-<li><strong>Table Column Description</strong></li>
-</ul>
-<table>
-<thead>
-<tr>
-<th>Column Name</th>
-<th>Data Type</th>
-<th>Cardinality</th>
-<th>Attribution</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>msisdn</td>
-<td>String</td>
-<td>30 million</td>
-<td>Dimension</td>
-</tr>
-<tr>
-<td>BEGIN_TIME</td>
-<td>BigInt</td>
-<td>10 Thousand</td>
-<td>Dimension</td>
-</tr>
-<tr>
-<td>HOST</td>
-<td>String</td>
-<td>1 million</td>
-<td>Dimension</td>
-</tr>
-<tr>
-<td>Dime_1</td>
-<td>String</td>
-<td>1 Thousand</td>
-<td>Dimension</td>
-</tr>
-<tr>
-<td>counter_1</td>
-<td>Decimal</td>
-<td>NA</td>
-<td>Measure</td>
-</tr>
-<tr>
-<td>counter_2</td>
-<td>Numeric(20,0)</td>
-<td>NA</td>
-<td>Measure</td>
-</tr>
-<tr>
-<td>...</td>
-<td>...</td>
-<td>NA</td>
-<td>Measure</td>
-</tr>
-<tr>
-<td>counter_100</td>
-<td>Decimal</td>
-<td>NA</td>
-<td>Measure</td>
-</tr>
-</tbody>
-</table>
-<ul>
-<li><strong>Put the frequently-used column filter in the 
beginning</strong></li>
-</ul>
-<p>For example, MSISDN filter is used in most of the query then we must put 
the MSISDN in the first column.
-The create table command can be modified as suggested below :</p>
-<pre><code>create table carbondata_table(
-  msisdn String,
-  BEGIN_TIME bigint,
-  HOST String,
-  Dime_1 String,
-  counter_1, Decimal
-  ...
-  
-  )STORED BY 'carbondata'
-  TBLPROPERTIES ('SORT_COLUMNS'='msisdn, Dime_1')
-</code></pre>
-<p>Now the query with MSISDN in the filter will be more efficient.</p>
-<ul>
-<li><strong>Put the frequently-used columns in the order of low to high 
cardinality</strong></li>
-</ul>
-<p>If the table in the specified query has multiple columns which are 
frequently used to filter the results, it is suggested to put
-the columns in the order of cardinality low to high. This ordering of 
frequently used columns improves the compression ratio and
-enhances the performance of queries with filter on these columns.</p>
-<p>For example, if MSISDN, HOST and Dime_1 are frequently-used columns, then 
the column order of table is suggested as
-Dime_1&gt;HOST&gt;MSISDN, because Dime_1 has the lowest cardinality.
-The create table command can be modified as suggested below :</p>
-<pre><code>create table carbondata_table(
-    msisdn String,
-    BEGIN_TIME bigint,
-    HOST String,
-    Dime_1 String,
-    counter_1, Decimal
-    ...
-    
-    )STORED BY 'carbondata'
-    TBLPROPERTIES ('SORT_COLUMNS'='Dime_1, HOST, MSISDN')
-</code></pre>
-<ul>
-<li><strong>For measure type columns with non high accuracy, replace 
Numeric(20,0) data type with Double data type</strong></li>
-</ul>
-<p>For columns of measure type, not requiring high accuracy, it is suggested 
to replace Numeric data type with Double to enhance query performance.
-The create table command can be modified as below :</p>
-<pre><code>  create table carbondata_table(
-    Dime_1 String,
-    BEGIN_TIME bigint,
-    END_TIME bigint,
-    HOST String,
-    MSISDN String,
-    counter_1 decimal,
-    counter_2 double,
-    ...
-    )STORED BY '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>
-<ul>
-<li><strong>Columns of incremental character should be re-arranged at the end 
of dimensions</strong></li>
-</ul>
-<p>Consider the following scenario where data is loaded each day and the 
begin_time is incremental for each load, it is suggested to put begin_time at 
the end of dimensions.
-Incremental values are efficient in using min/max index. The create table 
command can be modified as below :</p>
-<pre><code>create table carbondata_table(
-  Dime_1 String,
-  HOST String,
-  MSISDN String,
-  counter_1 double,
-  counter_2 double,
-  BEGIN_TIME bigint,
-  END_TIME bigint,
-  ...
-  counter_100 double
-  )STORED BY '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>
-</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>
-<p>CarbonData supports large data load, in this process sorting data while 
loading consumes a lot of memory and disk IO and
-this can result sometimes in "Out Of Memory" exception.
-If you do not have much memory to use, then you may prefer to slow the speed 
of data loading instead of data load failure.
-You can configure CarbonData by tuning following properties in 
carbon.properties file to get a better performance.</p>
-<table>
-<thead>
-<tr>
-<th>Parameter</th>
-<th>Default Value</th>
-<th>Description/Tuning</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>carbon.number.of.cores.while.loading</td>
-<td>Default: 2.This value should be &gt;= 2</td>
-<td>Specifies the number of cores used for data processing during data loading 
in CarbonData.</td>
-</tr>
-<tr>
-<td>carbon.sort.size</td>
-<td>Default: 100000. The value should be &gt;= 100.</td>
-<td>Threshold to write local file in sort step when loading data</td>
-</tr>
-<tr>
-<td>carbon.sort.file.write.buffer.size</td>
-<td>Default:  50000.</td>
-<td>DataOutputStream buffer.</td>
-</tr>
-<tr>
-<td>carbon.number.of.cores.block.sort</td>
-<td>Default: 7</td>
-<td>If you have huge memory and CPUs, increase it as you will</td>
-</tr>
-<tr>
-<td>carbon.merge.sort.reader.thread</td>
-<td>Default: 3</td>
-<td>Specifies the number of cores used for temp file merging during data 
loading in CarbonData.</td>
-</tr>
-<tr>
-<td>carbon.merge.sort.prefetch</td>
-<td>Default: true</td>
-<td>You may want set this value to false if you have not enough memory</td>
-</tr>
-</tbody>
-</table>
-<p>For example, if there are 10 million records, and i have only 16 cores, 
64GB memory, will be loaded to CarbonData table.
-Using the default configuration  always fail in sort step. Modify 
carbon.properties as suggested below:</p>
-<pre><code>carbon.number.of.cores.block.sort=1
-carbon.merge.sort.reader.thread=1
-carbon.sort.size=5000
-carbon.sort.file.write.buffer.size=5000
-carbon.merge.sort.prefetch=false
-</code></pre>
-<h2>
-<a id="configurations-for-optimizing-carbondata-performance" class="anchor" 
href="#configurations-for-optimizing-carbondata-performance" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Configurations for Optimizing CarbonData 
Performance</h2>
-<p>Recently we did some performance POC on CarbonData for Finance and 
telecommunication Field. It involved detailed queries and aggregation
-scenarios. After the completion of POC, some of the configurations impacting 
the performance have been identified and tabulated below :</p>
-<table>
-<thead>
-<tr>
-<th>Parameter</th>
-<th>Location</th>
-<th>Used For</th>
-<th>Description</th>
-<th>Tuning</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>carbon.sort.intermediate.files.limit</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>During the loading of data, local temp is used to sort the data. This 
number specifies the minimum number of intermediate files after which the  
merge sort has to be initiated.</td>
-<td>Increasing the parameter to a higher value will improve the load 
performance. For example, when we increase the value from 20 to 100, it 
increases the data load performance from 35MB/S to more than 50MB/S. Higher 
values of this parameter consumes  more memory during the load.</td>
-</tr>
-<tr>
-<td>carbon.number.of.cores.while.loading</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>Specifies the number of cores used for data processing during data loading 
in CarbonData.</td>
-<td>If you have more number of CPUs, then you can increase the number of CPUs, 
which will increase the performance. For example if we increase the value from 
2 to 4 then the CSV reading performance can increase about 1 times</td>
-</tr>
-<tr>
-<td>carbon.compaction.level.threshold</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading and Querying</td>
-<td>For minor compaction, specifies the number of segments to be merged in 
stage 1 and number of compacted segments to be merged in stage 2.</td>
-<td>Each CarbonData load will create one segment, if every load is small in 
size it will generate many small file over a period of time impacting the query 
performance. Configuring this parameter will merge the small segment to one big 
segment which will sort the data and improve the performance. For Example in 
one telecommunication scenario, the performance improves about 2 times after 
minor compaction.</td>
-</tr>
-<tr>
-<td>spark.sql.shuffle.partitions</td>
-<td>spark/conf/spark-defaults.conf</td>
-<td>Querying</td>
-<td>The number of task started when spark shuffle.</td>
-<td>The value can be 1 to 2 times as much as the executor cores. In an 
aggregation scenario, reducing the number from 200 to 32 reduced the query time 
from 17 to 9 seconds.</td>
-</tr>
-<tr>
-<td>spark.executor.instances/spark.executor.cores/spark.executor.memory</td>
-<td>spark/conf/spark-defaults.conf</td>
-<td>Querying</td>
-<td>The number of executors, CPU cores, and memory used for CarbonData 
query.</td>
-<td>In the bank scenario, we provide the 4 CPUs cores and 15 GB for each 
executor which can get good performance. This 2 value does not mean more the 
better. It needs to be configured properly in case of limited resources. For 
example, In the bank scenario, it has enough CPU 32 cores each node but less 
memory 64 GB each node. So we cannot give more CPU but less memory. For 
example, when 4 cores and 12GB for each executor. It sometimes happens GC 
during the query which impact the query performance very much from the 3 second 
to more than 15 seconds. In this scenario need to increase the memory or 
decrease the CPU cores.</td>
-</tr>
-<tr>
-<td>carbon.detail.batch.size</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>The buffer size to store records, returned from the block scan.</td>
-<td>In limit scenario this parameter is very important. For example your query 
limit is 1000. But if we set this value to 3000 that means we get 3000 records 
from scan but spark will only take 1000 rows. So the 2000 remaining are 
useless. In one Finance test case after we set it to 100, in the limit 1000 
scenario the performance increase about 2 times in comparison to if we set this 
value to 12000.</td>
-</tr>
-<tr>
-<td>carbon.use.local.dir</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>Whether use YARN local directories for multi-table load disk load 
balance</td>
-<td>If this is set it to true CarbonData will use YARN local directories for 
multi-table load disk load balance, that will improve the data load 
performance.</td>
-</tr>
-<tr>
-<td>carbon.use.multiple.temp.dir</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>Whether to use multiple YARN local directories during table data loading 
for disk load balance</td>
-<td>After enabling 'carbon.use.local.dir', if this is set to true, CarbonData 
will use all YARN local directories during data load for disk load balance, 
that will improve the data load performance. Please enable this property when 
you encounter disk hotspot problem during data loading.</td>
-</tr>
-<tr>
-<td>carbon.sort.temp.compressor</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>Specify the name of compressor to compress the intermediate sort temporary 
files during sort procedure in data loading.</td>
-<td>The optional values are 'SNAPPY','GZIP','BZIP2','LZ4','ZSTD' and empty. By 
default, empty means that Carbondata will not compress the sort temp files. 
This parameter will be useful if you encounter disk bottleneck.</td>
-</tr>
-<tr>
-<td>carbon.load.skewedDataOptimization.enabled</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>Whether to enable size based block allocation strategy for data 
loading.</td>
-<td>When loading, carbondata will use file size based block allocation 
strategy for task distribution. It will make sure that all the executors 
process the same size of data -- It's useful if the size of your input data 
files varies widely, say 1MB~1GB.</td>
-</tr>
-<tr>
-<td>carbon.load.min.size.enabled</td>
-<td>spark/carbonlib/carbon.properties</td>
-<td>Data loading</td>
-<td>Whether to enable node minumun input data size allocation strategy for 
data loading.</td>
-<td>When loading, carbondata will use node minumun input data size allocation 
strategy for task distribution. It will make sure the node load the minimum 
amount of data -- It's useful if the size of your input data files very small, 
say 1MB~256MB,Avoid generating a large number of small files.</td>
-</tr>
-</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>
-</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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/src/main/resources/application.conf 
b/src/main/resources/application.conf
index ba425e5..020b127 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -16,7 +16,9 @@ fileList=["configuration-parameters",
   "release-guide",
   "how-to-contribute-to-apache-carbondata",
   "introduction",
-  "usecases"
+  "usecases",
+  "CSDK-guide",
+  "carbon-as-spark-datasource-guide"
   ]
 dataMapFileList=[
   "bloomfilter-datamap-guide",

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/scala/MdFileHandler.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/MdFileHandler.scala 
b/src/main/scala/MdFileHandler.scala
index 148a280..255bdf3 100644
--- a/src/main/scala/MdFileHandler.scala
+++ b/src/main/scala/MdFileHandler.scala
@@ -28,7 +28,7 @@ class MdFileHandler @Inject()(confService: ConfService, 
fileService: FileService
 
     val contentAfterReplacingDatamap: String = modifyDatamapPattern 
replaceAllIn(contentAfterReplacingId, "./")
 
-    val contentAfterReplacingImage: String = modifyImagePattern 
replaceAllIn(contentAfterReplacingDatamap,replacingImageContent)
+    val contentAfterReplacingImage: String = modifyImagePattern 
replaceAllIn(contentAfterReplacingDatamap, replacingImageContent)
     val contentAfterReplacingHttpsFileLink: String = modifyHttpsFileLink 
replaceAllIn(contentAfterReplacingImage, "$1://$2$3 target=_blank")
     val contentAfterReplacingFileLink: String = modifyHttpFileLink 
replaceAllIn(contentAfterReplacingHttpsFileLink, "$1://$2$3 target=_blank")
     contentAfterReplacingFileLink

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/scala/html/header.html
----------------------------------------------------------------------
diff --git a/src/main/scala/html/header.html b/src/main/scala/html/header.html
index 217a9f4..93229f6 100644
--- a/src/main/scala/html/header.html
+++ b/src/main/scala/html/header.html
@@ -52,6 +52,9 @@
                            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.5.0/";
+                                   target="_blank">Apache CarbonData 
1.5.0</a></li>
+                            <li>
                                 <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.4.1/";
                                    target="_blank">Apache CarbonData 
1.4.1</a></li>
                                                        <li>
@@ -179,7 +182,12 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
+                            <div class="nav__item nav__item__with__subs">
+                                <a class="b-nav__api nav__item 
nav__sub__anchor" href="./sdk-guide.html">API</a>
+                                <a class="nav__item nav__sub__item" 
href="./sdk-guide.html">Java SDK</a>
+                                <a class="nav__item nav__sub__item" 
href="./CSDK-guide.html">C++ SDK</a>
+                            </div>
+
                             <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>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/scala/scripts/CSDK-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/CSDK-guide 
b/src/main/scala/scripts/CSDK-guide
new file mode 100644
index 0000000..2c8ffc0
--- /dev/null
+++ b/src/main/scala/scripts/CSDK-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+  // Show selected style on nav item
+  $('.b-nav__api').addClass('selected');
+
+  if (!$('.b-nav__api').parent().hasClass('nav__item__with__subs--expanded')) {
+    // Display api subnav items
+    $('.b-nav__api').parent().toggleClass('nav__item__with__subs--expanded');
+  }
+});
+</script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/scala/scripts/carbon-as-spark-datasource-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/carbon-as-spark-datasource-guide 
b/src/main/scala/scripts/carbon-as-spark-datasource-guide
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/carbon-as-spark-datasource-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+  // Show selected style on nav item
+  $('.b-nav__docs').addClass('selected');
+
+  // Display docs subnav items
+  if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) 
{
+    $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+  }
+});
+</script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/scala/scripts/sdk-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/sdk-guide b/src/main/scala/scripts/sdk-guide
index 700185a..2c8ffc0 100644
--- a/src/main/scala/scripts/sdk-guide
+++ b/src/main/scala/scripts/sdk-guide
@@ -1,4 +1,11 @@
 <script>
-// Show selected style on nav item
-$(function() { $('.b-nav__api').addClass('selected'); });
+$(function() {
+  // Show selected style on nav item
+  $('.b-nav__api').addClass('selected');
+
+  if (!$('.b-nav__api').parent().hasClass('nav__item__with__subs--expanded')) {
+    // Display api subnav items
+    $('.b-nav__api').parent().toggleClass('nav__item__with__subs--expanded');
+  }
+});
 </script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/webapp/CSDK-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/CSDK-guide.html b/src/main/webapp/CSDK-guide.html
new file mode 100644
index 0000000..193d74f
--- /dev/null
+++ b/src/main/webapp/CSDK-guide.html
@@ -0,0 +1,422 @@
+<!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>
+    <script defer 
src="https://use.fontawesome.com/releases/v5.0.8/js/all.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.5.0/";
+                                   target="_blank">Apache CarbonData 
1.5.0</a></li>
+                            <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="documentation.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="verticalnavbar">
+                <nav class="b-sticky-nav">
+                    <div class="nav-scroller">
+                        <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="./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>
+                                <a class="nav__item nav__sub__item" 
href="./ddl-of-carbondata.html">DDL</a>
+                                <a class="nav__item nav__sub__item" 
href="./dml-of-carbondata.html">DML</a>
+                                <a class="nav__item nav__sub__item" 
href="./streaming-guide.html">Streaming</a>
+                                <a class="nav__item nav__sub__item" 
href="./configuration-parameters.html">Configuration</a>
+                                <a class="nav__item nav__sub__item" 
href="./datamap-developer-guide.html">Datamaps</a>
+                                <a class="nav__item nav__sub__item" 
href="./supported-data-types-in-carbondata.html">Data Types</a>
+                            </div>
+
+                            <div class="nav__item nav__item__with__subs">
+                                <a class="b-nav__datamap nav__item 
nav__sub__anchor" href="./datamap-management.html">DataMaps</a>
+                                <a class="nav__item nav__sub__item" 
href="./bloomfilter-datamap-guide.html">Bloom Filter</a>
+                                <a class="nav__item nav__sub__item" 
href="./lucene-datamap-guide.html">Lucene</a>
+                                <a class="nav__item nav__sub__item" 
href="./preaggregate-datamap-guide.html">Pre-Aggregate</a>
+                                <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
+                            </div>
+
+                            <div class="nav__item nav__item__with__subs">
+                                <a class="b-nav__api nav__item 
nav__sub__anchor" href="./sdk-guide.html">API</a>
+                                <a class="nav__item nav__sub__item" 
href="./sdk-guide.html">Java SDK</a>
+                                <a class="nav__item nav__sub__item" 
href="./CSDK-guide.html">C++ SDK</a>
+                            </div>
+
+                            <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>
+                            <a class="b-nav__release nav__item" 
href="./release-guide.html">Release Guide</a>
+                        </div>
+                    </div>
+                    <div class="navindicator">
+                        <div class="b-nav__intro navindicator__item"></div>
+                        <div class="b-nav__quickstart 
navindicator__item"></div>
+                        <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__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>
+                    </div>
+                </nav>
+            </div>
+            <div class="mdcontent">
+                <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="csdk-guide" class="anchor" href="#csdk-guide" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>CSDK Guide</h1>
+<p>CarbonData CSDK provides C++ interface to write and read carbon file.
+CSDK use JNI to invoke java SDK in C++ code.</p>
+<h1>
+<a id="csdk-reader" class="anchor" href="#csdk-reader" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>CSDK Reader</h1>
+<p>This CSDK reader reads CarbonData file and carbonindex file at a given path.
+External client can make use of this reader to read CarbonData files in C++
+code and without CarbonSession.</p>
+<p>In the carbon jars package, there exist a carbondata-sdk.jar,
+including SDK reader for CSDK.</p>
+<h2>
+<a id="quick-example" class="anchor" href="#quick-example" 
aria-hidden="true"><span aria-hidden="true" class="octicon 
octicon-link"></span></a>Quick example</h2>
+<pre><code>// 1. init JVM
+JavaVM *jvm;
+JNIEnv *initJVM() {
+    JNIEnv *env;
+    JavaVMInitArgs vm_args;
+    int parNum = 3;
+    int res;
+    JavaVMOption options[parNum];
+
+    options[0].optionString = "-Djava.compiler=NONE";
+    options[1].optionString = 
"-Djava.class.path=../../sdk/target/carbondata-sdk.jar";
+    options[2].optionString = "-verbose:jni";
+    vm_args.version = JNI_VERSION_1_8;
+    vm_args.nOptions = parNum;
+    vm_args.options = options;
+    vm_args.ignoreUnrecognized = JNI_FALSE;
+
+    res = JNI_CreateJavaVM(&amp;jvm, (void **) &amp;env, &amp;vm_args);
+    if (res &lt; 0) {
+        fprintf(stderr, "\nCan't create Java VM\n");
+        exit(1);
+    }
+
+    return env;
+}
+
+// 2. create carbon reader and read data 
+// 2.1 read data from local disk
+/**
+ * test read data from local disk, without projection
+ *
+ * @param env  jni env
+ * @return
+ */
+bool readFromLocalWithoutProjection(JNIEnv *env) {
+
+    CarbonReader carbonReaderClass;
+    carbonReaderClass.builder(env, "../resources/carbondata", "test");
+    carbonReaderClass.build();
+
+    while (carbonReaderClass.hasNext()) {
+        jobjectArray row = carbonReaderClass.readNextRow();
+        jsize length = env-&gt;GetArrayLength(row);
+        int j = 0;
+        for (j = 0; j &lt; length; j++) {
+            jobject element = env-&gt;GetObjectArrayElement(row, j);
+            char *str = (char *) env-&gt;GetStringUTFChars((jstring) element, 
JNI_FALSE);
+            printf("%s\t", str);
+        }
+        printf("\n");
+    }
+    carbonReaderClass.close();
+}
+
+// 2.2 read data from S3
+
+/**
+ * read data from S3
+ * parameter is ak sk endpoint
+ *
+ * @param env jni env
+ * @param argv argument vector
+ * @return
+ */
+bool readFromS3(JNIEnv *env, char *argv[]) {
+    CarbonReader reader;
+
+    char *args[3];
+    // "your access key"
+    args[0] = argv[1];
+    // "your secret key"
+    args[1] = argv[2];
+    // "your endPoint"
+    args[2] = argv[3];
+
+    reader.builder(env, "s3a://sdk/WriterOutput", "test");
+    reader.withHadoopConf(3, args);
+    reader.build();
+    printf("\nRead data from S3:\n");
+    while (reader.hasNext()) {
+        jobjectArray row = reader.readNextRow();
+        jsize length = env-&gt;GetArrayLength(row);
+
+        int j = 0;
+        for (j = 0; j &lt; length; j++) {
+            jobject element = env-&gt;GetObjectArrayElement(row, j);
+            char *str = (char *) env-&gt;GetStringUTFChars((jstring) element, 
JNI_FALSE);
+            printf("%s\t", str);
+        }
+        printf("\n");
+    }
+
+    reader.close();
+}
+
+// 3. destory JVM
+    (jvm)-&gt;DestroyJavaVM();
+</code></pre>
+<p>Find example code at main.cpp of CSDK module</p>
+<h2>
+<a id="api-list" class="anchor" href="#api-list" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>API List</h2>
+<pre><code>    /**
+     * create a CarbonReaderBuilder object for building carbonReader,
+     * CarbonReaderBuilder object  can configure different parameter
+     *
+     * @param env JNIEnv
+     * @param path data store path
+     * @param tableName table name
+     * @return CarbonReaderBuilder object
+     */
+    jobject builder(JNIEnv *env, char *path, char *tableName);
+
+    /**
+     * Configure the projection column names of carbon reader
+     *
+     * @param argc argument counter
+     * @param argv argument vector
+     * @return CarbonReaderBuilder object
+     */
+    jobject projection(int argc, char *argv[]);
+
+    /**
+     *  build carbon reader with argument vector
+     *  it support multiple parameter
+     *  like: key=value
+     *  for example: fs.s3a.access.key=XXXX, XXXX is user's access key value
+     *
+     * @param argc argument counter
+     * @param argv argument vector
+     * @return CarbonReaderBuilder object
+     **/
+    jobject withHadoopConf(int argc, char *argv[]);
+
+    /**
+     * build carbonReader object for reading data
+     * it support read data from load disk
+     *
+     * @return carbonReader object
+     */
+    jobject build();
+
+    /**
+     * Whether it has next row data
+     *
+     * @return boolean value, if it has next row, return true. if it hasn't 
next row, return false.
+     */
+    jboolean hasNext();
+
+    /**
+     * read next row from data
+     *
+     * @return object array of one row
+     */
+    jobjectArray readNextRow();
+
+    /**
+     * close the carbon reader
+     *
+     * @return  boolean value
+     */
+    jboolean close();
+
+</code></pre>
+<script>
+$(function() {
+  // Show selected style on nav item
+  $('.b-nav__api').addClass('selected');
+
+  if (!$('.b-nav__api').parent().hasClass('nav__item__with__subs--expanded')) {
+    // Display api subnav items
+    $('.b-nav__api').parent().toggleClass('nav__item__with__subs--expanded');
+  }
+});
+</script></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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/6ad7599a/src/main/webapp/bloomfilter-datamap-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/bloomfilter-datamap-guide.html 
b/src/main/webapp/bloomfilter-datamap-guide.html
index 8030599..2ecfa44 100644
--- a/src/main/webapp/bloomfilter-datamap-guide.html
+++ b/src/main/webapp/bloomfilter-datamap-guide.html
@@ -52,6 +52,9 @@
                            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.5.0/";
+                                   target="_blank">Apache CarbonData 
1.5.0</a></li>
+                            <li>
                                 <a 
href="https://dist.apache.org/repos/dist/release/carbondata/1.4.1/";
                                    target="_blank">Apache CarbonData 
1.4.1</a></li>
                                                        <li>
@@ -179,7 +182,12 @@
                                 <a class="nav__item nav__sub__item" 
href="./timeseries-datamap-guide.html">Time Series</a>
                             </div>
 
-                            <a class="b-nav__api nav__item" 
href="./sdk-guide.html">API</a>
+                            <div class="nav__item nav__item__with__subs">
+                                <a class="b-nav__api nav__item 
nav__sub__anchor" href="./sdk-guide.html">API</a>
+                                <a class="nav__item nav__sub__item" 
href="./sdk-guide.html">Java SDK</a>
+                                <a class="nav__item nav__sub__item" 
href="./CSDK-guide.html">C++ SDK</a>
+                            </div>
+
                             <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>
@@ -211,7 +219,7 @@
                                 <div class="col-sm-12  col-md-12">
                                     <div>
 <h1>
-<a id="carbondata-bloomfilter-datamap-alpha-feature" class="anchor" 
href="#carbondata-bloomfilter-datamap-alpha-feature" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>CarbonData 
BloomFilter DataMap (Alpha Feature)</h1>
+<a id="carbondata-bloomfilter-datamap" class="anchor" 
href="#carbondata-bloomfilter-datamap" aria-hidden="true"><span 
aria-hidden="true" class="octicon octicon-link"></span></a>CarbonData 
BloomFilter DataMap</h1>
 <ul>
 <li><a href="#datamap-management">DataMap Management</a></li>
 <li><a href="#bloomfilter-datamap-introduction">BloomFilter Datamap 
Introduction</a></li>
@@ -238,7 +246,7 @@ ON TABLE main_table
 </code></pre>
 <p>Disable Datamap</p>
 <blockquote>
-<p>The datamap by default is enabled. To support tuning on query, we can 
disable a specific datamap during query to observe whether we can gain 
performance enhancement from it. This will only take effect current session.</p>
+<p>The datamap by default is enabled. To support tuning on query, we can 
disable a specific datamap during query to observe whether we can gain 
performance enhancement from it. This is effective only for current session.</p>
 </blockquote>
 <pre><code>// disable the datamap
 SET carbon.datamap.visible.dbName.tableName.dataMapName = false
@@ -268,7 +276,7 @@ and we always query on <code>id</code> and 
<code>name</code> with precise value.
 since <code>id</code> is in the sort_columns and it is orderd,
 query on it will be fast because CarbonData can skip all the irrelative 
blocklets.
 But queries on <code>name</code> may be bad since the blocklet minmax may not 
help,
-because in each blocklet the range of the value of <code>name</code> may be 
the same -- all from A<em>~z</em>.
+because in each blocklet the range of the value of <code>name</code> may be 
the same -- all from A* to z*.
 In this case, user can create a BloomFilter datamap on column 
<code>name</code>.
 Moreover, user can also create a BloomFilter datamap on the sort_columns.
 This is useful if user has too many segments and the range of the value of 
sort_columns are almost the same.</p>

Reply via email to