This is an automated email from the ASF dual-hosted git repository.
ajantha pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/carbondata-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ee3f966 Updated website for carbondata-2.1.1 release (#79)
ee3f966 is described below
commit ee3f966dc08453d45a9b5f30c10e964f094fbbf9
Author: ajantha-bhat <[email protected]>
AuthorDate: Wed Mar 31 12:32:47 2021 +0530
Updated website for carbondata-2.1.1 release (#79)
This closes #79
---
content/alluxio-guide.html | 3 +
content/bloomfilter-index-guide.html | 3 +
content/carbon-as-spark-datasource-guide.html | 3 +
content/configuration-parameters.html | 10 +-
content/csdk-guide.html | 3 +
content/ddl-of-carbondata.html | 3 +
content/dml-of-carbondata.html | 3 +
content/documentation.html | 3 +
content/faq.html | 3 +
content/file-structure-of-carbondata.html | 3 +
content/flink-integration-guide.html | 3 +
content/hive-guide.html | 3 +
.../how-to-contribute-to-apache-carbondata.html | 3 +
content/index-developer-guide.html | 3 +
content/index-management.html | 3 +
content/index-server.html | 3 +
content/index.html | 12 ++-
content/introduction.html | 3 +
content/language-manual.html | 3 +
content/lucene-index-guide.html | 3 +
content/mv-guide.html | 3 +
content/performance-tuning.html | 3 +
content/prestodb-guide.html | 3 +
content/prestosql-guide.html | 3 +
content/quick-start-guide.html | 3 +
content/release-guide.html | 3 +
content/s3-guide.html | 3 +
content/scd-and-cdc-guide.html | 3 +
content/sdk-guide.html | 3 +
content/secondary-index-guide.html | 3 +
content/security.html | 3 +
content/segment-management-on-carbondata.html | 3 +
content/spatial-index-guide.html | 3 +
content/streaming-guide.html | 3 +
content/supported-data-types-in-carbondata.html | 3 +
content/usecases.html | 3 +
content/videogallery.html | 3 +
src/main/scala/html/header.html | 3 +
src/main/webapp/alluxio-guide.html | 3 +
src/main/webapp/bloomfilter-index-guide.html | 3 +
.../webapp/carbon-as-spark-datasource-guide.html | 3 +
src/main/webapp/configuration-parameters.html | 10 +-
src/main/webapp/csdk-guide.html | 3 +
src/main/webapp/ddl-of-carbondata.html | 3 +
src/main/webapp/dml-of-carbondata.html | 3 +
src/main/webapp/documentation.html | 3 +
src/main/webapp/faq.html | 3 +
src/main/webapp/file-structure-of-carbondata.html | 3 +
src/main/webapp/flink-integration-guide.html | 3 +
src/main/webapp/hive-guide.html | 3 +
.../how-to-contribute-to-apache-carbondata.html | 3 +
src/main/webapp/index-developer-guide.html | 3 +
src/main/webapp/index-management.html | 3 +
src/main/webapp/index-server.html | 3 +
src/main/webapp/index.html | 3 +
src/main/webapp/introduction.html | 3 +
src/main/webapp/language-manual.html | 3 +
src/main/webapp/lucene-index-guide.html | 3 +
src/main/webapp/mv-guide.html | 3 +
src/main/webapp/performance-tuning.html | 3 +
src/main/webapp/prestodb-guide.html | 3 +
src/main/webapp/prestosql-guide.html | 3 +
src/main/webapp/quick-start-guide.html | 3 +
src/main/webapp/release-guide.html | 3 +
src/main/webapp/s3-guide.html | 3 +
src/main/webapp/scd-and-cdc-guide.html | 3 +
src/main/webapp/sdk-guide.html | 3 +
src/main/webapp/secondary-index-guide.html | 3 +
src/main/webapp/security.html | 3 +
.../webapp/segment-management-on-carbondata.html | 3 +
src/main/webapp/spatial-index-guide.html | 3 +
src/main/webapp/streaming-guide.html | 3 +
.../webapp/supported-data-types-in-carbondata.html | 3 +
src/main/webapp/usecases.html | 3 +
src/main/webapp/videogallery.html | 3 +
src/site/markdown/clean-files.md | 104 +++++++++++++++++++++
src/site/markdown/configuration-parameters.md | 3 +-
src/site/markdown/ddl-of-carbondata.md | 4 +-
src/site/markdown/dml-of-carbondata.md | 6 ++
src/site/markdown/flink-integration-guide.md | 3 +-
src/site/markdown/quick-start-guide.md | 21 +++--
src/site/markdown/scd-and-cdc-guide.md | 38 +++++++-
src/site/markdown/spatial-index-guide.md | 88 ++++++++++++++---
83 files changed, 476 insertions(+), 39 deletions(-)
diff --git a/content/alluxio-guide.html b/content/alluxio-guide.html
index 12e4853..a4c9a0e 100644
--- a/content/alluxio-guide.html
+++ b/content/alluxio-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/bloomfilter-index-guide.html
b/content/bloomfilter-index-guide.html
index 0f67176..0c0646f 100644
--- a/content/bloomfilter-index-guide.html
+++ b/content/bloomfilter-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/carbon-as-spark-datasource-guide.html
b/content/carbon-as-spark-datasource-guide.html
index 741d65e..d1fc8f5 100644
--- a/content/carbon-as-spark-datasource-guide.html
+++ b/content/carbon-as-spark-datasource-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/configuration-parameters.html
b/content/configuration-parameters.html
index fc52318..50eea35 100644
--- a/content/configuration-parameters.html
+++ b/content/configuration-parameters.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
@@ -599,15 +602,10 @@
<tr>
<td>carbon.horizontal.compaction.enable</td>
<td>true</td>
-<td>CarbonData supports DELETE/UPDATE functionality by creating delta data
files for existing carbondata files. These delta files would grow as more
number of DELETE/UPDATE operations are performed. Compaction of these delta
files are termed as horizontal compaction. This configuration is used to turn
ON/OFF horizontal compaction. After every DELETE and UPDATE statement,
horizontal compaction may occur in case the delta (DELETE/ UPDATE) files
becomes more than specified threshold. <stron [...]
+<td>CarbonData supports DELETE/UPDATE functionality by creating delta data
files for existing carbondata files. These delta files would grow as more
number of DELETE/UPDATE operations are performed. Compaction of these delta
files are termed as horizontal compaction. This configuration is used to turn
ON/OFF horizontal compaction. After every DELETE and UPDATE statement,
horizontal compaction may occur in case the delta (DELETE/ UPDATE) files
becomes more than specified threshold. <stron [...]
</td>
</tr>
<tr>
-<td>carbon.horizontal.update.compaction.threshold</td>
-<td>1</td>
-<td>This configuration specifies the threshold limit on number of UPDATE delta
files within a segment. In case the number of delta files goes beyond the
threshold, the UPDATE delta files within the segment becomes eligible for
horizontal compaction and are compacted into single UPDATE delta file. Values
range between 1 to 10000.</td>
-</tr>
-<tr>
<td>carbon.horizontal.delete.compaction.threshold</td>
<td>1</td>
<td>This configuration specifies the threshold limit on number of DELETE delta
files within a block of a segment. In case the number of delta files goes
beyond the threshold, the DELETE delta files for the particular block of the
segment becomes eligible for horizontal compaction and are compacted into
single DELETE delta file. Values range between 1 to 10000.</td>
diff --git a/content/csdk-guide.html b/content/csdk-guide.html
index 9b8fadc..5b2c646 100644
--- a/content/csdk-guide.html
+++ b/content/csdk-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/ddl-of-carbondata.html b/content/ddl-of-carbondata.html
index 8ddb3f2..41e36f1 100644
--- a/content/ddl-of-carbondata.html
+++ b/content/ddl-of-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/dml-of-carbondata.html b/content/dml-of-carbondata.html
index e9b3118..2460027 100644
--- a/content/dml-of-carbondata.html
+++ b/content/dml-of-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/documentation.html b/content/documentation.html
index 8087eb9..ac907ba 100644
--- a/content/documentation.html
+++ b/content/documentation.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/faq.html b/content/faq.html
index 9fc4434..03ddd21 100644
--- a/content/faq.html
+++ b/content/faq.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/file-structure-of-carbondata.html
b/content/file-structure-of-carbondata.html
index 8668629..69ad35a 100644
--- a/content/file-structure-of-carbondata.html
+++ b/content/file-structure-of-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/flink-integration-guide.html
b/content/flink-integration-guide.html
index 0e681a9..eb229ac 100644
--- a/content/flink-integration-guide.html
+++ b/content/flink-integration-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/hive-guide.html b/content/hive-guide.html
index 7618b50..0b002b5 100644
--- a/content/hive-guide.html
+++ b/content/hive-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/how-to-contribute-to-apache-carbondata.html
b/content/how-to-contribute-to-apache-carbondata.html
index a9827b3..7792db1 100644
--- a/content/how-to-contribute-to-apache-carbondata.html
+++ b/content/how-to-contribute-to-apache-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/index-developer-guide.html
b/content/index-developer-guide.html
index 76266f7..c40d80c 100644
--- a/content/index-developer-guide.html
+++ b/content/index-developer-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/index-management.html b/content/index-management.html
index 5b7efb1..c69700e 100644
--- a/content/index-management.html
+++ b/content/index-management.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/index-server.html b/content/index-server.html
index ad2bf15..99c52b9 100644
--- a/content/index-server.html
+++ b/content/index-server.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/index.html b/content/index.html
index a87ed7a..153c4a4 100644
--- a/content/index.html
+++ b/content/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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
@@ -325,6 +328,13 @@
</h4>
<div class="linkblock">
<div class="block-row">
+ <a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a>
+ <span class="release-date">March
2021</span>
+ <a
href="https://cwiki.apache.org/confluence/display/CARBONDATA/Apache+CarbonData+2.1.1+Release";
+ class="whatsnew"
target="_blank">what's new</a>
+ </div>
+ <div class="block-row">
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a>
<span class="release-date">Nov
2020</span>
@@ -518,7 +528,7 @@
to do is:</p>
<ol class="orderlist">
<li>
- <a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
+ <a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.1/";
target="_blank">Download</a>the latest
release.
</li>
diff --git a/content/introduction.html b/content/introduction.html
index 5be5c75..2cd9e73 100644
--- a/content/introduction.html
+++ b/content/introduction.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/language-manual.html b/content/language-manual.html
index 0b24d0b..15456f6 100644
--- a/content/language-manual.html
+++ b/content/language-manual.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/lucene-index-guide.html b/content/lucene-index-guide.html
index 7fc584b..7934cb2 100644
--- a/content/lucene-index-guide.html
+++ b/content/lucene-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/mv-guide.html b/content/mv-guide.html
index 2e681b1..5bfb727 100644
--- a/content/mv-guide.html
+++ b/content/mv-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/performance-tuning.html b/content/performance-tuning.html
index 38a69b7..afd0791 100644
--- a/content/performance-tuning.html
+++ b/content/performance-tuning.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/prestodb-guide.html b/content/prestodb-guide.html
index dab6169..1d27a85 100644
--- a/content/prestodb-guide.html
+++ b/content/prestodb-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/prestosql-guide.html b/content/prestosql-guide.html
index 3087189..a930f3c 100644
--- a/content/prestosql-guide.html
+++ b/content/prestosql-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/quick-start-guide.html b/content/quick-start-guide.html
index 62cbe85..2c4d05a 100644
--- a/content/quick-start-guide.html
+++ b/content/quick-start-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/release-guide.html b/content/release-guide.html
index b113507..5b2e596 100644
--- a/content/release-guide.html
+++ b/content/release-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/s3-guide.html b/content/s3-guide.html
index caba809..3fa9496 100644
--- a/content/s3-guide.html
+++ b/content/s3-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/scd-and-cdc-guide.html b/content/scd-and-cdc-guide.html
index 10d2184..5af7498 100644
--- a/content/scd-and-cdc-guide.html
+++ b/content/scd-and-cdc-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/sdk-guide.html b/content/sdk-guide.html
index 3ac2a04..7aa487b 100644
--- a/content/sdk-guide.html
+++ b/content/sdk-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/secondary-index-guide.html
b/content/secondary-index-guide.html
index 467e361..67f1e9d 100644
--- a/content/secondary-index-guide.html
+++ b/content/secondary-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/security.html b/content/security.html
index e7ec8e1..7af56c9 100644
--- a/content/security.html
+++ b/content/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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/segment-management-on-carbondata.html
b/content/segment-management-on-carbondata.html
index 1c81c5f..3307f3e 100644
--- a/content/segment-management-on-carbondata.html
+++ b/content/segment-management-on-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/spatial-index-guide.html b/content/spatial-index-guide.html
index e747c20..22ac056 100644
--- a/content/spatial-index-guide.html
+++ b/content/spatial-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/streaming-guide.html b/content/streaming-guide.html
index 054d243..320ffc5 100644
--- a/content/streaming-guide.html
+++ b/content/streaming-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/supported-data-types-in-carbondata.html
b/content/supported-data-types-in-carbondata.html
index 6521a9b..93eee89 100644
--- a/content/supported-data-types-in-carbondata.html
+++ b/content/supported-data-types-in-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/usecases.html b/content/usecases.html
index c4adff6..8d77f3f 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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/content/videogallery.html b/content/videogallery.html
index fb0dc7f..ced7914 100644
--- a/content/videogallery.html
+++ b/content/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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/scala/html/header.html b/src/main/scala/html/header.html
index 8afd3da..e6dcbdd 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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/alluxio-guide.html
b/src/main/webapp/alluxio-guide.html
index 12e4853..a4c9a0e 100644
--- a/src/main/webapp/alluxio-guide.html
+++ b/src/main/webapp/alluxio-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/bloomfilter-index-guide.html
b/src/main/webapp/bloomfilter-index-guide.html
index 0f67176..0c0646f 100644
--- a/src/main/webapp/bloomfilter-index-guide.html
+++ b/src/main/webapp/bloomfilter-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/carbon-as-spark-datasource-guide.html
b/src/main/webapp/carbon-as-spark-datasource-guide.html
index 741d65e..d1fc8f5 100644
--- a/src/main/webapp/carbon-as-spark-datasource-guide.html
+++ b/src/main/webapp/carbon-as-spark-datasource-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/configuration-parameters.html
b/src/main/webapp/configuration-parameters.html
index fc52318..50eea35 100644
--- a/src/main/webapp/configuration-parameters.html
+++ b/src/main/webapp/configuration-parameters.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
@@ -599,15 +602,10 @@
<tr>
<td>carbon.horizontal.compaction.enable</td>
<td>true</td>
-<td>CarbonData supports DELETE/UPDATE functionality by creating delta data
files for existing carbondata files. These delta files would grow as more
number of DELETE/UPDATE operations are performed. Compaction of these delta
files are termed as horizontal compaction. This configuration is used to turn
ON/OFF horizontal compaction. After every DELETE and UPDATE statement,
horizontal compaction may occur in case the delta (DELETE/ UPDATE) files
becomes more than specified threshold. <stron [...]
+<td>CarbonData supports DELETE/UPDATE functionality by creating delta data
files for existing carbondata files. These delta files would grow as more
number of DELETE/UPDATE operations are performed. Compaction of these delta
files are termed as horizontal compaction. This configuration is used to turn
ON/OFF horizontal compaction. After every DELETE and UPDATE statement,
horizontal compaction may occur in case the delta (DELETE/ UPDATE) files
becomes more than specified threshold. <stron [...]
</td>
</tr>
<tr>
-<td>carbon.horizontal.update.compaction.threshold</td>
-<td>1</td>
-<td>This configuration specifies the threshold limit on number of UPDATE delta
files within a segment. In case the number of delta files goes beyond the
threshold, the UPDATE delta files within the segment becomes eligible for
horizontal compaction and are compacted into single UPDATE delta file. Values
range between 1 to 10000.</td>
-</tr>
-<tr>
<td>carbon.horizontal.delete.compaction.threshold</td>
<td>1</td>
<td>This configuration specifies the threshold limit on number of DELETE delta
files within a block of a segment. In case the number of delta files goes
beyond the threshold, the DELETE delta files for the particular block of the
segment becomes eligible for horizontal compaction and are compacted into
single DELETE delta file. Values range between 1 to 10000.</td>
diff --git a/src/main/webapp/csdk-guide.html b/src/main/webapp/csdk-guide.html
index 9b8fadc..5b2c646 100644
--- a/src/main/webapp/csdk-guide.html
+++ b/src/main/webapp/csdk-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/ddl-of-carbondata.html
b/src/main/webapp/ddl-of-carbondata.html
index 8ddb3f2..41e36f1 100644
--- a/src/main/webapp/ddl-of-carbondata.html
+++ b/src/main/webapp/ddl-of-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/dml-of-carbondata.html
b/src/main/webapp/dml-of-carbondata.html
index e9b3118..2460027 100644
--- a/src/main/webapp/dml-of-carbondata.html
+++ b/src/main/webapp/dml-of-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/documentation.html
b/src/main/webapp/documentation.html
index 8087eb9..ac907ba 100644
--- a/src/main/webapp/documentation.html
+++ b/src/main/webapp/documentation.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/faq.html b/src/main/webapp/faq.html
index 9fc4434..03ddd21 100644
--- a/src/main/webapp/faq.html
+++ b/src/main/webapp/faq.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/file-structure-of-carbondata.html
b/src/main/webapp/file-structure-of-carbondata.html
index 8668629..69ad35a 100644
--- a/src/main/webapp/file-structure-of-carbondata.html
+++ b/src/main/webapp/file-structure-of-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/flink-integration-guide.html
b/src/main/webapp/flink-integration-guide.html
index 0e681a9..eb229ac 100644
--- a/src/main/webapp/flink-integration-guide.html
+++ b/src/main/webapp/flink-integration-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/hive-guide.html b/src/main/webapp/hive-guide.html
index 7618b50..0b002b5 100644
--- a/src/main/webapp/hive-guide.html
+++ b/src/main/webapp/hive-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/how-to-contribute-to-apache-carbondata.html
b/src/main/webapp/how-to-contribute-to-apache-carbondata.html
index a9827b3..7792db1 100644
--- a/src/main/webapp/how-to-contribute-to-apache-carbondata.html
+++ b/src/main/webapp/how-to-contribute-to-apache-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/index-developer-guide.html
b/src/main/webapp/index-developer-guide.html
index 76266f7..c40d80c 100644
--- a/src/main/webapp/index-developer-guide.html
+++ b/src/main/webapp/index-developer-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/index-management.html
b/src/main/webapp/index-management.html
index 5b7efb1..c69700e 100644
--- a/src/main/webapp/index-management.html
+++ b/src/main/webapp/index-management.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/index-server.html
b/src/main/webapp/index-server.html
index ad2bf15..99c52b9 100644
--- a/src/main/webapp/index-server.html
+++ b/src/main/webapp/index-server.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index c197434..23ff97a 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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/introduction.html
b/src/main/webapp/introduction.html
index 5be5c75..2cd9e73 100644
--- a/src/main/webapp/introduction.html
+++ b/src/main/webapp/introduction.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/language-manual.html
b/src/main/webapp/language-manual.html
index 0b24d0b..15456f6 100644
--- a/src/main/webapp/language-manual.html
+++ b/src/main/webapp/language-manual.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/lucene-index-guide.html
b/src/main/webapp/lucene-index-guide.html
index 7fc584b..7934cb2 100644
--- a/src/main/webapp/lucene-index-guide.html
+++ b/src/main/webapp/lucene-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/mv-guide.html b/src/main/webapp/mv-guide.html
index 2e681b1..5bfb727 100644
--- a/src/main/webapp/mv-guide.html
+++ b/src/main/webapp/mv-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/performance-tuning.html
b/src/main/webapp/performance-tuning.html
index 38a69b7..afd0791 100644
--- a/src/main/webapp/performance-tuning.html
+++ b/src/main/webapp/performance-tuning.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/prestodb-guide.html
b/src/main/webapp/prestodb-guide.html
index dab6169..1d27a85 100644
--- a/src/main/webapp/prestodb-guide.html
+++ b/src/main/webapp/prestodb-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/prestosql-guide.html
b/src/main/webapp/prestosql-guide.html
index 3087189..a930f3c 100644
--- a/src/main/webapp/prestosql-guide.html
+++ b/src/main/webapp/prestosql-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/quick-start-guide.html
b/src/main/webapp/quick-start-guide.html
index 62cbe85..2c4d05a 100644
--- a/src/main/webapp/quick-start-guide.html
+++ b/src/main/webapp/quick-start-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/release-guide.html
b/src/main/webapp/release-guide.html
index b113507..5b2e596 100644
--- a/src/main/webapp/release-guide.html
+++ b/src/main/webapp/release-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/s3-guide.html b/src/main/webapp/s3-guide.html
index caba809..3fa9496 100644
--- a/src/main/webapp/s3-guide.html
+++ b/src/main/webapp/s3-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/scd-and-cdc-guide.html
b/src/main/webapp/scd-and-cdc-guide.html
index 10d2184..5af7498 100644
--- a/src/main/webapp/scd-and-cdc-guide.html
+++ b/src/main/webapp/scd-and-cdc-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/sdk-guide.html b/src/main/webapp/sdk-guide.html
index 3ac2a04..7aa487b 100644
--- a/src/main/webapp/sdk-guide.html
+++ b/src/main/webapp/sdk-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/secondary-index-guide.html
b/src/main/webapp/secondary-index-guide.html
index 467e361..67f1e9d 100644
--- a/src/main/webapp/secondary-index-guide.html
+++ b/src/main/webapp/secondary-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/security.html b/src/main/webapp/security.html
index e7ec8e1..7af56c9 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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/segment-management-on-carbondata.html
b/src/main/webapp/segment-management-on-carbondata.html
index 1c81c5f..3307f3e 100644
--- a/src/main/webapp/segment-management-on-carbondata.html
+++ b/src/main/webapp/segment-management-on-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/spatial-index-guide.html
b/src/main/webapp/spatial-index-guide.html
index e747c20..22ac056 100644
--- a/src/main/webapp/spatial-index-guide.html
+++ b/src/main/webapp/spatial-index-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/streaming-guide.html
b/src/main/webapp/streaming-guide.html
index 054d243..320ffc5 100644
--- a/src/main/webapp/streaming-guide.html
+++ b/src/main/webapp/streaming-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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/supported-data-types-in-carbondata.html
b/src/main/webapp/supported-data-types-in-carbondata.html
index 6521a9b..93eee89 100644
--- a/src/main/webapp/supported-data-types-in-carbondata.html
+++ b/src/main/webapp/supported-data-types-in-carbondata.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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/usecases.html b/src/main/webapp/usecases.html
index c4adff6..8d77f3f 100644
--- a/src/main/webapp/usecases.html
+++ b/src/main/webapp/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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/main/webapp/videogallery.html
b/src/main/webapp/videogallery.html
index fb0dc7f..ced7914 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/2.1.1/";
+ target="_blank">Apache CarbonData
2.1.1</a></li>
+ <li>
<a
href="https://dist.apache.org/repos/dist/release/carbondata/2.1.0/";
target="_blank">Apache CarbonData
2.1.0</a></li>
<li>
diff --git a/src/site/markdown/clean-files.md b/src/site/markdown/clean-files.md
new file mode 100644
index 0000000..e5bde49
--- /dev/null
+++ b/src/site/markdown/clean-files.md
@@ -0,0 +1,104 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+## CLEAN FILES
+
+Clean files command is used to remove the Compacted, Marked For Delete ,In
Progress which are stale and partial(Segments which are missing from the table
status file but their data is present)
+ segments from the store.
+
+ Clean Files Command
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME
+ ```
+The above clean files command will clean Marked For Delete and Compacted
segments depending on ```max.query.execution.time``` (default 1 hr) and ```
carbon.trash.retention.days``` (default 7 days). It will also delete the
timestamp subdirectories from the trash folder after expiration day(default 7
day, can be configured)
+
+**NOTE**:
+ * Clean files operation not supported on non transactional tables.
+ * Clean files operation not supported on tables with concurrent insert
overwrite operation.
+
+### TRASH FOLDER
+
+ Carbondata supports a Trash Folder which is used as a redundant folder where
all stale(segments whose entry is not in tablestatus file) carbondata segments
are moved to during clean files operation.
+ This trash folder is mantained inside the table path and is a hidden
folder(.Trash). The segments that are moved to the trash folder are mantained
under a timestamp
+ subfolder(each clean files operation is represented by a timestamp). This
helps the user to list down segments in the trash folder by timestamp. By
default all the timestamp sub-directory have an expiration
+ time of 7 days(since the timestamp it was created) and it can be configured
by the user using the following carbon property. The supported values are
between 0 and 365(both included.)
+ ```
+ carbon.trash.retention.days = "Number of days"
+ ```
+ Once the timestamp subdirectory is expired as per the configured expiration
day value, that subdirectory is deleted from the trash folder in the subsequent
clean files command.
+
+**NOTE**:
+ * In trash folder, the retention time is "carbon.trash.retention.days"
+ * Outside trash folder(Segment Directories in table path), the retention
time is Max("carbon.trash.retention.days", "max.query.execution.time")
+### FORCE OPTION
+The force option with clean files command deletes all the files and folders
from the trash folder and delete the Marked for Delete and Compacted segments
immediately. Since Clean Files operation with force option will delete data
that can never be recovered, the force option by default is disabled. Clean
files with force option is only allowed when the carbon property
```carbon.clean.file.force.allowed``` is set to true. The default value of this
property is false.
+
+
+
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME options('force'='true')
+ ```
+
+### STALE_INPROGRESS OPTION
+The stale_inprogress option deletes the stale Insert In Progress segments
after the expiration of the property ```carbon.trash.retention.days```
+
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME options('stale_inprogress'='true')
+ ```
+
+The stale_inprogress option with force option will delete Marked for delete,
Compacted and stale Insert In progress immediately. It will also empty the
trash folder immediately.
+
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME options('stale_inprogress'='true',
'force'='true')
+ ```
+### DRY RUN OPTION
+Clean files also support a dry run option which will let the user know how
much space will we freed
+during the actual clean files operation. The dry run operation will not delete
any data but will just give
+size based statistics on the data which will be cleaned in clean files. Dry
run operation will return two columns where the first will
+show how much space will be freed by that clean files operation and the second
column will show the
+remaining stale data(data which can be deleted but has not yet expired as per
the ```max.query.execution.time``` and ``` carbon.trash.retention.days``` values
+). By default the value of ```dryrun``` option is ```false```.
+
+Dry Run Operation is supported with four types of commands:
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME options('dryrun'='true')
+ ```
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME options('force'='true', 'dryrun'='true')
+ ```
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME
options('stale_inprogress'='true','dryrun'='true')
+ ```
+
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME options('stale_inprogress'='true',
'force'='true','dryrun'='true')
+ ```
+
+**NOTE**:
+ * Since the dry run operation will calculate size and will access File level
API's, the operation can
+ be a costly and a time consuming operation in case of tables with large
number of segments.
+ * When dry run is true, the statistics option will not matter.
+
+### SHOW STATISTICS
+Clean files operation tells how much size is freed during that operation to
the user. By default, the clean files operation
+will show the size freed statistics. Since calculating and showing statistics
can be a costly operation and reduce the performance of the
+clean files operation, the user can disable that option by using ```statistics
= false``` in the clean files options.
+
+ ```
+ CLEAN FILES FOR TABLE TABLE_NAME options('statistics'='false')
+ ```
+
\ No newline at end of file
diff --git a/src/site/markdown/configuration-parameters.md
b/src/site/markdown/configuration-parameters.md
index 1e4e9f3..911f6e3 100644
--- a/src/site/markdown/configuration-parameters.md
+++ b/src/site/markdown/configuration-parameters.md
@@ -102,8 +102,7 @@ This section provides the details of all the configurations
required for the Car
| carbon.number.of.cores.while.compacting | 2 | Number of cores to be used
while compacting data. This also determines the number of threads to be used to
read carbondata files in parallel. |
| carbon.compaction.level.threshold | 4, 3 | 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. This configuration is
for minor compaction which decides how many segments to be merged.
Configuration is of the form (x,y). Compaction will be triggered for every x
segments and form a single level 1 compacted segment. When the number of
compacted level 1 segments reach y, compact [...]
| carbon.major.compaction.size | 1024 | To improve query performance and all
the segments can be merged and compacted to a single segment upto configured
size. This Major compaction size can be configured using this parameter. Sum of
the segments which is below this threshold will be merged. This value is
expressed in MB. |
-| carbon.horizontal.compaction.enable | true | CarbonData supports
DELETE/UPDATE functionality by creating delta data files for existing
carbondata files. These delta files would grow as more number of DELETE/UPDATE
operations are performed. Compaction of these delta files are termed as
horizontal compaction. This configuration is used to turn ON/OFF horizontal
compaction. After every DELETE and UPDATE statement, horizontal compaction may
occur in case the delta (DELETE/ UPDATE) files be [...]
-| carbon.horizontal.update.compaction.threshold | 1 | This configuration
specifies the threshold limit on number of UPDATE delta files within a segment.
In case the number of delta files goes beyond the threshold, the UPDATE delta
files within the segment becomes eligible for horizontal compaction and are
compacted into single UPDATE delta file. Values range between 1 to 10000. |
+| carbon.horizontal.compaction.enable | true | CarbonData supports
DELETE/UPDATE functionality by creating delta data files for existing
carbondata files. These delta files would grow as more number of DELETE/UPDATE
operations are performed. Compaction of these delta files are termed as
horizontal compaction. This configuration is used to turn ON/OFF horizontal
compaction. After every DELETE and UPDATE statement, horizontal compaction may
occur in case the delta (DELETE/ UPDATE) files be [...]
| carbon.horizontal.delete.compaction.threshold | 1 | This configuration
specifies the threshold limit on number of DELETE delta files within a block of
a segment. In case the number of delta files goes beyond the threshold, the
DELETE delta files for the particular block of the segment becomes eligible for
horizontal compaction and are compacted into single DELETE delta file. Values
range between 1 to 10000. |
| carbon.update.segment.parallelism | 1 | CarbonData processes the UPDATE
operations by grouping records belonging to a segment into a single executor
task. When the amount of data to be updated is more, this behavior causes
problems like restarting of executor due to low memory and data-spill related
errors. This property specifies the parallelism for each segment during update.
**NOTE:** It is recommended to set this value to a multiple of the number of
executors for balance. Values ra [...]
| carbon.numberof.preserve.segments | 0 | If the user wants to preserve some
number of segments from being compacted then he can set this configuration.
Example: carbon.numberof.preserve.segments = 2 then 2 latest segments will
always be excluded from the compaction. No segments will be preserved by
default. **NOTE:** This configuration is useful when the chances of input data
can be wrong due to environment scenarios. Preserving some of the latest
segments from being compacted can help [...]
diff --git a/src/site/markdown/ddl-of-carbondata.md
b/src/site/markdown/ddl-of-carbondata.md
index 3165f4e..621f38c 100644
--- a/src/site/markdown/ddl-of-carbondata.md
+++ b/src/site/markdown/ddl-of-carbondata.md
@@ -284,9 +284,10 @@ CarbonData DDL statements are documented here,which
includes:
- ##### Table Compaction Configuration
These properties are table level compaction configurations, if not
specified, system level configurations in carbon.properties will be used.
- Following are 5 configurations:
+ Following are 6 configurations:
* MAJOR_COMPACTION_SIZE: same meaning as carbon.major.compaction.size,
size in MB.
+ * MINOR_COMPACTION_SIZE: same meaning as carbon.minor.compaction.size,
size in MB.
* AUTO_LOAD_MERGE: same meaning as carbon.enable.auto.load.merge.
* COMPACTION_LEVEL_THRESHOLD: same meaning as
carbon.compaction.level.threshold.
* COMPACTION_PRESERVE_SEGMENTS: same meaning as
carbon.numberof.preserve.segments.
@@ -294,6 +295,7 @@ CarbonData DDL statements are documented here,which
includes:
```
TBLPROPERTIES ('MAJOR_COMPACTION_SIZE'='2048',
+ 'MINOR_COMPACTION_SIZE'='4096',
'AUTO_LOAD_MERGE'='true',
'COMPACTION_LEVEL_THRESHOLD'='5,6',
'COMPACTION_PRESERVE_SEGMENTS'='10',
diff --git a/src/site/markdown/dml-of-carbondata.md
b/src/site/markdown/dml-of-carbondata.md
index 98a3289..f1307e1 100644
--- a/src/site/markdown/dml-of-carbondata.md
+++ b/src/site/markdown/dml-of-carbondata.md
@@ -512,6 +512,12 @@ CarbonData DML statements are documented here,which
includes:
If any segments are available to be merged, then compaction will run
parallel with data load, there are 2 levels in minor compaction:
* Level 1: Merging of the segments which are not yet compacted.
* Level 2: Merging of the compacted segments again to form a larger segment.
+
+ The segment whose data size exceed the limit of carbon.minor.compaction.size
will not be included
+ in minor compaction. User can control the size of a segment to be included
in the minor
+ compaction by using carbon.minor.compaction.size. If not configured, minor
compaction will
+ consider the segments based on carbon.compaction.level.threshold by
neglecting the size of
+ each segment.
```
ALTER TABLE table_name COMPACT 'MINOR'
diff --git a/src/site/markdown/flink-integration-guide.md
b/src/site/markdown/flink-integration-guide.md
index 0a11d6c..c5a01e4 100644
--- a/src/site/markdown/flink-integration-guide.md
+++ b/src/site/markdown/flink-integration-guide.md
@@ -23,7 +23,7 @@ limitations under the License.
## Usage scenarios
The CarbonData flink integration module is used to connect Flink and Carbon.
The module provides
- a set of Flink BulkWriter implementations (CarbonLocalWriter and
CarbonS3Writer). The data is processed
+ a set of Flink BulkWriter implementations (CarbonLocalWriter (for Local and
HDFS filesystems) and CarbonS3Writer). The data is processed
by the Flink, and finally written into the stage directory of the target
table by the CarbonXXXWriter.
By default, those data in table stage directory, can not be immediately
queried, those data can be queried
@@ -79,6 +79,7 @@ limitations under the License.
// Set the carbon properties here, such as date format, store location,
etc.
// Create carbon bulk writer factory. Two writer types are supported:
'Local' and 'S3'.
+ // Use CarbonWriterFactory.builder("Local") for Local and Hdfs File systems
val writerFactory = CarbonWriterFactory.builder("Local").build(
databaseName,
tableName,
diff --git a/src/site/markdown/quick-start-guide.md
b/src/site/markdown/quick-start-guide.md
index be8eb2a..a0218ed 100644
--- a/src/site/markdown/quick-start-guide.md
+++ b/src/site/markdown/quick-start-guide.md
@@ -47,7 +47,7 @@ CarbonData can be integrated with Spark, Presto, Flink and
Hive execution engine
[Installing and Configuring CarbonData on Spark on YARN
Cluster](#installing-and-configuring-carbondata-on-spark-on-yarn-cluster)
-[Installing and Configuring CarbonData Thrift Server for Query
Execution](#query-execution-using-carbondata-thrift-server)
+[Installing and Configuring CarbonData Thrift Server for Query
Execution](#query-execution-using-the-thrift-server)
#### Presto
@@ -154,7 +154,7 @@ val carbon =
SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession(
`SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession("<carbon_store_path>",
"<local metastore path>")`.
- Data storage location can be specified by `<carbon_store_path>`, like
`/carbon/data/store`, `hdfs://localhost:9000/carbon/data/store` or
`s3a://carbon/data/store`.
-###### Option 2: Using SparkSession with CarbonExtensions
+###### Option 2: Using SparkSession with CarbonExtensions(since 2.0)
Start Spark shell by running the following command in the Spark directory:
@@ -325,9 +325,17 @@ mv carbondata.tar.gz carbonlib/
-## Query Execution Using CarbonData Thrift Server
+## Query Execution Using the Thrift Server
-### Starting CarbonData Thrift Server.
+### Option 1: Starting Thrift Server with CarbonExtensions(since 2.0)
+```
+cd $SPARK_HOME
+./sbin/start-thriftserver.sh \
+--conf spark.sql.extensions=org.apache.spark.sql.CarbonExtensions \
+$SPARK_HOME/carbonlib/apache-carbondata-xxx.jar
+```
+
+### Option 2: Starting CarbonData Thrift Server
a. cd `$SPARK_HOME`
@@ -391,11 +399,10 @@ $SPARK_HOME/carbonlib/apache-carbondata-xxx.jar
$SPARK_HOME/carbonlib/apache-carbondata-xxx.jar
```
-### Connecting to CarbonData Thrift Server Using Beeline.
+### Connecting to Thrift Server Using Beeline.
```
cd $SPARK_HOME
-./sbin/start-thriftserver.sh
./bin/beeline -u jdbc:hive2://<thriftserver_host>:port
Example
@@ -443,4 +450,4 @@ Query from the available tables
select * from carbon_table;
```
-**Note:** Create Tables and data loads should be done before executing queries
as we can not create carbon table from this interface.
+**Note:** Create Tables and data loads should be done before executing queries
as we can not create carbon table from this interface.
\ No newline at end of file
diff --git a/src/site/markdown/scd-and-cdc-guide.md
b/src/site/markdown/scd-and-cdc-guide.md
index 892958b..bb6ceab 100644
--- a/src/site/markdown/scd-and-cdc-guide.md
+++ b/src/site/markdown/scd-and-cdc-guide.md
@@ -55,8 +55,42 @@ Below is the detailed description of the `merge` API
operation.
* `whenNotMatched` clause can have only the `insertExpr` action. The new
row is generated based on the specified column and corresponding expressions.
Users do not need to specify all the columns in the target table. For
unspecified target columns, NULL is inserted.
* `whenNotMatchedAndExistsOnlyOnTarget` clause is executed when row does not
match source and exists only in target. This clause can have only delete action.
-**NOTE:** SQL syntax for merge is not yet supported.
+#### MERGE SQL
+
+Below sql merges a set of updates, insertions, and deletions based on a source
table
+into a target carbondata table.
+
+```
+ MERGE INTO target_table_identifier
+ USING source_table_identifier
+ ON <merge_condition>
+ [ WHEN MATCHED [ AND <condition> ] THEN <matched_action> ]
+ [ WHEN MATCHED [ AND <condition> ] THEN <matched_action> ]
+ [ WHEN NOT MATCHED [ AND <condition> ] THEN <not_matched_action> ]
+```
+
+#### MERGE SQL Operation Semantics
+Below is the detailed description of the `merge` SQL operation.
+* `table_identifier` a table name, optionally qualified with a database name
+* `merge_condition` how the rows from one relation are combined with the rows
of another relation. An expression with a return type of Boolean.
+* `WHEN MATCHED` clauses are executed when a source row matches a target table
row based on the match condition,
+clauses can have at most one UPDATE and one DELETE action, These clauses have
the following semantics.
+ * The UPDATE action in merge only updates the specified columns of the
matched target row.
+ * The DELETE action will delete the matched row.
+ * WHEN MATCHED clauses can have at most one UPDATE and one DELETE action.
The UPDATE action in merge only updates the specified columns of the matched
target row. The DELETE action will delete the matched row.
+ * Each WHEN MATCHED clause can have an optional condition. If this clause
condition exists, the UPDATE or DELETE action is executed for any matching
source-target row pair row only when when the clause condition is true.
+ * If there are multiple WHEN MATCHED clauses, then they are evaluated in
order they are specified (that is, the order of the clauses matter). All WHEN
MATCHED clauses, except the last one, must have conditions.
+ * If both WHEN MATCHED clauses have conditions and neither of the
conditions are true for a matching source-target row pair, then the matched
target row is left unchanged.
+ * To update all the columns of the target carbondata table with the
corresponding columns of the source dataset, use UPDATE SET *. This is
equivalent to UPDATE SET col1 = source.col1 [, col2 = source.col2 ...] for all
the columns of the target carbondata table. Therefore, this action assumes that
the source table has the same columns as those in the target table, otherwise
the query will throw an analysis error.
+* `matched_action` can be DELETE | UPDATE SET * |UPDATE SET column1 = value1
[, column2 = value2 ...]
+* `WHEN NOT MATCHED` clause is executed when a source row does not match any
target row based on the match condition, these clauses have the following
semantics.
+ * WHEN NOT MATCHED clauses can only have the INSERT action. The new row is
generated based on the specified column and corresponding expressions. All the
columns in the target table do not need to be specified. For unspecified target
columns, NULL is inserted.
+ * Each WHEN NOT MATCHED clause can have an optional condition. If the
clause condition is present, a source row is inserted only if that condition is
true for that row. Otherwise, the source column is ignored.
+ * If there are multiple WHEN NOT MATCHED clauses, then they are evaluated
in order they are specified (that is, the order of the clauses matter). All
WHEN NOT MATCHED clauses, except the last one, must have conditions.
+ * To insert all the columns of the target carbondata table with the
corresponding columns of the source dataset, use INSERT *. This is equivalent
to INSERT (col1 [, col2 ...]) VALUES (source.col1 [, source.col2 ...]) for all
the columns of the target carbondata table. Therefore, this action assumes that
the source table has the same columns as those in the target table, otherwise
the query will throw an error.
+* `not_matched_action` can be INSERT * | INSERT (column1 [, column2 ...])
VALUES (value1 [, value2 ...])
##### Example code to implement cdc/scd scenario
-Please refer example class
[MergeTestCase](https://github.com/apache/carbondata/blob/master/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/merge/MergeTestCase.scala)
to understand and implement scd and cdc scenarios.
+Please refer example class
[MergeTestCase](https://github.com/apache/carbondata/blob/master/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/merge/MergeTestCase.scala)
to understand and implement scd and cdc scenarios using api.
+Please refer example class
[DataMergeIntoExample](https://github.com/apache/carbondata/blob/master/examples/spark/src/main/scala/org/apache/carbondata/examples/DataMergeIntoExample.scala)
to understand and implement scd and cdc scenarios using sql.
\ No newline at end of file
diff --git a/src/site/markdown/spatial-index-guide.md
b/src/site/markdown/spatial-index-guide.md
index f97ee38..60bc4ba 100644
--- a/src/site/markdown/spatial-index-guide.md
+++ b/src/site/markdown/spatial-index-guide.md
@@ -32,12 +32,28 @@ Below figure shows the relationship between the grid and
the points residing in
Carbon supports Polygon User Defined Function(UDF) as filter condition in the
query to return all the data points lying within it. Polygon UDF takes multiple
points(i.e., pair of longitude and latitude) separated by a comma. Longitude
and latitude in the pair are separated by a space. The first and last points in
the polygon must be same to form a closed loop. CarbonData builds a quad tree
using this polygon and spatial region information passed while creating a
table. The nodes in the q [...]
-The main reasons for faster query response are as follows :
-* Data is sorted based on the index values.
-* Polygon UDF filter is pushed down from engine to the carbon layer such that
CarbonData scans only matched blocklets avoiding full scan.
+There are some other UDFs supporting more filter conditions in the query,
including Polygon List, Polyline List, and spatial index range list.
+
+Polygon List UDF takes multiple polygons(i.e., a set of points) and operation
type for combining polygons. Only `OR` and `AND` are supported at present,
operation 'OR' means union of multiple polygons and 'AND' means intersection of
that, shown as the following figure. Then CarbonData gets the list of range of
indices from the combined region by quad tree, which is the same processing as
Polygon UDF.
+
+
+
+Polyline List UDF takes multiple polylines(i.e., a set of points) and buffer
in meter. CarbonData first converts polyline to polygon and then gets the list
of range of indices from these polygons. The processing is the same as Polygon
UDF and return all the data points lying within the buffer region of polylines.
+
+
+
+Polygon Range List UDF takes multiple range lists and operation type for
merging the range lists. **Range** is an area bounded by start spatial index
and end spatial index(i.e., minimum index and maximum index of range) in a quad
tree. **Range List** is internal representation of a range definition that may
contains one or multiple polygons. Operation includes `OR` and `AND` at
present, means the union and intersection set of multiple range lists. This UDF
returns all the data points who [...]
+
+
+
+The main reasons for faster query response are as follows :
+* Data is sorted based on the index values.
+* Above UDF filter is pushed down from engine to the carbon layer such that
CarbonData scans only matched blocklets avoiding full scan.
+
+Beside, CarbonData also provides some spatial conversion utils UDFs. Such as
converting spatial index to spatial grid coordinate x,y, converting spatial
index to longitude and latitude pair, converting longitude and latitude pair to
spatial index, converting spatial index to upper layer spatial index of pyramid
model, and converting input polygon string to list of range of indices.
# Installation and Deployment
@@ -56,26 +72,22 @@ create table source_index(id BIGINT, latitude long,
longitude long) stored by 'c
'SPATIAL_INDEX.mygeohash.sourcecolumns'='longitude, latitude',
'SPATIAL_INDEX.mygeohash.originLatitude'='19.832277',
'SPATIAL_INDEX.mygeohash.gridSize'='50',
-'SPATIAL_INDEX.mygeohash.minLongitude'='1.811865',
-'SPATIAL_INDEX.mygeohash.maxLongitude'='2.782233',
-'SPATIAL_INDEX.mygeohash.minLatitude'='19.832277',
-'SPATIAL_INDEX.mygeohash.maxLatitude'='20.225281',
'SPATIAL_INDEX.mygeohash.conversionRatio'='1000000');
```
-Note: `mygeohash` in the above example represent the index name.
+Note:
+ * `mygeohash` in the above example represent the index name.
+ * Columns present in spatial_index table properties cannot be altered
+ i.e., sourcecolumns: `longitude, latitude` and index column: `mygeohash`
in the above example.
#### List of spatial index table properties
|Name|Description|
|-----------------------------------|-----------------------------------------------------------------------------------------|
-| SPATIAL_INDEX | Used to configure Spatial Index name. This name is appended
to `SPATIAL_INDEX` in the subsequent sub-property configurations. `xxx` in the
below sub-properties refer to index name.|
+| SPATIAL_INDEX | Used to configure Spatial Index name. This name is appended
to `SPATIAL_INDEX` in the subsequent sub-property configurations. `xxx` in the
below sub-properties refer to index name. Generated spatial index column is not
allowed in any properties except in `SORT_COLUMNS` table property.|
| SPATIAL_INDEX.xxx.type | Type of algorithm for processing spatial data.
Currently, supports only 'geohash'.|
| SPATIAL_INDEX.xxx.sourcecolumns | longitude and latitude column names as in
the table. These columns are used to generate index value for each row.|
+| SPATIAL_INDEX.xxx.originLatitude | Latitude of origin.|
| SPATIAL_INDEX.xxx.gridSize | Grid size of raster data in metres. Currently,
spatial index supports raster data.|
-| SPATIAL_INDEX.xxx.minLongitude | Minimum longitude of the gridded
rectangular area.|
-| SPATIAL_INDEX.xxx.maxLongitude | Maximum longitude of the gridded
rectangular area.|
-| SPATIAL_INDEX.xxx.minLatitude | Minimum latitude of the gridded rectangular
area.|
-| SPATIAL_INDEX.xxx.maxLatitude | Maximum latitude of the gridded rectangular
area.|
| SPATIAL_INDEX.xxx.conversionRatio | Conversion factor. It allows user to
translate longitude and latitude to long. For example, if the data to load is
longitude = 13.123456, latitude = 101.12356. User can configure conversion
ratio sub-property value as 1000000, and change data to load as longitude =
13123456 and latitude = 10112356. Operations on long is much faster compared to
floating-point numbers.|
| SPATIAL_INDEX.xxx.class | Optional user custom implementation class. Value
is fully qualified class name.|
@@ -88,6 +100,56 @@ Query with Polygon UDF predicate
select * from source_index where IN_POLYGON('16.321011 4.123503,16.137676
5.947911,16.560993 5.935276,16.321011 4.123503')
```
+Query with Polygon List UDF predicate
+
+```
+select * from source_index where IN_POLYGON_LIST('POLYGON ((116.137676
40.163503, 116.137676 39.935276, 116.560993 39.935276, 116.137676 40.163503)),
POLYGON ((116.560993 39.935276, 116.560993 40.163503, 116.137676 40.163503,
116.560993 39.935276))', 'OR')
+```
+
+Query with Polyline List UDF predicate
+
+```
+select * from source_index where IN_POLYLINE_LIST('LINESTRING (116.137676
40.163503, 116.137676 39.935276, 116.260993 39.935276), LINESTRING (116.260993
39.935276, 116.560993 39.935276, 116.560993 40.163503)', 65)
+```
+
+Query with Polygon Range List UDF predicate
+
+```
+select * from source_index where IN_POLYGON_RANGE_LIST('RANGELIST
(855279368848 855279368850, 855280799610 855280799612, 855282156300
855282157400), RANGELIST (855279368852 855279368854, 855280799613 855280799615,
855282156200 855282157500)', 'OR')
+```
+
+Convert spatial index to spatial grid x, y
+
+```
+select GeoIdToGridXy(mygeohash) as GridXY from source_index
+```
+
+Convert longitude and latitude pair to spatial index
+The UDF needs two other parameters, oriLatitude and gridSize
+
+```
+select LatLngToGeoId(latitude, longitude, 39.832277, 50) as geoId from
source_index
+```
+
+Convert spatial index to longitude and latitude pair
+The UDF needs two other parameters, oriLatitude and gridSize
+
+```
+select GeoIdToLatLng(mygeohash, 39.832277, 50) as LatitudeAndLongitude from
source_index
+```
+
+Convert spatial index to upper layer spatial index of pyramid model
+
+```
+select ToUpperLayerGeoId(mygeohash) as upperLayerGeoId from source_index
+```
+
+Convert string polygon to internal spatial index range list
+
+```
+select ToRangeList('116.321011 40.123503, 116.320311 40.122503, 116.321111
40.121503, 116.321011 40.123503', 39.832277, 50) as rangeList
+```
+
## Reference
```
