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 2018/09/07 16:54:14 UTC
[27/39] carbondata-site git commit: Handled comments
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/MDFileConverter.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/MDFileConverter.scala b/src/main/scala/MDFileConverter.scala
index 79d1d27..9c5e393 100644
--- a/src/main/scala/MDFileConverter.scala
+++ b/src/main/scala/MDFileConverter.scala
@@ -12,6 +12,7 @@ class MDFileConverter @Inject()(fileService: FileService, confService: ConfServi
val outputFileExtension: String = ".html"
val headerContent: String = fileService.readFromFile(confService.readString("headerPath"))
val footerContent: String = fileService.readFromFile(confService.readString("footerPath"))
+ val scriptsPath: String = confService.readString("scriptsPath")
val location: String = confService.readString("outputFileLocation")
val fileReadObject: MdFileHandler = new MdFileHandler(confService, fileService)
val failMessage: String = "failure"
@@ -84,8 +85,11 @@ class MDFileConverter @Inject()(fileService: FileService, confService: ConfServi
getFileData match {
case Some(data: String) => val fileData = fileReadObject.convertMdExtensions(data)
logger.info(s"Begin writing [ $fileName outputFileExtension ] at $location")
+
+ val scriptsContent: String = fileService.readFromFile(scriptsPath + fileName)
+
val statusHtmlFile = fileService
- .writeToFile(outputPath, headerContent + fileData + footerContent)
+ .writeToFile(outputPath, headerContent + fileData + scriptsContent + footerContent)
saveMdFilesForPDF(dirStatus, fileURLContent, fileName)
if (imageFileList.contains(fileName)) {
saveMdFilesForPDF(dirStatus, changeImageLink(fileURLContent), fileName)
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/MdFileHandler.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/MdFileHandler.scala b/src/main/scala/MdFileHandler.scala
index 6fae74e..148a280 100644
--- a/src/main/scala/MdFileHandler.scala
+++ b/src/main/scala/MdFileHandler.scala
@@ -18,13 +18,17 @@ class MdFileHandler @Inject()(confService: ConfService, fileService: FileService
def convertMdExtensions(input: String): String = {
val modifyContentPattern: Regex = new Regex("id=\"user-content-")
val modifyMdPattern: Regex = new Regex(".md")
+ val modifyDatamapPattern: Regex = new Regex("./datamap/")
val modifyImagePattern: Regex = new Regex("<img src=\"../docs")
val modifyHttpsFileLink: Regex ="""(<a href=\"https)://([a-zA-Z0-9-/.]+)(\")""".r
val modifyHttpFileLink: Regex ="""(<a href=\"http)://([a-zA-Z0-9-/.]+)(\")""".r
val replacingImageContent: String = "<img src=\"https://github.com/apache/carbondata/blob/master/docs"
val contentAfterRemovingUserContent: String = modifyContentPattern replaceAllIn(input, "id=\"")
val contentAfterReplacingId: String = modifyMdPattern replaceAllIn(contentAfterRemovingUserContent, ".html")
- val contentAfterReplacingImage: String = modifyImagePattern replaceAllIn(contentAfterReplacingId,replacingImageContent)
+
+ val contentAfterReplacingDatamap: String = modifyDatamapPattern replaceAllIn(contentAfterReplacingId, "./")
+
+ val contentAfterReplacingImage: String = modifyImagePattern replaceAllIn(contentAfterReplacingDatamap,replacingImageContent)
val contentAfterReplacingHttpsFileLink: String = modifyHttpsFileLink replaceAllIn(contentAfterReplacingImage, "$1://$2$3 target=_blank")
val contentAfterReplacingFileLink: String = modifyHttpFileLink replaceAllIn(contentAfterReplacingHttpsFileLink, "$1://$2$3 target=_blank")
contentAfterReplacingFileLink
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/html/header.html
----------------------------------------------------------------------
diff --git a/src/main/scala/html/header.html b/src/main/scala/html/header.html
index 28cab9c..217a9f4 100644
--- a/src/main/scala/html/header.html
+++ b/src/main/scala/html/header.html
@@ -159,7 +159,7 @@
<div class="nav__inner">
<a class="b-nav__intro nav__item" href="./introduction.html">introduction</a>
<a class="b-nav__quickstart nav__item" href="./quick-start-guide.html">quick start</a>
- <a class="b-nav__uses nav__item" href="./usescases.html">use cases</a>
+ <a class="b-nav__uses nav__item" href="./usecases.html">use cases</a>
<div class="nav__item nav__item__with__subs">
<a class="b-nav__docs nav__item nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
<a class="nav__item nav__sub__item" href="./timeseries-datamap-guide.html">Time Series</a>
</div>
- <a class="b-nav__s3 nav__item" href="./s3-guide.html">S3 Support</a>
<a class="b-nav__api nav__item" href="./sdk-guide.html">API</a>
<a class="b-nav__perf nav__item" href="./performance-tuning.html">Performance Tuning</a>
+ <a class="b-nav__s3 nav__item" href="./s3-guide.html">S3 Storage</a>
<a class="b-nav__faq nav__item" href="./faq.html">FAQ</a>
<a class="b-nav__contri nav__item" href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
<a class="b-nav__security nav__item" href="./security.html">Security</a>
@@ -194,9 +194,9 @@
<div class="b-nav__uses navindicator__item"></div>
<div class="b-nav__docs navindicator__item"></div>
<div class="b-nav__datamap navindicator__item"></div>
- <div class="b-nav__s3 navindicator__item"></div>
<div class="b-nav__api navindicator__item"></div>
<div class="b-nav__perf navindicator__item"></div>
+ <div class="b-nav__s3 navindicator__item"></div>
<div class="b-nav__faq navindicator__item"></div>
<div class="b-nav__contri navindicator__item"></div>
<div class="b-nav__security navindicator__item"></div>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/bloomfilter-datamap-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/bloomfilter-datamap-guide b/src/main/scala/scripts/bloomfilter-datamap-guide
new file mode 100644
index 0000000..8834f00
--- /dev/null
+++ b/src/main/scala/scripts/bloomfilter-datamap-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__datamap').addClass('selected');
+
+ if (!$('.b-nav__datamap').parent().hasClass('nav__item__with__subs--expanded')) {
+ // Display datamap subnav items
+ $('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/configuration-parameters
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/configuration-parameters b/src/main/scala/scripts/configuration-parameters
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/configuration-parameters
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/datamap-developer-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/datamap-developer-guide b/src/main/scala/scripts/datamap-developer-guide
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/datamap-developer-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/datamap-management
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/datamap-management b/src/main/scala/scripts/datamap-management
new file mode 100644
index 0000000..8834f00
--- /dev/null
+++ b/src/main/scala/scripts/datamap-management
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__datamap').addClass('selected');
+
+ if (!$('.b-nav__datamap').parent().hasClass('nav__item__with__subs--expanded')) {
+ // Display datamap subnav items
+ $('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/ddl-of-carbondata
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/ddl-of-carbondata b/src/main/scala/scripts/ddl-of-carbondata
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/ddl-of-carbondata
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/dml-of-carbondata
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/dml-of-carbondata b/src/main/scala/scripts/dml-of-carbondata
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/dml-of-carbondata
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/faq
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/faq b/src/main/scala/scripts/faq
new file mode 100644
index 0000000..10ea449
--- /dev/null
+++ b/src/main/scala/scripts/faq
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__faq').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/file-structure-of-carbondata
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/file-structure-of-carbondata b/src/main/scala/scripts/file-structure-of-carbondata
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/file-structure-of-carbondata
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/how-to-contribute-to-apache-carbondata
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/how-to-contribute-to-apache-carbondata b/src/main/scala/scripts/how-to-contribute-to-apache-carbondata
new file mode 100644
index 0000000..c92b67b
--- /dev/null
+++ b/src/main/scala/scripts/how-to-contribute-to-apache-carbondata
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__contri').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/introduction
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/introduction b/src/main/scala/scripts/introduction
new file mode 100644
index 0000000..c523ce7
--- /dev/null
+++ b/src/main/scala/scripts/introduction
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__intro').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/language-manual
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/language-manual b/src/main/scala/scripts/language-manual
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/language-manual
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/lucene-datamap-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/lucene-datamap-guide b/src/main/scala/scripts/lucene-datamap-guide
new file mode 100644
index 0000000..8834f00
--- /dev/null
+++ b/src/main/scala/scripts/lucene-datamap-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__datamap').addClass('selected');
+
+ if (!$('.b-nav__datamap').parent().hasClass('nav__item__with__subs--expanded')) {
+ // Display datamap subnav items
+ $('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/performance-tuning
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/performance-tuning b/src/main/scala/scripts/performance-tuning
new file mode 100644
index 0000000..f884fec
--- /dev/null
+++ b/src/main/scala/scripts/performance-tuning
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__perf').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/preaggregate-datamap-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/preaggregate-datamap-guide b/src/main/scala/scripts/preaggregate-datamap-guide
new file mode 100644
index 0000000..8834f00
--- /dev/null
+++ b/src/main/scala/scripts/preaggregate-datamap-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__datamap').addClass('selected');
+
+ if (!$('.b-nav__datamap').parent().hasClass('nav__item__with__subs--expanded')) {
+ // Display datamap subnav items
+ $('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/quick-start-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/quick-start-guide b/src/main/scala/scripts/quick-start-guide
new file mode 100644
index 0000000..3bfec2b
--- /dev/null
+++ b/src/main/scala/scripts/quick-start-guide
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__quickstart').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/release-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/release-guide b/src/main/scala/scripts/release-guide
new file mode 100644
index 0000000..3bfe498
--- /dev/null
+++ b/src/main/scala/scripts/release-guide
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__release').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/s3-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/s3-guide b/src/main/scala/scripts/s3-guide
new file mode 100644
index 0000000..ee9dc1f
--- /dev/null
+++ b/src/main/scala/scripts/s3-guide
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__s3').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/sdk-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/sdk-guide b/src/main/scala/scripts/sdk-guide
new file mode 100644
index 0000000..700185a
--- /dev/null
+++ b/src/main/scala/scripts/sdk-guide
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__api').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/segment-management-on-carbondata
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/segment-management-on-carbondata b/src/main/scala/scripts/segment-management-on-carbondata
new file mode 100644
index 0000000..48bd74b
--- /dev/null
+++ b/src/main/scala/scripts/segment-management-on-carbondata
@@ -0,0 +1,10 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/streaming-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/streaming-guide b/src/main/scala/scripts/streaming-guide
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/streaming-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/supported-data-types-in-carbondata
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/supported-data-types-in-carbondata b/src/main/scala/scripts/supported-data-types-in-carbondata
new file mode 100644
index 0000000..3d168cd
--- /dev/null
+++ b/src/main/scala/scripts/supported-data-types-in-carbondata
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__docs').addClass('selected');
+
+ // Display docs subnav items
+ if (!$('.b-nav__docs').parent().hasClass('nav__item__with__subs--expanded')) {
+ $('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/timeseries-datamap-guide
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/timeseries-datamap-guide b/src/main/scala/scripts/timeseries-datamap-guide
new file mode 100644
index 0000000..8834f00
--- /dev/null
+++ b/src/main/scala/scripts/timeseries-datamap-guide
@@ -0,0 +1,11 @@
+<script>
+$(function() {
+ // Show selected style on nav item
+ $('.b-nav__datamap').addClass('selected');
+
+ if (!$('.b-nav__datamap').parent().hasClass('nav__item__with__subs--expanded')) {
+ // Display datamap subnav items
+ $('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
+ }
+});
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/scala/scripts/usecases
----------------------------------------------------------------------
diff --git a/src/main/scala/scripts/usecases b/src/main/scala/scripts/usecases
new file mode 100644
index 0000000..4e123f8
--- /dev/null
+++ b/src/main/scala/scripts/usecases
@@ -0,0 +1,4 @@
+<script>
+// Show selected style on nav item
+$(function() { $('.b-nav__uses').addClass('selected'); });
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/bloomfilter-datamap-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/bloomfilter-datamap-guide.html b/src/main/webapp/bloomfilter-datamap-guide.html
index 54c14fe..8030599 100644
--- a/src/main/webapp/bloomfilter-datamap-guide.html
+++ b/src/main/webapp/bloomfilter-datamap-guide.html
@@ -159,7 +159,7 @@
<div class="nav__inner">
<a class="b-nav__intro nav__item" href="./introduction.html">introduction</a>
<a class="b-nav__quickstart nav__item" href="./quick-start-guide.html">quick start</a>
- <a class="b-nav__uses nav__item" href="./usescases.html">use cases</a>
+ <a class="b-nav__uses nav__item" href="./usecases.html">use cases</a>
<div class="nav__item nav__item__with__subs">
<a class="b-nav__docs nav__item nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
<a class="nav__item nav__sub__item" href="./timeseries-datamap-guide.html">Time Series</a>
</div>
- <a class="b-nav__s3 nav__item" href="./s3-guide.html">S3 Support</a>
<a class="b-nav__api nav__item" href="./sdk-guide.html">API</a>
<a class="b-nav__perf nav__item" href="./performance-tuning.html">Performance Tuning</a>
+ <a class="b-nav__s3 nav__item" href="./s3-guide.html">S3 Storage</a>
<a class="b-nav__faq nav__item" href="./faq.html">FAQ</a>
<a class="b-nav__contri nav__item" href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
<a class="b-nav__security nav__item" href="./security.html">Security</a>
@@ -194,9 +194,9 @@
<div class="b-nav__uses navindicator__item"></div>
<div class="b-nav__docs navindicator__item"></div>
<div class="b-nav__datamap navindicator__item"></div>
- <div class="b-nav__s3 navindicator__item"></div>
<div class="b-nav__api navindicator__item"></div>
<div class="b-nav__perf navindicator__item"></div>
+ <div class="b-nav__s3 navindicator__item"></div>
<div class="b-nav__faq navindicator__item"></div>
<div class="b-nav__contri navindicator__item"></div>
<div class="b-nav__security navindicator__item"></div>
@@ -260,7 +260,7 @@ User can create BloomFilter datamap on specified columns with specified BloomFil
age int,
city string,
country string)
-STORED BY 'carbondata'
+STORED AS carbondata
TBLPROPERTIES('SORT_COLUMNS'='id')
</code></pre>
<p>In the above example, <code>id</code> and <code>name</code> are high cardinality columns
@@ -366,8 +366,7 @@ $(function() {
$('.b-nav__datamap').parent().toggleClass('nav__item__with__subs--expanded');
}
});
-</script>
-</div>
+</script></div>
</div>
</div>
</div>
@@ -382,4 +381,4 @@ $(function() {
</section><!-- End systemblock part -->
<script src="js/custom.js"></script>
</body>
-</html>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/a51dc596/src/main/webapp/configuration-parameters.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/configuration-parameters.html b/src/main/webapp/configuration-parameters.html
index ba73b0d..ab89576 100644
--- a/src/main/webapp/configuration-parameters.html
+++ b/src/main/webapp/configuration-parameters.html
@@ -159,7 +159,7 @@
<div class="nav__inner">
<a class="b-nav__intro nav__item" href="./introduction.html">introduction</a>
<a class="b-nav__quickstart nav__item" href="./quick-start-guide.html">quick start</a>
- <a class="b-nav__uses nav__item" href="./usescases.html">use cases</a>
+ <a class="b-nav__uses nav__item" href="./usecases.html">use cases</a>
<div class="nav__item nav__item__with__subs">
<a class="b-nav__docs nav__item nav__sub__anchor" href="./language-manual.html">Language Reference</a>
@@ -179,9 +179,9 @@
<a class="nav__item nav__sub__item" href="./timeseries-datamap-guide.html">Time Series</a>
</div>
- <a class="b-nav__s3 nav__item" href="./s3-guide.html">S3 Support</a>
<a class="b-nav__api nav__item" href="./sdk-guide.html">API</a>
<a class="b-nav__perf nav__item" href="./performance-tuning.html">Performance Tuning</a>
+ <a class="b-nav__s3 nav__item" href="./s3-guide.html">S3 Storage</a>
<a class="b-nav__faq nav__item" href="./faq.html">FAQ</a>
<a class="b-nav__contri nav__item" href="./how-to-contribute-to-apache-carbondata.html">Contribute</a>
<a class="b-nav__security nav__item" href="./security.html">Security</a>
@@ -194,9 +194,9 @@
<div class="b-nav__uses navindicator__item"></div>
<div class="b-nav__docs navindicator__item"></div>
<div class="b-nav__datamap navindicator__item"></div>
- <div class="b-nav__s3 navindicator__item"></div>
<div class="b-nav__api navindicator__item"></div>
<div class="b-nav__perf navindicator__item"></div>
+ <div class="b-nav__s3 navindicator__item"></div>
<div class="b-nav__faq navindicator__item"></div>
<div class="b-nav__contri navindicator__item"></div>
<div class="b-nav__security navindicator__item"></div>
@@ -212,7 +212,7 @@
<div>
<h1>
<a id="configuring-carbondata" class="anchor" href="#configuring-carbondata" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Configuring CarbonData</h1>
-<p>This guide explains the configurations that can be used to tune CarbonData to achieve better performance.Some of the properties can be set dynamically and are explained in the section Dynamic Configuration In CarbonData Using SET-RESET.Most of the properties that control the internal settings have reasonable default values.They are listed along with the properties along with explanation.</p>
+<p>This guide explains the configurations that can be used to tune CarbonData to achieve better performance.Most of the properties that control the internal settings have reasonable default values.They are listed along with the properties along with explanation.</p>
<ul>
<li><a href="#system-configuration">System Configuration</a></li>
<li><a href="#data-loading-configuration">Data Loading Configuration</a></li>
@@ -364,7 +364,7 @@
<tr>
<td>carbon.blockletgroup.size.in.mb</td>
<td>64</td>
-<td>Please refer to <a href="./file-structure-of-carbondata.html">file-structure-of-carbondata</a> to understand the storage format of CarbonData.The data are read as a group of blocklets which are called blocklet groups. This parameter specifies the size of each blocklet group. Higher value results in better sequential IO access.The minimum value is 16MB, any value lesser than 16MB will reset to the default value (64MB).<strong>NOTE:</strong> Configuring a higher value might lead to poor performance as an entire blocklet group will have to read into memory before processing.For filter queries with limit, it is <strong>not advisable</strong> to have a bigger blocklet size.For Aggregation queries which need to return more number of rows,bigger blocklet size is advisable.</td>
+<td>Please refer to <a href="./file-structure-of-carbondata.html#carbondata-file-format">file-structure-of-carbondata</a> to understand the storage format of CarbonData.The data are read as a group of blocklets which are called blocklet groups. This parameter specifies the size of each blocklet group. Higher value results in better sequential IO access.The minimum value is 16MB, any value lesser than 16MB will reset to the default value (64MB).<strong>NOTE:</strong> Configuring a higher value might lead to poor performance as an entire blocklet group will have to read into memory before processing.For filter queries with limit, it is <strong>not advisable</strong> to have a bigger blocklet size.For Aggregation queries which need to return more number of rows,bigger blocklet size is advisable.</td>
</tr>
<tr>
<td>carbon.sort.file.write.buffer.size</td>
@@ -420,7 +420,7 @@
<tr>
<td>carbon.use.local.dir</td>
<td>false</td>
-<td>CarbonData during data loading, writes files to local temp directories before copying the files to HDFS.This configuration is used to specify whether CarbonData can write locally to tmp directory of the container or to the YARN application directory.</td>
+<td>CarbonData,during data loading, writes files to local temp directories before copying the files to HDFS.This configuration is used to specify whether CarbonData can write locally to tmp directory of the container or to the YARN application directory.</td>
</tr>
<tr>
<td>carbon.use.multiple.temp.dir</td>
@@ -595,7 +595,7 @@
<tr>
<td>carbon.enable.page.level.reader.in.compaction</td>
<td>true</td>
-<td>Enabling page level reader for compaction reduces the memory usage while compacting more number of segments. It allows reading only page by page instead of reading whole blocklet to memory.<strong>NOTE:</strong> Please refer to <a href="./file-structure-of-carbondata.html">file-structure-of-carbondata</a> to understand the storage format of CarbonData and concepts of pages.</td>
+<td>Enabling page level reader for compaction reduces the memory usage while compacting more number of segments. It allows reading only page by page instead of reading whole blocklet to memory.<strong>NOTE:</strong> Please refer to <a href="./file-structure-of-carbondata.html#carbondata-file-format">file-structure-of-carbondata</a> to understand the storage format of CarbonData and concepts of pages.</td>
</tr>
<tr>
<td>carbon.concurrent.compaction</td>
@@ -916,8 +916,7 @@ $(function() {
$('.b-nav__docs').parent().toggleClass('nav__item__with__subs--expanded');
}
});
-</script>
-</div>
+</script></div>
</div>
</div>
</div>
@@ -932,4 +931,4 @@ $(function() {
</section><!-- End systemblock part -->
<script src="js/custom.js"></script>
</body>
-</html>
+</html>
\ No newline at end of file