Added new page layout & updated as per new md files
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/44eed099 Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/44eed099 Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/44eed099 Branch: refs/heads/asf-site Commit: 44eed099cb917e3e4c8ac62cd761566fcef3e35d Parents: 324588f Author: Raghunandan S <[email protected]> Authored: Tue Aug 28 14:25:59 2018 +0800 Committer: Raghunandan S <[email protected]> Committed: Wed Sep 5 21:04:18 2018 +0800 ---------------------------------------------------------------------- carbonscript.sh | 5 +- content/WEB-INF/classes/MdFileHandler.class | Bin 6144 -> 6144 bytes content/WEB-INF/classes/WebsiteLauncher$.class | Bin 4209 -> 4248 bytes content/WEB-INF/classes/application.conf | 22 +- content/WEB-INF/classes/html/footer.html | 2 +- content/WEB-INF/classes/html/header.html | 2 +- content/bloomfilter-datamap-guide.html | 68 +- content/configuration-parameters.html | 707 +++++---- content/css/style.css | 76 +- content/data-management-on-carbondata.html | 2 +- content/data-management.html | 2 +- content/datamap-developer-guide.html | 77 +- content/datamap-management.html | 86 +- content/ddl-of-carbondata.html | 1078 ++++++++++++++ content/ddl-operation-on-carbondata.html | 2 +- content/dml-of-carbondata.html | 588 ++++++++ content/dml-operation-on-carbondata.html | 2 +- content/documentation.html | 256 ++++ content/errorpage.html | 2 +- content/faq.html | 262 +++- content/file-structure-of-carbondata.html | 72 +- .../how-to-contribute-to-apache-carbondata.html | 371 +++++ content/index.html | 2 +- content/installation-guide.html | 2 +- content/introduction.html | 361 +++++ content/language-manual.html | 273 ++++ content/lucene-datamap-guide.html | 68 +- content/partition-guide.html | 2 +- content/pdf/maven-pdf-plugin.pdf | Bin 216771 -> 155540 bytes content/performance-tuning.html | 529 +++++++ content/preaggregate-datamap-guide.html | 70 +- content/quick-start-guide.html | 476 +++++- content/release-guide.html | 88 +- content/s3-guide.html | 81 +- content/sdk-guide.html | 119 +- content/sdk-writer-guide.html | 2 +- content/security.html | 2 +- content/segment-management-on-carbondata.html | 326 ++++ content/streaming-guide.html | 68 +- content/supported-data-types-in-carbondata.html | 70 +- content/timeseries-datamap-guide.html | 97 +- content/troubleshooting.html | 63 +- content/useful-tips-on-carbondata.html | 68 +- content/videogallery.html | 2 +- src/main/resources/application.conf | 18 +- src/main/scala/html/header.html | 55 +- src/main/webapp/bloomfilter-datamap-guide.html | 68 +- src/main/webapp/configuration-parameters.html | 707 +++++---- src/main/webapp/css/style.css | 76 +- .../webapp/data-management-on-carbondata.html | 2 +- src/main/webapp/datamap-developer-guide.html | 77 +- src/main/webapp/datamap-management.html | 86 +- src/main/webapp/ddl-of-carbondata.html | 1078 ++++++++++++++ src/main/webapp/dml-of-carbondata.html | 588 ++++++++ src/main/webapp/documentation.html | 256 ++++ src/main/webapp/errorpage.html | 2 +- src/main/webapp/faq.html | 262 +++- .../webapp/file-structure-of-carbondata.html | 72 +- .../how-to-contribute-to-apache-carbondata.html | 371 +++++ src/main/webapp/index.html | 2 +- src/main/webapp/installation-guide.html | 2 +- src/main/webapp/introduction.html | 361 +++++ src/main/webapp/language-manual.html | 273 ++++ src/main/webapp/lucene-datamap-guide.html | 68 +- src/main/webapp/performance-tuning.html | 529 +++++++ src/main/webapp/preaggregate-datamap-guide.html | 70 +- src/main/webapp/quick-start-guide.html | 476 +++++- src/main/webapp/release-guide.html | 572 +++++++ src/main/webapp/s3-guide.html | 81 +- src/main/webapp/sdk-guide.html | 119 +- src/main/webapp/sdk-writer-guide.html | 2 +- src/main/webapp/security.html | 2 +- .../segment-management-on-carbondata.html | 326 ++++ src/main/webapp/streaming-guide.html | 68 +- .../supported-data-types-in-carbondata.html | 70 +- src/main/webapp/timeseries-datamap-guide.html | 97 +- src/main/webapp/troubleshooting.html | 63 +- src/main/webapp/useful-tips-on-carbondata.html | 68 +- src/main/webapp/videogallery.html | 2 +- src/site/markdown/bloomfilter-datamap-guide.md | 14 +- src/site/markdown/configuration-parameters.md | 286 ++-- .../markdown/data-management-on-carbondata.md | 1394 ------------------ src/site/markdown/datamap-developer-guide.md | 24 +- src/site/markdown/datamap-management.md | 29 +- src/site/markdown/ddl-of-carbondata.md | 952 ++++++++++++ src/site/markdown/dml-of-carbondata.md | 456 ++++++ src/site/markdown/documentation.md | 70 + src/site/markdown/faq.md | 276 +++- .../markdown/file-structure-of-carbondata.md | 13 + .../how-to-contribute-to-apache-carbondata.md | 199 +++ src/site/markdown/installation-guide.md | 198 --- src/site/markdown/introduction.md | 172 +++ src/site/markdown/language-manual.md | 51 + src/site/markdown/lucene-datamap-guide.md | 11 + src/site/markdown/performance-tuning.md | 183 +++ src/site/markdown/preaggregate-datamap-guide.md | 13 +- src/site/markdown/quick-start-guide.md | 352 ++++- src/site/markdown/release-guide.md | 428 ++++++ src/site/markdown/s3-guide.md | 21 +- src/site/markdown/sdk-guide.md | 75 +- .../segment-management-on-carbondata.md | 154 ++ src/site/markdown/streaming-guide.md | 13 + .../supported-data-types-in-carbondata.md | 16 +- src/site/markdown/timeseries-datamap-guide.md | 43 +- src/site/markdown/troubleshooting.md | 267 ---- src/site/markdown/useful-tips-on-carbondata.md | 179 --- 106 files changed, 16216 insertions(+), 3093 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/44eed099/carbonscript.sh ---------------------------------------------------------------------- diff --git a/carbonscript.sh b/carbonscript.sh index b77e42d..df9de3e 100755 --- a/carbonscript.sh +++ b/carbonscript.sh @@ -6,4 +6,7 @@ mvn exec:java -Dexec.mainClass=WebsiteLauncher mvn install -# mvn exec:java -Dexec.mainClass=CleanUp \ No newline at end of file +# mvn exec:java -Dexec.mainClass=CleanUp + +find . -type f -name "*.html" ! -name "header.html" ! -name "footer.html" -exec sed -i '' 's/<script>/<script>/g' {} + +find . -type f -name "*.html" ! -name "header.html" ! -name "footer.html" -exec sed -i '' 's/<\/script>/<\/script>/g' {} + http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/44eed099/content/WEB-INF/classes/MdFileHandler.class ---------------------------------------------------------------------- diff --git a/content/WEB-INF/classes/MdFileHandler.class b/content/WEB-INF/classes/MdFileHandler.class index 58088b3..f39c098 100644 Binary files a/content/WEB-INF/classes/MdFileHandler.class and b/content/WEB-INF/classes/MdFileHandler.class differ http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/44eed099/content/WEB-INF/classes/WebsiteLauncher$.class ---------------------------------------------------------------------- diff --git a/content/WEB-INF/classes/WebsiteLauncher$.class b/content/WEB-INF/classes/WebsiteLauncher$.class index fc13342..9e36ad5 100644 Binary files a/content/WEB-INF/classes/WebsiteLauncher$.class and b/content/WEB-INF/classes/WebsiteLauncher$.class differ http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/44eed099/content/WEB-INF/classes/application.conf ---------------------------------------------------------------------- diff --git a/content/WEB-INF/classes/application.conf b/content/WEB-INF/classes/application.conf index ba5b4b5..b5f941f 100644 --- a/content/WEB-INF/classes/application.conf +++ b/content/WEB-INF/classes/application.conf @@ -1,16 +1,21 @@ fileList=["configuration-parameters", - "data-management-on-carbondata", "quick-start-guide", "faq", "file-structure-of-carbondata", - "installation-guide", "streaming-guide", "supported-data-types-in-carbondata", - "troubleshooting", - "useful-tips-on-carbondata", + "performance-tuning", "sdk-guide", + "datamap-developer-guide", + "ddl-of-carbondata", + "dml-of-carbondata", + "documentation", + "language-manual", "s3-guide", - "datamap-developer-guide" + "segment-management-on-carbondata", + "release-guide", + "how-to-contribute-to-apache-carbondata", + "introduction" ] dataMapFileList=[ "bloomfilter-datamap-guide", @@ -19,15 +24,14 @@ dataMapFileList=[ "timeseries-datamap-guide", "datamap-management"] -dataMapFilesUrl="https://raw.githubusercontent.com/apache/carbondata/master/docs/datamap/"; +dataMapFilesUrl="file:///Users/aditi_advith/Documents/code/carbondata/docs/datamap/" -fileListToRetain=["quick-start-guide", - "installation-guide" +fileListToRetain=["quick-start-guide" ] headerPath="src/main/scala/html/header.html" footerPath="src/main/scala/html/footer.html" outputFileLocation="src/main/webapp/" -apiUrl="https://raw.githubusercontent.com/apache/carbondata/master/docs/"; +apiUrl="file:///Users/aditi_advith/Documents/code/carbondata/docs/" mdLink="https://api.github.com/markdown/raw"; mdFileLocation="src/site/markdown/" imagesFilesList=["file-structure-of-carbondata"] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/44eed099/content/WEB-INF/classes/html/footer.html ---------------------------------------------------------------------- diff --git a/content/WEB-INF/classes/html/footer.html b/content/WEB-INF/classes/html/footer.html index 47aa819..eb80d58 100644 --- a/content/WEB-INF/classes/html/footer.html +++ b/content/WEB-INF/classes/html/footer.html @@ -13,4 +13,4 @@ </section><!-- End systemblock part --> <script src="js/custom.js"></script> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/44eed099/content/WEB-INF/classes/html/header.html ---------------------------------------------------------------------- diff --git a/content/WEB-INF/classes/html/header.html b/content/WEB-INF/classes/html/header.html index 9e904d0..5d5a2e0 100644 --- a/content/WEB-INF/classes/html/header.html +++ b/content/WEB-INF/classes/html/header.html @@ -158,4 +158,4 @@ <div id="viewpage" name="viewpage"> <div class="row"> <div class="col-sm-12 col-md-12"> - <div> \ No newline at end of file + <div> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/44eed099/content/bloomfilter-datamap-guide.html ---------------------------------------------------------------------- diff --git a/content/bloomfilter-datamap-guide.html b/content/bloomfilter-datamap-guide.html index e3b3eb6..54c14fe 100644 --- a/content/bloomfilter-datamap-guide.html +++ b/content/bloomfilter-datamap-guide.html @@ -22,6 +22,7 @@ <![endif]--> <script src="js/jquery.min.js"></script> <script src="js/bootstrap.min.js"></script> + <script defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js";></script> </head> @@ -67,7 +68,7 @@ target="_blank">Release Archive</a></li> </ul> </li> - <li><a href="mainpage.html" class="active">Documentation</a></li> + <li><a href="documentation.html" class="active">Documentation</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a> @@ -152,7 +153,57 @@ <section><!-- Dashboard nav --> <div class="container-fluid q"> <div class="col-sm-12 col-md-12 maindashboard"> - <div class="row"> + <div class="verticalnavbar"> + <nav class="b-sticky-nav"> + <div class="nav-scroller"> + <div class="nav__inner"> + <a class="b-nav__intro nav__item" href="./introduction.html">introduction</a> + <a class="b-nav__quickstart nav__item" href="./quick-start-guide.html">quick start</a> + <a class="b-nav__uses nav__item" href="./usescases.html">use cases</a> + + <div class="nav__item nav__item__with__subs"> + <a class="b-nav__docs nav__item nav__sub__anchor" href="./language-manual.html">Language Reference</a> + <a class="nav__item nav__sub__item" href="./ddl-of-carbondata.html">DDL</a> + <a class="nav__item nav__sub__item" href="./dml-of-carbondata.html">DML</a> + <a class="nav__item nav__sub__item" href="./streaming-guide.html">Streaming</a> + <a class="nav__item nav__sub__item" href="./configuration-parameters.html">Configuration</a> + <a class="nav__item nav__sub__item" href="./datamap-developer-guide.html">Datamaps</a> + <a class="nav__item nav__sub__item" href="./supported-data-types-in-carbondata.html">Data Types</a> + </div> + + <div class="nav__item nav__item__with__subs"> + <a class="b-nav__datamap nav__item nav__sub__anchor" href="./datamap-management.html">DataMaps</a> + <a class="nav__item nav__sub__item" href="./bloomfilter-datamap-guide.html">Bloom Filter</a> + <a class="nav__item nav__sub__item" href="./lucene-datamap-guide.html">Lucene</a> + <a class="nav__item nav__sub__item" href="./preaggregate-datamap-guide.html">Pre-Aggregate</a> + <a class="nav__item nav__sub__item" href="./timeseries-datamap-guide.html">Time Series</a> + </div> + + <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__faq nav__item" href="./faq.html">FAQ</a> + <a class="b-nav__contri nav__item" href="./how-to-contribute-to-apache-carbondata.html">Contribute</a> + <a class="b-nav__security nav__item" href="./security.html">Security</a> + <a class="b-nav__release nav__item" href="./release-guide.html">Release Guide</a> + </div> + </div> + <div class="navindicator"> + <div class="b-nav__intro navindicator__item"></div> + <div class="b-nav__quickstart navindicator__item"></div> + <div class="b-nav__uses navindicator__item"></div> + <div class="b-nav__docs navindicator__item"></div> + <div class="b-nav__datamap navindicator__item"></div> + <div class="b-nav__s3 navindicator__item"></div> + <div class="b-nav__api navindicator__item"></div> + <div class="b-nav__perf navindicator__item"></div> + <div class="b-nav__faq navindicator__item"></div> + <div class="b-nav__contri navindicator__item"></div> + <div class="b-nav__security navindicator__item"></div> + </div> + </nav> + </div> + <div class="mdcontent"> <section> <div style="padding:10px 15px;"> <div id="viewpage" name="viewpage"> @@ -305,6 +356,17 @@ but if it can reduce the number of spark task, there is still a chance that BloomFilter datamap can enhance the performance for concurrent query.</li> <li>Note that BloomFilter datamap will decrease the data loading performance and may cause slightly storage expansion (for datamap index file).</li> </ul> +<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> </div> </div> </div> @@ -320,4 +382,4 @@ there is still a chance that BloomFilter datamap can enhance the performance for </section><!-- End systemblock part --> <script src="js/custom.js"></script> </body> -</html> \ No newline at end of file +</html>
