You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2017/09/29 02:03:04 UTC
[1/2] carbondata-site git commit: Updated Website to CarbonData
Release 1.2.0
Repository: carbondata-site
Updated Branches:
refs/heads/asf-site 9fffc177d -> 172e90bd6
Updated Website to CarbonData Release 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/f4f90fac
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/f4f90fac
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/f4f90fac
Branch: refs/heads/asf-site
Commit: f4f90faca72efe3270fe1ba69bbe2add469bff65
Parents: 87359ad
Author: PallaviSingh1992 <pa...@yahoo.co.in>
Authored: Thu Sep 28 18:02:33 2017 +0530
Committer: PallaviSingh1992 <pa...@yahoo.co.in>
Committed: Thu Sep 28 18:02:33 2017 +0530
----------------------------------------------------------------------
src/main/scala/html/header.html | 3 +
src/main/webapp/configuration-parameters.html | 141 +++++++++++++++++--
src/main/webapp/data-management.html | 7 +-
.../webapp/ddl-operation-on-carbondata.html | 3 +
.../webapp/dml-operation-on-carbondata.html | 3 +
src/main/webapp/faq.html | 3 +
.../webapp/file-structure-of-carbondata.html | 3 +
src/main/webapp/index.html | 21 ++-
src/main/webapp/installation-guide.html | 8 +-
src/main/webapp/mainpage.html | 3 +
src/main/webapp/pdf/CarbonData-TPCH-Report.pdf | Bin 0 -> 175580 bytes
src/main/webapp/pdf/maven-pdf-plugin.pdf | Bin 235235 -> 240071 bytes
src/main/webapp/quick-start-guide.html | 3 +
src/main/webapp/security.html | 3 +
.../supported-data-types-in-carbondata.html | 3 +
src/main/webapp/troubleshooting.html | 3 +
src/main/webapp/useful-tips-on-carbondata.html | 3 +
src/main/webapp/videogallery.html | 3 +
18 files changed, 190 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/scala/html/header.html
----------------------------------------------------------------------
diff --git a/src/main/scala/html/header.html b/src/main/scala/html/header.html
index 895b704..39e5fda 100644
--- a/src/main/scala/html/header.html
+++ b/src/main/scala/html/header.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/configuration-parameters.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/configuration-parameters.html b/src/main/webapp/configuration-parameters.html
index c21d61a..0558bec 100644
--- a/src/main/webapp/configuration-parameters.html
+++ b/src/main/webapp/configuration-parameters.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
@@ -173,6 +176,7 @@
<li><a href="#performance-configuration">Performance Configuration</a></li>
<li><a href="#miscellaneous-configuration">Miscellaneous Configuration</a></li>
<li><a href="#spark-configuration">Spark Configuration</a></li>
+<li><a href="#dynamic-configuration-in-carbondata-using-set-reset">Dynamic Configuration In CarbonData Using SET-RESET</a></li>
</ul>
<h2>
<a id="system-configuration" class="anchor" href="#system-configuration" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>System Configuration</h2>
@@ -401,23 +405,11 @@
<td></td>
</tr>
<tr>
-<td>carbon.inmemory.record.size</td>
-<td>120000</td>
-<td>Number of records to be in memory while querying.</td>
-<td>Min=100000 and Max=240000</td>
-</tr>
-<tr>
<td>carbon.enable.quick.filter</td>
<td>false</td>
<td>Improves the performance of filter query.</td>
<td></td>
</tr>
-<tr>
-<td>no.of.cores.to.load.blocks.in.driver</td>
-<td>10</td>
-<td>Number of core to load the blocks in driver.</td>
-<td></td>
-</tr>
</tbody>
</table>
<h2>
@@ -622,6 +614,131 @@
</tr>
</tbody>
</table>
+<h2>
+<a id="dynamic-configuration-in-carbondata-using-set-reset" class="anchor" href="#dynamic-configuration-in-carbondata-using-set-reset" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Dynamic Configuration In CarbonData Using SET-RESET</h2>
+<p><strong>SET/RESET</strong> commands are used to add, update, display, or reset the carbondata properties dynamically without restarting the driver.</p>
+<p><strong>Syntax</strong></p>
+<ul>
+<li>
+<strong>Add or Update :</strong> This command adds or updates the value of parameter_name.</li>
+</ul>
+<pre><code>SET parameter_name=parameter_value
+</code></pre>
+<ul>
+<li>Display Property Value: This command displays the value of the specified parameter_name.</li>
+</ul>
+<pre><code>SET parameter_name
+</code></pre>
+<ul>
+<li>Display Session Parameters: This command displays all the supported session parameters.</li>
+</ul>
+<pre><code>SET
+</code></pre>
+<ul>
+<li>Display Session Parameters along with usage details: This command displays all the supported session parameters along with their usage details.</li>
+</ul>
+<pre><code>SET -v
+</code></pre>
+<ul>
+<li>Reset: This command clears all the session parameters.</li>
+</ul>
+<pre><code>RESET
+</code></pre>
+<p><strong>Parameter Description:</strong></p>
+<table>
+<thead>
+<tr>
+<th>Parameter</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>parameter_name</td>
+<td>Name of the property whose value needs to be dynamically added, updated, or displayed.</td>
+</tr>
+<tr>
+<td>parameter_value</td>
+<td>New value of the parameter_name to be set.</td>
+</tr>
+</tbody>
+</table>
+<p><b></b></p><p align="center">Dynamically Configurable Properties of CarbonData</p>
+<table>
+<thead>
+<tr>
+<th>Properties</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>carbon.options.bad.records.logger.enable</td>
+<td>To enable or disable bad record logger.</td>
+</tr>
+<tr>
+<td>carbon.options.bad.records.action</td>
+<td>This property can have four types of actions for bad records FORCE, REDIRECT, IGNORE and FAIL. If set to FORCE then it auto-corrects the data by storing the bad records as NULL. If set to REDIRECT then bad records are written to the raw CSV instead of being loaded. If set to IGNORE then bad records are neither loaded nor written to the raw CSV. If set to FAIL then data loading fails if any bad records are found.</td>
+</tr>
+<tr>
+<td>carbon.options.is.empty.data.bad.record</td>
+<td>If false, then empty ("" or '' or ,,) data will not be considered as bad record and vice versa.</td>
+</tr>
+<tr>
+<td>carbon.options.sort.scope</td>
+<td>This property can have four possible values BATCH_SORT, LOCAL_SORT, GLOBAL_SORT and NO_SORT. If set to BATCH_SORT, the sorting scope is smaller and more index tree will be created,thus loading is faster but query maybe slower. If set to LOCAL_SORT, the sorting scope is bigger and one index tree per data node will be created, thus loading is slower but query is faster. If set to GLOBAL_SORT, the sorting scope is bigger and one index tree per task will be created, thus loading is slower but query is faster. If set to NO_SORT data will be loaded in unsorted manner.</td>
+</tr>
+<tr>
+<td>carbon.options.batch.sort.size.inmb</td>
+<td>Size of batch data to keep in memory, as a thumb rule it supposed to be less than 45% of sort.inmemory.size.inmb otherwise it may spill intermediate data to disk.</td>
+</tr>
+<tr>
+<td>carbon.options.single.pass</td>
+<td>Single Pass Loading enables single job to finish data loading with dictionary generation on the fly. It enhances performance in the scenarios where the subsequent data loading after initial load involves fewer incremental updates on the dictionary. This option specifies whether to use single pass for loading data or not. By default this option is set to FALSE.</td>
+</tr>
+<tr>
+<td>carbon.options.bad.record.path</td>
+<td>Specifies the HDFS path where bad records needs to be stored.</td>
+</tr>
+<tr>
+<td>carbon.options.global.sort.partitions</td>
+<td>The Number of partitions to use when shuffling data for sort. If user don't configurate or configurate it less than 1, it uses the number of map tasks as reduce tasks. In general, we recommend 2-3 tasks per CPU core in your cluster.</td>
+</tr>
+<tr>
+<td>carbon.custom.block.distribution</td>
+<td>Specifies whether to use the Spark or Carbon block distribution feature.</td>
+</tr>
+<tr>
+<td>enable.unsafe.sort</td>
+<td>Specifies whether to use unsafe sort during data loading. Unsafe sort reduces the garbage collection during data load operation, resulting in better performance.</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Examples:</strong></p>
+<ul>
+<li>Add or Update:</li>
+</ul>
+<pre><code>SET enable.unsafe.sort =true
+</code></pre>
+<ul>
+<li>Display Property Value:</li>
+</ul>
+<pre><code>SET enable.unsafe.sort
+</code></pre>
+<ul>
+<li>Reset:</li>
+</ul>
+<pre><code>RESET
+</code></pre>
+<p><strong>System Response:</strong></p>
+<ul>
+<li>
+<p>Success will be recorded in the driver log.</p>
+</li>
+<li>
+<p>Failure will be displayed in the UI.</p>
+</li>
+</ul>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/data-management.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/data-management.html b/src/main/webapp/data-management.html
index ec1d60c..93528d8 100644
--- a/src/main/webapp/data-management.html
+++ b/src/main/webapp/data-management.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
@@ -298,7 +301,7 @@ The status of deleted segment is updated to Marked for delete / Marked for Updat
<p>Example :</p>
<pre><code>CLEAN FILES FOR TABLE table1
</code></pre>
-<p>This DML will physically delete the segment which are "Marked for delete" immediately.</p>
+<p>This DML will physically delete the segment which are "Marked for delete" and "Compacted" immediately.</p>
<h2>
<a id="compacting-data" class="anchor" href="#compacting-data" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Compacting Data</h2>
<ul>
@@ -344,7 +347,7 @@ run parallel with data load. There are 2 levels in minor compaction.</p>
<td>carbon.compaction.level.threshold</td>
<td>4, 3</td>
<td>Minor</td>
-<td>This property is for minor compaction which decides how many segments to be merged. Example: If it is set as 2, 3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment.</td>
+<td>This property is for minor compaction which decides how many segments to be merged. Example: If it is set as "2, 3", then minor compaction will be triggered for every 2 segments in level 1. 3 is the number of level 1 compacted segment which is further compacted to new segment in level 2.</td>
<td>NA</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/ddl-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/ddl-operation-on-carbondata.html b/src/main/webapp/ddl-operation-on-carbondata.html
index 8f82fbf..444428f 100644
--- a/src/main/webapp/ddl-operation-on-carbondata.html
+++ b/src/main/webapp/ddl-operation-on-carbondata.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/dml-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/dml-operation-on-carbondata.html b/src/main/webapp/dml-operation-on-carbondata.html
index 371e8c8..b6a5642 100644
--- a/src/main/webapp/dml-operation-on-carbondata.html
+++ b/src/main/webapp/dml-operation-on-carbondata.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/faq.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/faq.html b/src/main/webapp/faq.html
index 4e8ce49..6c22aac 100644
--- a/src/main/webapp/faq.html
+++ b/src/main/webapp/faq.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/file-structure-of-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/file-structure-of-carbondata.html b/src/main/webapp/file-structure-of-carbondata.html
index 449771e..2db223a 100644
--- a/src/main/webapp/file-structure-of-carbondata.html
+++ b/src/main/webapp/file-structure-of-carbondata.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 5cfee75..40ab6b5 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -54,6 +54,9 @@
class="caret"></span></a>
<ul class="dropdown-menu">
<li>
+ <a href="https://dist.apache.org/repos/dist/release/carbondata/1.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
@@ -316,6 +319,13 @@
</h4>
<div class="linkblock">
<div class="block-row">
+ <a href="https://dist.apache.org/repos/dist/release/carbondata/1.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a>
+ <span class="release-date">Sept 2017</span>
+ <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Apache+CarbonData+1.2.0+Release"
+ class="whatsnew" target="_blank">what's new</a>
+ </div>
+ <div class="block-row">
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a>
<span class="release-date">July 2017</span>
@@ -329,13 +339,6 @@
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Apache+CarbonData+1.1.0+Release"
class="whatsnew" target="_blank">what's new</a>
</div>
- <div class="block-row">
- <a href="http://archive.apache.org/dist/incubator/carbondata/1.0.0-incubating/"
- target="_blank">Apache CarbonData 1.0.0-incubating</a>
- <span class="release-date">Jan 2017</span>
- <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Apache+CarbonData+1.0.0-incubating"
- class="whatsnew" target="_blank">what's new</a>
- </div>
</div>
</div>
<div class="nextR">
@@ -367,6 +370,10 @@
target="_blank"><i class="fa fa-file-pdf-o icon-margin-r"
aria-hidden="true"></i></i> Download Documentation
</a>
+ <a href="pdf/CarbonData-TPCH-Report.pdf" class="quickstart-btn"
+ target="_blank"><i class="fa fa-file-pdf-o icon-margin-r"
+ aria-hidden="true"></i></i> CarbonData TPCH Report
+ </a>
</div>
</div>
</div><!-- latest release -->
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/installation-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/installation-guide.html b/src/main/webapp/installation-guide.html
index 3bfcba2..d8c0413 100644
--- a/src/main/webapp/installation-guide.html
+++ b/src/main/webapp/installation-guide.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
@@ -432,10 +435,11 @@ hdfs://<host_name>:port/user/hive/warehouse/carbon.store
<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
- ./bin/beeline jdbc:hive2://<thriftserver_host>:port
+ ./sbin/start-thriftserver.sh
+ ./bin/beeline -u jdbc:hive2://<thriftserver_host>:port
Example
- ./bin/beeline jdbc:hive2://10.10.10.10:10000
+ ./bin/beeline -u jdbc:hive2://10.10.10.10:10000
</code></pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/mainpage.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/mainpage.html b/src/main/webapp/mainpage.html
index f0056fe..4905f6f 100644
--- a/src/main/webapp/mainpage.html
+++ b/src/main/webapp/mainpage.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/pdf/CarbonData-TPCH-Report.pdf
----------------------------------------------------------------------
diff --git a/src/main/webapp/pdf/CarbonData-TPCH-Report.pdf b/src/main/webapp/pdf/CarbonData-TPCH-Report.pdf
new file mode 100644
index 0000000..b503bb0
Binary files /dev/null and b/src/main/webapp/pdf/CarbonData-TPCH-Report.pdf differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/pdf/maven-pdf-plugin.pdf
----------------------------------------------------------------------
diff --git a/src/main/webapp/pdf/maven-pdf-plugin.pdf b/src/main/webapp/pdf/maven-pdf-plugin.pdf
index 170d4d6..32f652f 100644
Binary files a/src/main/webapp/pdf/maven-pdf-plugin.pdf and b/src/main/webapp/pdf/maven-pdf-plugin.pdf differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/quick-start-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/quick-start-guide.html b/src/main/webapp/quick-start-guide.html
index 633fb3f..c084919 100644
--- a/src/main/webapp/quick-start-guide.html
+++ b/src/main/webapp/quick-start-guide.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/security.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/security.html b/src/main/webapp/security.html
index cde2a24..56ec55e 100644
--- a/src/main/webapp/security.html
+++ b/src/main/webapp/security.html
@@ -45,6 +45,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/supported-data-types-in-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/supported-data-types-in-carbondata.html b/src/main/webapp/supported-data-types-in-carbondata.html
index 6d43c99..9c43a20 100644
--- a/src/main/webapp/supported-data-types-in-carbondata.html
+++ b/src/main/webapp/supported-data-types-in-carbondata.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/troubleshooting.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/troubleshooting.html b/src/main/webapp/troubleshooting.html
index d9a66cf..a61ddb9 100644
--- a/src/main/webapp/troubleshooting.html
+++ b/src/main/webapp/troubleshooting.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/useful-tips-on-carbondata.html b/src/main/webapp/useful-tips-on-carbondata.html
index a0e636f..c333517 100644
--- a/src/main/webapp/useful-tips-on-carbondata.html
+++ b/src/main/webapp/useful-tips-on-carbondata.html
@@ -51,6 +51,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f4f90fac/src/main/webapp/videogallery.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/videogallery.html b/src/main/webapp/videogallery.html
index 4a21372..154aad2 100644
--- a/src/main/webapp/videogallery.html
+++ b/src/main/webapp/videogallery.html
@@ -49,6 +49,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.2.0/"
+ target="_blank">Apache CarbonData 1.2.0</a></li>
+ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
[2/2] carbondata-site git commit: Updated Website for CarbonData
Release 1.2.0
Posted by ch...@apache.org.
Updated Website for CarbonData Release 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/172e90bd
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/172e90bd
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/172e90bd
Branch: refs/heads/asf-site
Commit: 172e90bd6358cb5169aa773879739ec21b4eaafd
Parents: 9fffc17 f4f90fa
Author: chenliang613 <ch...@apache.org>
Authored: Fri Sep 29 10:02:51 2017 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Sep 29 10:02:51 2017 +0800
----------------------------------------------------------------------
content/configuration-parameters.html | 3 +++
content/data-management.html | 3 +++
content/ddl-operation-on-carbondata.html | 3 +++
content/dml-operation-on-carbondata.html | 3 +++
content/faq.html | 3 +++
content/file-structure-of-carbondata.html | 3 +++
content/index.html | 21 ++++++++++++-------
content/installation-guide.html | 3 +++
content/mainpage.html | 3 +++
content/pdf/CarbonData-TPCH-Report.pdf | Bin 0 -> 175580 bytes
content/quick-start-guide.html | 3 +++
content/security.html | 3 +++
content/supported-data-types-in-carbondata.html | 3 +++
content/troubleshooting.html | 3 +++
content/useful-tips-on-carbondata.html | 3 +++
content/videogallery.html | 3 +++
src/main/scala/html/header.html | 3 +++
src/main/webapp/configuration-parameters.html | 3 +++
src/main/webapp/data-management.html | 3 +++
.../webapp/ddl-operation-on-carbondata.html | 3 +++
.../webapp/dml-operation-on-carbondata.html | 3 +++
src/main/webapp/faq.html | 3 +++
.../webapp/file-structure-of-carbondata.html | 3 +++
src/main/webapp/index.html | 21 ++++++++++++-------
src/main/webapp/installation-guide.html | 3 +++
src/main/webapp/mainpage.html | 3 +++
src/main/webapp/pdf/CarbonData-TPCH-Report.pdf | Bin 0 -> 175580 bytes
src/main/webapp/quick-start-guide.html | 3 +++
src/main/webapp/security.html | 3 +++
.../supported-data-types-in-carbondata.html | 3 +++
src/main/webapp/troubleshooting.html | 3 +++
src/main/webapp/useful-tips-on-carbondata.html | 3 +++
src/main/webapp/videogallery.html | 3 +++
33 files changed, 115 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/configuration-parameters.html
----------------------------------------------------------------------
diff --cc content/configuration-parameters.html
index 9adaac3,c21d61a..0558bec
--- a/content/configuration-parameters.html
+++ b/content/configuration-parameters.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/data-management.html
----------------------------------------------------------------------
diff --cc content/data-management.html
index 1396652,ec1d60c..93528d8
--- a/content/data-management.html
+++ b/content/data-management.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/ddl-operation-on-carbondata.html
----------------------------------------------------------------------
diff --cc content/ddl-operation-on-carbondata.html
index 8f82fbf,8f82fbf..444428f
--- a/content/ddl-operation-on-carbondata.html
+++ b/content/ddl-operation-on-carbondata.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/dml-operation-on-carbondata.html
----------------------------------------------------------------------
diff --cc content/dml-operation-on-carbondata.html
index 371e8c8,371e8c8..b6a5642
--- a/content/dml-operation-on-carbondata.html
+++ b/content/dml-operation-on-carbondata.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/faq.html
----------------------------------------------------------------------
diff --cc content/faq.html
index 4e8ce49,4e8ce49..6c22aac
--- a/content/faq.html
+++ b/content/faq.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/file-structure-of-carbondata.html
----------------------------------------------------------------------
diff --cc content/file-structure-of-carbondata.html
index 449771e,449771e..2db223a
--- a/content/file-structure-of-carbondata.html
+++ b/content/file-structure-of-carbondata.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/index.html
----------------------------------------------------------------------
diff --cc content/index.html
index 5cfee75,5cfee75..40ab6b5
--- a/content/index.html
+++ b/content/index.html
@@@ -54,6 -54,6 +54,9 @@@
class="caret"></span></a>
<ul class="dropdown-menu">
<li>
++ <a href="https://dist.apache.org/repos/dist/release/carbondata/1.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
@@@ -316,6 -316,6 +319,13 @@@
</h4>
<div class="linkblock">
<div class="block-row">
++ <a href="https://dist.apache.org/repos/dist/release/carbondata/1.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a>
++ <span class="release-date">Sept 2017</span>
++ <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Apache+CarbonData+1.2.0+Release"
++ class="whatsnew" target="_blank">what's new</a>
++ </div>
++ <div class="block-row">
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a>
<span class="release-date">July 2017</span>
@@@ -329,13 -329,13 +339,6 @@@
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Apache+CarbonData+1.1.0+Release"
class="whatsnew" target="_blank">what's new</a>
</div>
-- <div class="block-row">
-- <a href="http://archive.apache.org/dist/incubator/carbondata/1.0.0-incubating/"
-- target="_blank">Apache CarbonData 1.0.0-incubating</a>
-- <span class="release-date">Jan 2017</span>
-- <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Apache+CarbonData+1.0.0-incubating"
-- class="whatsnew" target="_blank">what's new</a>
-- </div>
</div>
</div>
<div class="nextR">
@@@ -367,6 -367,6 +370,10 @@@
target="_blank"><i class="fa fa-file-pdf-o icon-margin-r"
aria-hidden="true"></i></i> Download Documentation
</a>
++ <a href="pdf/CarbonData-TPCH-Report.pdf" class="quickstart-btn"
++ target="_blank"><i class="fa fa-file-pdf-o icon-margin-r"
++ aria-hidden="true"></i></i> CarbonData TPCH Report
++ </a>
</div>
</div>
</div><!-- latest release -->
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/installation-guide.html
----------------------------------------------------------------------
diff --cc content/installation-guide.html
index 12f0a7f,3bfcba2..d8c0413
--- a/content/installation-guide.html
+++ b/content/installation-guide.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/mainpage.html
----------------------------------------------------------------------
diff --cc content/mainpage.html
index 1127f9f,f0056fe..463f92d
--- a/content/mainpage.html
+++ b/content/mainpage.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/pdf/CarbonData-TPCH-Report.pdf
----------------------------------------------------------------------
diff --cc content/pdf/CarbonData-TPCH-Report.pdf
index 0000000,0000000..b503bb0
new file mode 100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/quick-start-guide.html
----------------------------------------------------------------------
diff --cc content/quick-start-guide.html
index 633fb3f,633fb3f..c084919
--- a/content/quick-start-guide.html
+++ b/content/quick-start-guide.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/security.html
----------------------------------------------------------------------
diff --cc content/security.html
index cde2a24,cde2a24..56ec55e
--- a/content/security.html
+++ b/content/security.html
@@@ -45,6 -45,6 +45,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/supported-data-types-in-carbondata.html
----------------------------------------------------------------------
diff --cc content/supported-data-types-in-carbondata.html
index 6d43c99,6d43c99..9c43a20
--- a/content/supported-data-types-in-carbondata.html
+++ b/content/supported-data-types-in-carbondata.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/troubleshooting.html
----------------------------------------------------------------------
diff --cc content/troubleshooting.html
index d9a66cf,d9a66cf..a61ddb9
--- a/content/troubleshooting.html
+++ b/content/troubleshooting.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --cc content/useful-tips-on-carbondata.html
index a0e636f,a0e636f..c333517
--- a/content/useful-tips-on-carbondata.html
+++ b/content/useful-tips-on-carbondata.html
@@@ -51,6 -51,6 +51,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/content/videogallery.html
----------------------------------------------------------------------
diff --cc content/videogallery.html
index 4a21372,4a21372..154aad2
--- a/content/videogallery.html
+++ b/content/videogallery.html
@@@ -49,6 -49,6 +49,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.2.0/"
++ target="_blank">Apache CarbonData 1.2.0</a></li>
++ <li>
<a href="https://dist.apache.org/repos/dist/release/carbondata/1.1.1/"
target="_blank">Apache CarbonData 1.1.1</a></li>
<li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/172e90bd/src/main/webapp/mainpage.html
----------------------------------------------------------------------