You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2017/06/22 19:42:49 UTC
[1/4] carbondata-site git commit: fixed issues for search,
heading scroller, errorpage and home page minor issues
Repository: carbondata-site
Updated Branches:
refs/heads/asf-site 20e101ec6 -> ce9d44e1d
fixed issues for search,heading scroller,errorpage and home page minor issues
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/2ab45367
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/2ab45367
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/2ab45367
Branch: refs/heads/asf-site
Commit: 2ab45367b66974139f8602337997be6fb12650b6
Parents: 20e101e
Author: kamleshknoldus <ka...@knoldus.in>
Authored: Wed Jun 14 18:26:59 2017 +0530
Committer: kamleshknoldus <ka...@knoldus.in>
Committed: Mon Jun 19 13:24:19 2017 +0530
----------------------------------------------------------------------
src/main/scala/html/header.html | 2 +-
src/main/webapp/.htaccess | 1 +
src/main/webapp/css/style.css | 46 +++++++++-------
src/main/webapp/errorpage.html | 92 +++++++++++++++++++++++++++++++
src/main/webapp/images/404error.png | Bin 0 -> 15082 bytes
src/main/webapp/index.html | 2 +-
src/main/webapp/js/custom.js | 73 ++++++------------------
src/main/webapp/mainpage.html | 3 +-
8 files changed, 137 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/scala/html/header.html
----------------------------------------------------------------------
diff --git a/src/main/scala/html/header.html b/src/main/scala/html/header.html
index 86168e0..90b7f49 100644
--- a/src/main/scala/html/header.html
+++ b/src/main/scala/html/header.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/webapp/.htaccess
----------------------------------------------------------------------
diff --git a/src/main/webapp/.htaccess b/src/main/webapp/.htaccess
new file mode 100644
index 0000000..f558cdf
--- /dev/null
+++ b/src/main/webapp/.htaccess
@@ -0,0 +1 @@
+ErrorDocument 404 http://carbondata.apache.org/errorpage.html
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/webapp/css/style.css
----------------------------------------------------------------------
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index db98cdb..eb408b8 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -44,14 +44,15 @@ img{ max-width:100%; height:auto}
.cd-mail-btn {
font-size: 13px;
- color: #ff943d;
+ /* color: #ff943d;*/
clear: both;
text-transform: capitalize;
font-weight: 200;
- margin: 13px;
+ margin: 13px 7px;
}
.cd-mail-btn:hover{
- color: #00a0d2;
+ color: #ff943d;
+ text-decoration:underline
}
@@ -64,7 +65,7 @@ img{ max-width:100%; height:auto}
.mobile-view{ display:none}
header{position: fixed;z-index: 9999; width: 100%; height:46px }
.fixed-padding{ position: relative; padding-top:46px; }
-a.logo { width: 170px; display: inline-block; margin: 1px 0;}
+a.logo { width: 170px; display: inline-block; margin: 1px 0 0;}
.cd-navbar-wrapper.navbar {margin-bottom:0px;border-bottom: 4px solid #ff943d; border-radius: 0; min-height: 40px;}
/*.cd_navcontnt { margin-top: 20px;}*/
.cd_navcontnt{ margin-top:9px}
@@ -240,7 +241,7 @@ left: auto; right: auto;}
text-align: left;
margin: 0px 0 10px;
}
-.cd-releaseblock .title .title-underline{ height: 2px; width:50px; background: #444; margin:6px 0; padding: 0; display:block;}
+.cd-releaseblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:6px 0; padding: 0; display:block;}
.cd-releaseblock .release-links { font-size: 14px; color: #444; line-height: 20px; display: block; text-align:left; text-decoration: none}
.cd-releaseblock .release-info { font-size: 14px; color: #444; line-height: 18px; display: block; text-align:left; text-decoration: none}
.cd-releaseblock .release-links:hover { text-decoration: underline; color:#00a0d2;}
@@ -250,6 +251,7 @@ left: auto; right: auto;}
line-height: 18px;
display: inline-block;
text-align: left;
+ width:60px;
}
.cd-releaseblock .nextR{display: block; padding: 2px 15px 15px;}
@@ -273,8 +275,8 @@ left: auto; right: auto;}
.cd-releaseblock .nextR{ display:none;}
.cd-flowblock {padding: 20px 0; background: #fdfdfd; border-bottom: 1px solid #ddd;}
-.cd-flowblock .title {font-size: 22px; color: #444; line-height: 24px; display: block; text-align: center; margin: 10px 4px 30px; height:36px; text-transform: capitalize; font-weight: 500;}
-.cd-flowblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px auto; padding: 0; display:block;}
+.cd-flowblock .title {font-size: 22px; color: #444; line-height: 24px; display: block; text-align: left; margin: 10px 4px 30px; height:36px; text-transform: capitalize; font-weight: 500;}
+.cd-flowblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
.cd-columnblock {display: block; margin:5px 0; padding:10px 10px; height: 150px}
@@ -400,7 +402,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.uniquedata{ background: url(../images/cd-uniquedata-icon.png) no-repeat center center; background-size: 40px; }
.cd-columnblock:hover .iconbox .icon.uniquedata{ background: #ff943d url(../images/cd-uniquedata-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 40px;
+ background-size: 40px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -410,7 +412,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.multilevelindexing{ background: url(../images/cd-multilevelindexing-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.multilevelindexing{ background: #ff943d url(../images/cd-multilevelindexing-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -419,7 +421,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.deepsparkintegration{ background: url(../images/cd-deepsparkintegration-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.deepsparkintegration{ background: #ff943d url(../images/cd-deepsparkintegration-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -428,7 +430,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.advancedpushdownoptimization{ background: url(../images/cd-advancedpushdownoptimization-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.advancedpushdownoptimization{ background: #ff943d url(../images/cd-advancedpushdownoptimization-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -437,7 +439,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.dictionaryencoding{ background: url(../images/cd-dictionaryencoding-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.dictionaryencoding{ background: #ff943d url(../images/cd-dictionaryencoding-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -446,7 +448,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.updatedeletesupport{ background: url(../images/cd-updatedeletesupport-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.updatedeletesupport{ background: #ff943d url(../images/cd-updatedeletesupport-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -484,12 +486,13 @@ cd-updatedeletesupport-icon.png
.cd-thecolumnblock.joinblog{margin-top: 15px; background: #fff; padding:20px; margin: 15px -10px 0; box-shadow: 0 1px 1px #bbb;}
.cd-thecolumnblock.getstartlog { background: #fff; box-shadow: 0 1px 1px #bbb;padding: 15px; margin: 15px 0px 15px -10px;}
.cd-thecolumnblock.latestblog {padding: 15px; background: #fcfcfc; margin: 15px -10px 15px 0px; box-shadow: 0 1px 1px #bbb;}
-.cd-thecolumnblock.getstartlog .title .title-underline, .cd-thecolumnblock.latestblog .title .title-underline {background: #444;}
+.cd-thecolumnblock.getstartlog .title .title-underline, .cd-thecolumnblock.latestblog .title .title-underline {background: #ff943d;}
.cd-thecolumnblock .listlink, .cd-thecolumnblock .orderlist{margin: 6px 0 0 20px; padding: 0;}
.cd-thecolumnblock .listlink li { list-style-type: square; font-size: 13px; line-height: 18px; color: #555; margin-bottom: 8px;word-wrap: break-word;}
.cd-thecolumnblock .orderlist li { font-size: 13px; line-height: 18px; color: #555; margin-bottom: 8px;}
+.cd-thecolumnblock .orderlist li a {margin-right: 10px;}
.cd-thecolumnblock .social-icons{ padding: 5px 0 0; text-align: right; margin: 0}
.cd-thecolumnblock .social-icons i.fa {font-size: 24px; margin-right: 5px;color: #aaa;}
.cd-thecolumnblock .social-icons i.fa:hover {opacity: .7;}
@@ -542,7 +545,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
}
.cd-quickbtns .title {font-size: 22px; color: #444; line-height: 24px; display: block; text-align: left; margin: 10px 4px 10px; height: 40px; text-transform: capitalize; font-weight: 500;}
-.cd-quickbtns .title .title-underline{ height: 2px; width:50px; background: #444; margin:10px 0; padding: 0; display:block;}
+.cd-quickbtns .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
.doc-heading {
@@ -551,7 +554,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
}
.doc-heading .title {font-size: 30px; color: #444; line-height: 24px; display: block; text-align: left; margin: 10px 4px 10px; height: 40px; text-transform: capitalize; font-weight: 500;}
-.doc-heading .title .title-underline{ height: 2px; width:50px; background: #444; margin:10px 0; padding: 0; display:block;}
+.doc-heading .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
.quickstart-btn {
@@ -827,8 +830,7 @@ iframe {
.doc-footer{display: block; position: relative;}
.blog-content p img {max-width: 100%; margin: 20px auto 10px; display: block; border: 1px solid #f4f3f4;}
-.scroll-top{position: fixed; top: auto; right: 10px; bottom:4px; background: #ddd; padding: 2px 6px;
- border-radius: 2px; font-size: 12px; text-decoration: none; color: #666;}
+.scroll-top{position: fixed; top: auto; right: 10px; bottom:4px; background: #ddd; padding:5px 10px;display:none; border-radius: 2px; font-size: 12px; text-decoration: none; color: #666;}
.doc-header span{ margin-right: 30px;}
@@ -1014,13 +1016,15 @@ box-shadow: 0 3px 2px #aaa }
.slider-btn{display: inline-block;
font-size: 14px;
color: #fff;
- border: 1px solid #aaa;
- padding: 8px 20px;
+ padding: 8px 20px;
line-height: 20px;
border-radius: 2px;
+ background: #ff943d;
+ text-shadow: none;
}
-.slider-btn:hover {color: #fff; border: 1px solid #ff943d; background: #ff943d;}
+.slider-btn:hover, .slider-btn:focus{color: #fff; background: #dd6300;}
+
/* ------------------- End Documentation Style here*/
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/webapp/errorpage.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/errorpage.html b/src/main/webapp/errorpage.html
new file mode 100644
index 0000000..090dce5
--- /dev/null
+++ b/src/main/webapp/errorpage.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Page not found</title>
+ <style>
+ body{ font-family: 'Josefin Sans', sans-serif}
+
+ .image-block{padding: 20px;margin: 20px auto; width: 418px; text-align: center}
+ .image-block img{ max-width: 100%}
+ .error-txt{ text-align: center; text-transform: uppercase}
+
+ a { text-decoration: none; margin: 0 10px; }
+
+ a.btn {
+ display: inline-block;
+ color: #666;
+ background-color: #eee;
+ text-transform: uppercase;
+ letter-spacing: 1px;
+ font-size: 13px;
+ padding: 8px 20px;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border: 1px solid rgba(0,0,0,0.3);
+ border-bottom-width: 3px;
+ text-align: center;
+ }
+
+ a.btn:hover {
+ background-color: #e3e3e3;
+ border-color: rgba(0,0,0,0.5);
+ }
+
+ a.btn:active {
+ background-color: #CCC;
+ border-color: rgba(0,0,0,0.9);
+ }
+
+ /* ornage button */
+
+ a.btn.btn-org {
+ background-color: #ff943d;
+ border-color: rgba(0,0,0,0.3);
+ text-shadow: 0 1px 0 rgba(0,0,0,0.5);
+ color: #FFF;
+ }
+
+ a.btn.btn-orgorg:hover {
+ background-color: #dd6300;
+ border-color: rgba(0,0,0,0.5);
+ }
+
+ a.btn.btn-org:active {
+ background-color: #dd6300;
+ border-color: rgba(0,0,0,0.9);
+ }
+
+ @media screen and (max-width:767px ){
+ .image-block{padding: 20px;margin: 20px auto; width:100%; box-sizing: border-box}
+ }
+ </style>
+</head>
+<body style="background:#eee">
+<div class="content-wrapper">
+ <div class="body-wrapper" style="padding-top:20px;">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12 col-sm-12">
+ <div class='image-block'>
+ <img src="images/404error.png" alt="CarbonData "/>
+ </div>
+
+ </div>
+ <div class="col-md-12 col-sm-12">
+ <p class="error-txt" >Oops... Page doesn't exist.</p>
+ <p class="error-txt">
+ <a href="http://carbondata.apache.org/" class="btn btn-org">Go to home page</a>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/webapp/images/404error.png
----------------------------------------------------------------------
diff --git a/src/main/webapp/images/404error.png b/src/main/webapp/images/404error.png
new file mode 100644
index 0000000..004d4b6
Binary files /dev/null and b/src/main/webapp/images/404error.png differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 6e404c5..47d7987 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -136,7 +136,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/webapp/js/custom.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/js/custom.js b/src/main/webapp/js/custom.js
index 734837b..7bcd112 100644
--- a/src/main/webapp/js/custom.js
+++ b/src/main/webapp/js/custom.js
@@ -3,78 +3,29 @@
/*-----------------------------------------------------------*/
$(document).ready(function(){
- if ($(window).width() > 767){
+ if ($(window).width() > 767){
$('ul.nav li.dropdown').hover(function() {
$(this).find('.dropdown-menu').stop(true, true).delay(100).fadeIn(500);
}, function() {
$(this).find('.dropdown-menu').stop(true, true).delay(100).fadeOut(500);
});
}
-});
-
-
-// Documentation page perticular links from landing page
-/*-----------------------------------------------------------*/
-
-/*function getParameterByName(name, url) {
- if (!url) {
- url = window.location.href;
- }
- name = name.replace(/[\[\]]/g, "\\$&");
- var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
- results = regex.exec(url);
- if (!results) return null;
- if (!results[2]) return '';
- return decodeURIComponent(results[2].replace(/\+/g, " "));
-}*/
-
-// conditional loading of documentation page from landing page
-$(document).ready(function(){
- var pagelink;
- var pageLoad = getParameterByName("page", window.location.href);
- console.log(pageLoad);
- switch(pageLoad) {
-
- case "userguide":
- pagelink ="user-guide-toc.html"
- break;
-
- case "uniqueData":
- pagelink ="overview-of-carbondata.html"
- break;
-
- case "quickStart":
- pagelink ="quick-start-guide.html"
- break;
-
- case "dml":
- pagelink ="dml-operation-on-carbondata.html"
- break;
-
- case "ddl":
- pagelink ="ddl-operation-on-carbondata.html"
- break;
-
- case "dm":
- pagelink ="data-management.html"
- break;
-
- }
- $("#viewpage").load(pagelink);
-
- });
+});
- /*Search box*/
- $(function() {
+/*Search box*/
+ $(document).ready(function() {
$( "#search-icon" ).click(function() {
$( "#search-box" ).toggle();
});
});
+
+
+
//headings scroll in top
$(document).ready(function() {
- $('a[href*="#"]:not([href="#"])').click(function () {
+ $('#viewpage a[href*="#"]:not([href="#"])').click(function () {
if (location.pathname.replace(/^\/ /, '') == this.pathname.replace(/^\/ /, '') && location.hostname == this.hostname) {
var target = $(this.hash);
target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
@@ -86,3 +37,11 @@ $(document).ready(function() {
});
});
+
+$(window).scroll(function() {
+ if ($(this).scrollTop()) {
+ $('.scroll-top').fadeIn();
+ } else {
+ $('.scroll-top').fadeOut();
+ }
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/2ab45367/src/main/webapp/mainpage.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/mainpage.html b/src/main/webapp/mainpage.html
index c008f72..436e5fc 100644
--- a/src/main/webapp/mainpage.html
+++ b/src/main/webapp/mainpage.html
@@ -187,8 +187,7 @@
Operations on CarbonData</a></li>
<li><a href="dml-operation-on-carbondata.html">DML
Operations on CarbonData</a></li>
- <li><a href="installation-guide.html">Cluster
- Installation and Deployment</a></li>
+ <li><a href="installation-guide.html">Installation Guide</a></li>
<li><a href="configuration-parameters.html">Configuring
CarbonData</a></li>
<li><a href="faq.html">FAQs</a></li>
[4/4] carbondata-site git commit: Enhance And Fixed UI Bugs
Posted by ch...@apache.org.
Enhance And Fixed UI Bugs
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/ce9d44e1
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/ce9d44e1
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/ce9d44e1
Branch: refs/heads/asf-site
Commit: ce9d44e1d19931ff220c9d94dc93904a79987ddc
Parents: 69cfd21
Author: chenliang613 <ch...@apache.org>
Authored: Fri Jun 23 03:42:17 2017 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Jun 23 03:42:17 2017 +0800
----------------------------------------------------------------------
content/.htaccess | 1 +
content/WEB-INF/classes/MDFileConverter.class | Bin 8088 -> 8964 bytes
content/WEB-INF/classes/application.conf | 3 +-
content/configuration-parameters.html | 14 ++-
content/css/style.css | 46 +++++-----
content/data-management.html | 2 +-
content/ddl-operation-on-carbondata.html | 18 ++--
content/dml-operation-on-carbondata.html | 9 +-
content/errorpage.html | 92 +++++++++++++++++++
content/faq.html | 10 +-
content/file-structure-of-carbondata.html | 2 +-
content/images/404error.png | Bin 0 -> 15082 bytes
content/index.html | 2 +-
content/installation-guide.html | 58 ++++++------
content/js/custom.js | 73 ++++-----------
content/mainpage.html | 3 +-
content/pdf/maven-pdf-plugin.pdf | Bin 193057 -> 230816 bytes
content/quick-start-guide.html | 40 ++++++--
content/supported-data-types-in-carbondata.html | 2 +-
content/troubleshooting.html | 9 +-
content/useful-tips-on-carbondata.html | 27 +++---
21 files changed, 251 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/.htaccess
----------------------------------------------------------------------
diff --git a/content/.htaccess b/content/.htaccess
new file mode 100644
index 0000000..f558cdf
--- /dev/null
+++ b/content/.htaccess
@@ -0,0 +1 @@
+ErrorDocument 404 http://carbondata.apache.org/errorpage.html
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/WEB-INF/classes/MDFileConverter.class
----------------------------------------------------------------------
diff --git a/content/WEB-INF/classes/MDFileConverter.class b/content/WEB-INF/classes/MDFileConverter.class
index 7cde882..84b27b6 100644
Binary files a/content/WEB-INF/classes/MDFileConverter.class and b/content/WEB-INF/classes/MDFileConverter.class differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/WEB-INF/classes/application.conf
----------------------------------------------------------------------
diff --git a/content/WEB-INF/classes/application.conf b/content/WEB-INF/classes/application.conf
index f7f5a09..c7f35cd 100644
--- a/content/WEB-INF/classes/application.conf
+++ b/content/WEB-INF/classes/application.conf
@@ -17,4 +17,5 @@ footerPath="src/main/scala/html/footer.html"
outputFileLocation="src/main/webapp/"
apiUrl="https://raw.githubusercontent.com/apache/carbondata/master/docs/"
mdLink="https://api.github.com/markdown/raw"
-mdFileLocation="src/site/markdown/"
\ No newline at end of file
+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/ce9d44e1/content/configuration-parameters.html
----------------------------------------------------------------------
diff --git a/content/configuration-parameters.html b/content/configuration-parameters.html
index 77b7f77..b257b1e 100644
--- a/content/configuration-parameters.html
+++ b/content/configuration-parameters.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -283,6 +283,12 @@
<td>Enabling this parameter considers persistent data. Enabling this will reduce the execution time of UPDATE operation.</td>
<td></td>
</tr>
+<tr>
+<td>carbon.load.global.sort.partitions</td>
+<td>0</td>
+<td>The Number of partitions to use when shuffling data for sort. If user don't configurate or configurate it less than 1, it uses the number of map tasks as reduce tasks. In general, we recommend 2-3 tasks per CPU core in your cluster.</td>
+<td></td>
+</tr>
</tbody>
</table>
<ul>
@@ -481,7 +487,7 @@
<tr>
<td>carbon.numberof.preserve.segments</td>
<td>0</td>
-<td>If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default.</td>
+<td>If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments = 2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default.</td>
</tr>
<tr>
<td>carbon.allowed.compaction.days</td>
@@ -534,7 +540,7 @@
<tr>
<td>high.cardinality.identify.enable</td>
<td>true</td>
-<td>If the parameter is true, the high cardinality columns of the dictionary code are automatically recognized and these columns will not be used as global dictionary encoding. If the parameter is false, all dictionary encoding columns are used as dictionary encoding. The high cardinality column must meet the following requirements: value of cardinality > configured value of high.cardinalityEqually, the value of cardinality is higher than the threshold.value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageEqually, the ratio of the cardinality value to data row number is higher than the configured percentage.</td>
+<td>If the parameter is true, the high cardinality columns of the dictionary code are automatically recognized and these columns will not be used as global dictionary encoding. If the parameter is false, all dictionary encoding columns are used as dictionary encoding. The high cardinality column must meet the following requirements: value of cardinality > configured value of high.cardinality. Equally, the value of cardinality is higher than the threshold.value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentage. Equally, the ratio of the cardinality value to data row number is higher than the configured percentage. Note: If SINGLE_PASS is used during data load, then this property will be disabled.</td>
</tr>
<tr>
<td>high.cardinality.threshold</td>
@@ -544,7 +550,7 @@
<tr>
<td>high.cardinality.row.count.percentage</td>
<td>80</td>
-<td>Percentage to identify whether column cardinality is more than configured percent of total row count.Configuration value formula:Value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageThe value of the parameter must be larger than 0.</td>
+<td>Percentage to identify whether column cardinality is more than configured percent of total row count.Configuration value formula:Value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentage. The value of the parameter must be larger than 0.</td>
</tr>
<tr>
<td>carbon.cutOffTimestamp</td>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/css/style.css
----------------------------------------------------------------------
diff --git a/content/css/style.css b/content/css/style.css
index db98cdb..eb408b8 100644
--- a/content/css/style.css
+++ b/content/css/style.css
@@ -44,14 +44,15 @@ img{ max-width:100%; height:auto}
.cd-mail-btn {
font-size: 13px;
- color: #ff943d;
+ /* color: #ff943d;*/
clear: both;
text-transform: capitalize;
font-weight: 200;
- margin: 13px;
+ margin: 13px 7px;
}
.cd-mail-btn:hover{
- color: #00a0d2;
+ color: #ff943d;
+ text-decoration:underline
}
@@ -64,7 +65,7 @@ img{ max-width:100%; height:auto}
.mobile-view{ display:none}
header{position: fixed;z-index: 9999; width: 100%; height:46px }
.fixed-padding{ position: relative; padding-top:46px; }
-a.logo { width: 170px; display: inline-block; margin: 1px 0;}
+a.logo { width: 170px; display: inline-block; margin: 1px 0 0;}
.cd-navbar-wrapper.navbar {margin-bottom:0px;border-bottom: 4px solid #ff943d; border-radius: 0; min-height: 40px;}
/*.cd_navcontnt { margin-top: 20px;}*/
.cd_navcontnt{ margin-top:9px}
@@ -240,7 +241,7 @@ left: auto; right: auto;}
text-align: left;
margin: 0px 0 10px;
}
-.cd-releaseblock .title .title-underline{ height: 2px; width:50px; background: #444; margin:6px 0; padding: 0; display:block;}
+.cd-releaseblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:6px 0; padding: 0; display:block;}
.cd-releaseblock .release-links { font-size: 14px; color: #444; line-height: 20px; display: block; text-align:left; text-decoration: none}
.cd-releaseblock .release-info { font-size: 14px; color: #444; line-height: 18px; display: block; text-align:left; text-decoration: none}
.cd-releaseblock .release-links:hover { text-decoration: underline; color:#00a0d2;}
@@ -250,6 +251,7 @@ left: auto; right: auto;}
line-height: 18px;
display: inline-block;
text-align: left;
+ width:60px;
}
.cd-releaseblock .nextR{display: block; padding: 2px 15px 15px;}
@@ -273,8 +275,8 @@ left: auto; right: auto;}
.cd-releaseblock .nextR{ display:none;}
.cd-flowblock {padding: 20px 0; background: #fdfdfd; border-bottom: 1px solid #ddd;}
-.cd-flowblock .title {font-size: 22px; color: #444; line-height: 24px; display: block; text-align: center; margin: 10px 4px 30px; height:36px; text-transform: capitalize; font-weight: 500;}
-.cd-flowblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px auto; padding: 0; display:block;}
+.cd-flowblock .title {font-size: 22px; color: #444; line-height: 24px; display: block; text-align: left; margin: 10px 4px 30px; height:36px; text-transform: capitalize; font-weight: 500;}
+.cd-flowblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
.cd-columnblock {display: block; margin:5px 0; padding:10px 10px; height: 150px}
@@ -400,7 +402,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.uniquedata{ background: url(../images/cd-uniquedata-icon.png) no-repeat center center; background-size: 40px; }
.cd-columnblock:hover .iconbox .icon.uniquedata{ background: #ff943d url(../images/cd-uniquedata-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 40px;
+ background-size: 40px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -410,7 +412,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.multilevelindexing{ background: url(../images/cd-multilevelindexing-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.multilevelindexing{ background: #ff943d url(../images/cd-multilevelindexing-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -419,7 +421,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.deepsparkintegration{ background: url(../images/cd-deepsparkintegration-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.deepsparkintegration{ background: #ff943d url(../images/cd-deepsparkintegration-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -428,7 +430,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.advancedpushdownoptimization{ background: url(../images/cd-advancedpushdownoptimization-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.advancedpushdownoptimization{ background: #ff943d url(../images/cd-advancedpushdownoptimization-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -437,7 +439,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.dictionaryencoding{ background: url(../images/cd-dictionaryencoding-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.dictionaryencoding{ background: #ff943d url(../images/cd-dictionaryencoding-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -446,7 +448,7 @@ cd-updatedeletesupport-icon.png
.cd-columnblock .iconbox .icon.updatedeletesupport{ background: url(../images/cd-updatedeletesupport-icon.png) no-repeat center center; background-size: 36px; }
.cd-columnblock:hover .iconbox .icon.updatedeletesupport{ background: #ff943d url(../images/cd-updatedeletesupport-icon-hover.png) no-repeat center center;
- transform:scale(1.1); background-size: 36px;
+ background-size: 36px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
@@ -484,12 +486,13 @@ cd-updatedeletesupport-icon.png
.cd-thecolumnblock.joinblog{margin-top: 15px; background: #fff; padding:20px; margin: 15px -10px 0; box-shadow: 0 1px 1px #bbb;}
.cd-thecolumnblock.getstartlog { background: #fff; box-shadow: 0 1px 1px #bbb;padding: 15px; margin: 15px 0px 15px -10px;}
.cd-thecolumnblock.latestblog {padding: 15px; background: #fcfcfc; margin: 15px -10px 15px 0px; box-shadow: 0 1px 1px #bbb;}
-.cd-thecolumnblock.getstartlog .title .title-underline, .cd-thecolumnblock.latestblog .title .title-underline {background: #444;}
+.cd-thecolumnblock.getstartlog .title .title-underline, .cd-thecolumnblock.latestblog .title .title-underline {background: #ff943d;}
.cd-thecolumnblock .listlink, .cd-thecolumnblock .orderlist{margin: 6px 0 0 20px; padding: 0;}
.cd-thecolumnblock .listlink li { list-style-type: square; font-size: 13px; line-height: 18px; color: #555; margin-bottom: 8px;word-wrap: break-word;}
.cd-thecolumnblock .orderlist li { font-size: 13px; line-height: 18px; color: #555; margin-bottom: 8px;}
+.cd-thecolumnblock .orderlist li a {margin-right: 10px;}
.cd-thecolumnblock .social-icons{ padding: 5px 0 0; text-align: right; margin: 0}
.cd-thecolumnblock .social-icons i.fa {font-size: 24px; margin-right: 5px;color: #aaa;}
.cd-thecolumnblock .social-icons i.fa:hover {opacity: .7;}
@@ -542,7 +545,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
}
.cd-quickbtns .title {font-size: 22px; color: #444; line-height: 24px; display: block; text-align: left; margin: 10px 4px 10px; height: 40px; text-transform: capitalize; font-weight: 500;}
-.cd-quickbtns .title .title-underline{ height: 2px; width:50px; background: #444; margin:10px 0; padding: 0; display:block;}
+.cd-quickbtns .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
.doc-heading {
@@ -551,7 +554,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
}
.doc-heading .title {font-size: 30px; color: #444; line-height: 24px; display: block; text-align: left; margin: 10px 4px 10px; height: 40px; text-transform: capitalize; font-weight: 500;}
-.doc-heading .title .title-underline{ height: 2px; width:50px; background: #444; margin:10px 0; padding: 0; display:block;}
+.doc-heading .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px 0; padding: 0; display:block;}
.quickstart-btn {
@@ -827,8 +830,7 @@ iframe {
.doc-footer{display: block; position: relative;}
.blog-content p img {max-width: 100%; margin: 20px auto 10px; display: block; border: 1px solid #f4f3f4;}
-.scroll-top{position: fixed; top: auto; right: 10px; bottom:4px; background: #ddd; padding: 2px 6px;
- border-radius: 2px; font-size: 12px; text-decoration: none; color: #666;}
+.scroll-top{position: fixed; top: auto; right: 10px; bottom:4px; background: #ddd; padding:5px 10px;display:none; border-radius: 2px; font-size: 12px; text-decoration: none; color: #666;}
.doc-header span{ margin-right: 30px;}
@@ -1014,13 +1016,15 @@ box-shadow: 0 3px 2px #aaa }
.slider-btn{display: inline-block;
font-size: 14px;
color: #fff;
- border: 1px solid #aaa;
- padding: 8px 20px;
+ padding: 8px 20px;
line-height: 20px;
border-radius: 2px;
+ background: #ff943d;
+ text-shadow: none;
}
-.slider-btn:hover {color: #fff; border: 1px solid #ff943d; background: #ff943d;}
+.slider-btn:hover, .slider-btn:focus{color: #fff; background: #dd6300;}
+
/* ------------------- End Documentation Style here*/
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/data-management.html
----------------------------------------------------------------------
diff --git a/content/data-management.html b/content/data-management.html
index 7349e7f..f835e12 100644
--- a/content/data-management.html
+++ b/content/data-management.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/ddl-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/content/ddl-operation-on-carbondata.html b/content/ddl-operation-on-carbondata.html
index d37088f..735ca17 100644
--- a/content/ddl-operation-on-carbondata.html
+++ b/content/ddl-operation-on-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -250,8 +250,8 @@
<p>Column groups with more than one column are stored in row format, instead of columnar format. By default, each column is a separate column group.</p>
</li>
</ul>
-<pre><code>TBLPROPERTIES ('COLUMN_GROUPS'='(column1, column2),
-(Column3,Column4,Column5)')
+<pre><code> TBLPROPERTIES ('COLUMN_GROUPS'='(column1, column2),
+ (Column3,Column4,Column5)')
</code></pre>
<ul>
<li>
@@ -426,11 +426,14 @@ By default inverted index is enabled. The user can disable the inverted index cr
<a id="examples-1" class="anchor" href="#examples-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Examples:</h4>
<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING);
</code></pre>
-<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING) TBLPROPERTIES('DICTIONARY_EXCLUDE'='b1');
+<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING)
+ TBLPROPERTIES('DICTIONARY_EXCLUDE'='b1');
</code></pre>
-<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING) TBLPROPERTIES('DICTIONARY_INCLUDE'='a1');
+<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING)
+ TBLPROPERTIES('DICTIONARY_INCLUDE'='a1');
</code></pre>
-<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING) TBLPROPERTIES('DEFAULT.VALUE.a1'='10');
+<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING)
+ TBLPROPERTIES('DEFAULT.VALUE.a1'='10');
</code></pre>
<h3>
<a id="drop-columns" class="anchor" href="#drop-columns" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a><strong>DROP COLUMNS</strong>
@@ -493,7 +496,8 @@ By default inverted index is enabled. The user can disable the inverted index cr
<a id="change-data-type" class="anchor" href="#change-data-type" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a><strong>CHANGE DATA TYPE</strong>
</h3>
<p>This command is used to change the data type from INT to BIGINT or decimal precision from lower to higher.</p>
-<pre><code> ALTER TABLE [db_name.]table_name CHANGE col_name col_name changed_column_type;
+<pre><code> ALTER TABLE [db_name.]table_name
+ CHANGE col_name col_name changed_column_type;
</code></pre>
<h4>
<a id="parameter-description-5" class="anchor" href="#parameter-description-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Parameter Description</h4>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/dml-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/content/dml-operation-on-carbondata.html b/content/dml-operation-on-carbondata.html
index bf5442f..babba56 100644
--- a/content/dml-operation-on-carbondata.html
+++ b/content/dml-operation-on-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -263,7 +263,7 @@ OPTIONS(property_name=property_value, ...)
</li>
<li>
<p><strong>COMPLEX_DELIMITER_LEVEL_2:</strong> Split the complex type nested data column in a row. Applies level_1 delimiter & applies level_2 based on complex data type (eg., a:b$c:d --> Array> = {{a,b},{c,d}}).</p>
-<pre><code>OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':')
+<pre><code>OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':')
</code></pre>
</li>
<li>
@@ -297,6 +297,9 @@ column2:dictionaryFilePath2')
<li>
<p>If this option is set to some invalid value other than TRUE or FALSE then it uses the default value.</p>
</li>
+<li>
+<p>If this option is set to TRUE, then high.cardinality.identify.enable property will be disabled during data load.</p>
+</li>
</ul>
</li>
</ul>
@@ -543,6 +546,7 @@ SET (column_name1, column_name2,) =
</tr>
</tbody>
</table>
+<p>NOTE: This functionality is currently not supported in Spark 2.x and will support soon.</p>
<h3>
<a id="usage-guidelines-2" class="anchor" href="#usage-guidelines-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Usage Guidelines</h3>
<p>The following conditions must be met for successful updation :</p>
@@ -604,6 +608,7 @@ and EXISTS( SELECT * FROM table3 o WHERE o.column2 > 1);
</tr>
</tbody>
</table>
+<p>NOTE: This functionality is currently not supported in Spark 2.x and will support soon.</p>
<h3>
<a id="examples-2" class="anchor" href="#examples-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Examples</h3>
<pre><code>DELETE FROM columncarbonTable1 d WHERE d.column1 = 'china';
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/errorpage.html
----------------------------------------------------------------------
diff --git a/content/errorpage.html b/content/errorpage.html
new file mode 100644
index 0000000..090dce5
--- /dev/null
+++ b/content/errorpage.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Page not found</title>
+ <style>
+ body{ font-family: 'Josefin Sans', sans-serif}
+
+ .image-block{padding: 20px;margin: 20px auto; width: 418px; text-align: center}
+ .image-block img{ max-width: 100%}
+ .error-txt{ text-align: center; text-transform: uppercase}
+
+ a { text-decoration: none; margin: 0 10px; }
+
+ a.btn {
+ display: inline-block;
+ color: #666;
+ background-color: #eee;
+ text-transform: uppercase;
+ letter-spacing: 1px;
+ font-size: 13px;
+ padding: 8px 20px;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border: 1px solid rgba(0,0,0,0.3);
+ border-bottom-width: 3px;
+ text-align: center;
+ }
+
+ a.btn:hover {
+ background-color: #e3e3e3;
+ border-color: rgba(0,0,0,0.5);
+ }
+
+ a.btn:active {
+ background-color: #CCC;
+ border-color: rgba(0,0,0,0.9);
+ }
+
+ /* ornage button */
+
+ a.btn.btn-org {
+ background-color: #ff943d;
+ border-color: rgba(0,0,0,0.3);
+ text-shadow: 0 1px 0 rgba(0,0,0,0.5);
+ color: #FFF;
+ }
+
+ a.btn.btn-orgorg:hover {
+ background-color: #dd6300;
+ border-color: rgba(0,0,0,0.5);
+ }
+
+ a.btn.btn-org:active {
+ background-color: #dd6300;
+ border-color: rgba(0,0,0,0.9);
+ }
+
+ @media screen and (max-width:767px ){
+ .image-block{padding: 20px;margin: 20px auto; width:100%; box-sizing: border-box}
+ }
+ </style>
+</head>
+<body style="background:#eee">
+<div class="content-wrapper">
+ <div class="body-wrapper" style="padding-top:20px;">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12 col-sm-12">
+ <div class='image-block'>
+ <img src="images/404error.png" alt="CarbonData "/>
+ </div>
+
+ </div>
+ <div class="col-md-12 col-sm-12">
+ <p class="error-txt" >Oops... Page doesn't exist.</p>
+ <p class="error-txt">
+ <a href="http://carbondata.apache.org/" class="btn btn-org">Go to home page</a>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/faq.html
----------------------------------------------------------------------
diff --git a/content/faq.html b/content/faq.html
index 049011e..84a118d 100644
--- a/content/faq.html
+++ b/content/faq.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -203,10 +203,12 @@ By default <strong>carbon.badRecords.location</strong> specifies the following l
<a id="how-to-specify-store-location-while-creating-carbon-session" class="anchor" href="#how-to-specify-store-location-while-creating-carbon-session" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>How to specify store location while creating carbon session?</h2>
<p>The store location specified while creating carbon session is used by the CarbonData to store the meta data like the schema, dictionary files, dictionary meta data and sort indexes.</p>
<p>Try creating <code>carbonsession</code> with <code>storepath</code> specified in the following manner :</p>
-<pre><code>val carbon = SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession(<store_path>)
+<pre><code>val carbon = SparkSession.builder().config(sc.getConf)
+ .getOrCreateCarbonSession(<store_path>)
</code></pre>
<p>Example:</p>
-<pre><code>val carbon = SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession("hdfs://localhost:9000/carbon/store ")
+<pre><code>val carbon = SparkSession.builder().config(sc.getConf)
+ .getOrCreateCarbonSession("hdfs://localhost:9000/carbon/store")
</code></pre>
<h2>
<a id="what-is-carbon-lock-type" class="anchor" href="#what-is-carbon-lock-type" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>What is Carbon Lock Type?</h2>
@@ -223,7 +225,7 @@ The property carbon.lock.type configuration specifies the type of lock to be acq
<p>In order to build CarbonData project it is necessary to specify the spark profile. The spark profile sets the Spark Version. You need to specify the <code>spark version</code> while using Maven to build project.</p>
<h2>
<a id="how-carbon-will-behave-when-execute-insert-operation-in-abnormal-scenarios" class="anchor" href="#how-carbon-will-behave-when-execute-insert-operation-in-abnormal-scenarios" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>How Carbon will behave when execute insert operation in abnormal scenarios?</h2>
-<p>Carbon support insert operation, you can refer to the syntax mentioned in <a href="http://carbondata.apache.org/dml-operation-on-carbondata" target=_blank>DML Operations on CarbonData</a>.
+<p>Carbon support insert operation, you can refer to the syntax mentioned in <a href="dml-operation-on-carbondata.html">DML Operations on CarbonData</a>.
First, create a soucre table in spark-sql and load data into this created table.</p>
<pre><code>CREATE TABLE source_table(
id String,
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/file-structure-of-carbondata.html
----------------------------------------------------------------------
diff --git a/content/file-structure-of-carbondata.html b/content/file-structure-of-carbondata.html
index 8bae601..3567f59 100644
--- a/content/file-structure-of-carbondata.html
+++ b/content/file-structure-of-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/images/404error.png
----------------------------------------------------------------------
diff --git a/content/images/404error.png b/content/images/404error.png
new file mode 100644
index 0000000..004d4b6
Binary files /dev/null and b/content/images/404error.png differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 6e404c5..47d7987 100644
--- a/content/index.html
+++ b/content/index.html
@@ -136,7 +136,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/installation-guide.html
----------------------------------------------------------------------
diff --git a/content/installation-guide.html b/content/installation-guide.html
index 3437e56..d74bbb9 100644
--- a/content/installation-guide.html
+++ b/content/installation-guide.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -209,6 +209,8 @@
</li>
<li>
<p>In Spark node[master], configure the properties mentioned in the following table in <code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</p>
+</li>
+</ol>
<table>
<thead>
<tr>
@@ -220,19 +222,19 @@
<tbody>
<tr>
<td>spark.driver.extraJavaOptions</td>
-<td><code>-Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = $SPARK_HOME/conf/carbon.properties</code></td>
<td>A string of extra JVM options to pass to the driver. For instance, GC settings or other logging.</td>
</tr>
<tr>
<td>spark.executor.extraJavaOptions</td>
-<td><code>-Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = $SPARK_HOME/conf/carbon.properties</code></td>
<td>A string of extra JVM options to pass to executors. For instance, GC settings or other logging. <strong>NOTE</strong>: You can enter multiple values separated by space.</td>
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code> file:</p>
+<ol start="7">
+<li>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code> file:</li>
+</ol>
<table>
<thead>
<tr>
@@ -253,14 +255,12 @@
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Verify the installation. For example:</p>
+<ol start="8">
+<li>Verify the installation. For example:</li>
+</ol>
<pre><code>./spark-shell --master spark://HOSTNAME:PORT --total-executor-cores 2
--executor-memory 2G
</code></pre>
-</li>
-</ol>
<p><strong>NOTE</strong>: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.</p>
<p>To get started with CarbonData : <a href="quick-start-guide.html">Quick Start</a>, <a href="ddl-operation-on-carbondata.html">DDL Operations on CarbonData</a></p>
<h2>
@@ -286,13 +286,15 @@
</li>
<li>
<p>Create <code>tar,gz</code> file of carbonlib folder and move it inside the carbonlib folder.</p>
+</li>
+</ol>
<pre><code>cd $SPARK_HOME
tar -zcvf carbondata.tar.gz carbonlib/
mv carbondata.tar.gz carbonlib/
</code></pre>
-</li>
-<li>
-<p>Configure the properties mentioned in the following table in <code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</p>
+<ol start="4">
+<li>Configure the properties mentioned in the following table in <code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</li>
+</ol>
<table>
<thead>
<tr>
@@ -320,7 +322,7 @@ mv carbondata.tar.gz carbonlib/
<tr>
<td>spark.executor.extraJavaOptions</td>
<td>A string of extra JVM options to pass to executors. For instance <strong>NOTE</strong>: You can enter multiple values separated by space.</td>
-<td><code>-Dcarbon.properties.filepath=carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = carbon.properties</code></td>
</tr>
<tr>
<td>spark.executor.extraClassPath</td>
@@ -335,13 +337,13 @@ mv carbondata.tar.gz carbonlib/
<tr>
<td>spark.driver.extraJavaOptions</td>
<td>A string of extra JVM options to pass to the driver. For instance, GC settings or other logging.</td>
-<td><code>-Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = $SPARK_HOME/conf/carbon.properties</code></td>
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code>:</p>
+<ol start="5">
+<li>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code>:</li>
+</ol>
<table>
<thead>
<tr>
@@ -362,14 +364,12 @@ mv carbondata.tar.gz carbonlib/
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Verify the installation.</p>
-<pre><code> ./bin/spark-shell --master yarn-client --driver-memory 1g
- --executor-cores 2 --executor-memory 2G
-</code></pre>
-</li>
+<ol start="6">
+<li>Verify the installation.</li>
</ol>
+<pre><code> ./bin/spark-shell --master yarn-client --driver-memory 1g
+ --executor-cores 2 --executor-memory 2G
+</code></pre>
<p><strong>NOTE</strong>: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.</p>
<p>Getting started with CarbonData : <a href="quick-start-guide.html">Quick Start</a>, <a href="ddl-operation-on-carbondata.html">DDL Operations on CarbonData</a></p>
<h2>
@@ -378,7 +378,8 @@ mv carbondata.tar.gz carbonlib/
<a id="starting-carbondata-thrift-server" class="anchor" href="#starting-carbondata-thrift-server" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Starting CarbonData Thrift Server.</h3>
<p>a. cd <code>$SPARK_HOME</code></p>
<p>b. Run the following command to start the CarbonData thrift server.</p>
-<pre><code>./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true
+<pre><code>./bin/spark-submit
+--conf spark.sql.hive.thriftServer.singleSession=true
--class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
$SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path>
</code></pre>
@@ -407,7 +408,8 @@ $SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path>
<ul>
<li>Start with default memory and executors.</li>
</ul>
-<pre><code>./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true
+<pre><code>./bin/spark-submit
+--conf spark.sql.hive.thriftServer.singleSession=true
--class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
$SPARK_HOME/carbonlib
/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/js/custom.js
----------------------------------------------------------------------
diff --git a/content/js/custom.js b/content/js/custom.js
index 734837b..7bcd112 100644
--- a/content/js/custom.js
+++ b/content/js/custom.js
@@ -3,78 +3,29 @@
/*-----------------------------------------------------------*/
$(document).ready(function(){
- if ($(window).width() > 767){
+ if ($(window).width() > 767){
$('ul.nav li.dropdown').hover(function() {
$(this).find('.dropdown-menu').stop(true, true).delay(100).fadeIn(500);
}, function() {
$(this).find('.dropdown-menu').stop(true, true).delay(100).fadeOut(500);
});
}
-});
-
-
-// Documentation page perticular links from landing page
-/*-----------------------------------------------------------*/
-
-/*function getParameterByName(name, url) {
- if (!url) {
- url = window.location.href;
- }
- name = name.replace(/[\[\]]/g, "\\$&");
- var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
- results = regex.exec(url);
- if (!results) return null;
- if (!results[2]) return '';
- return decodeURIComponent(results[2].replace(/\+/g, " "));
-}*/
-
-// conditional loading of documentation page from landing page
-$(document).ready(function(){
- var pagelink;
- var pageLoad = getParameterByName("page", window.location.href);
- console.log(pageLoad);
- switch(pageLoad) {
-
- case "userguide":
- pagelink ="user-guide-toc.html"
- break;
-
- case "uniqueData":
- pagelink ="overview-of-carbondata.html"
- break;
-
- case "quickStart":
- pagelink ="quick-start-guide.html"
- break;
-
- case "dml":
- pagelink ="dml-operation-on-carbondata.html"
- break;
-
- case "ddl":
- pagelink ="ddl-operation-on-carbondata.html"
- break;
-
- case "dm":
- pagelink ="data-management.html"
- break;
-
- }
- $("#viewpage").load(pagelink);
-
- });
+});
- /*Search box*/
- $(function() {
+/*Search box*/
+ $(document).ready(function() {
$( "#search-icon" ).click(function() {
$( "#search-box" ).toggle();
});
});
+
+
+
//headings scroll in top
$(document).ready(function() {
- $('a[href*="#"]:not([href="#"])').click(function () {
+ $('#viewpage a[href*="#"]:not([href="#"])').click(function () {
if (location.pathname.replace(/^\/ /, '') == this.pathname.replace(/^\/ /, '') && location.hostname == this.hostname) {
var target = $(this.hash);
target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
@@ -86,3 +37,11 @@ $(document).ready(function() {
});
});
+
+$(window).scroll(function() {
+ if ($(this).scrollTop()) {
+ $('.scroll-top').fadeIn();
+ } else {
+ $('.scroll-top').fadeOut();
+ }
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/mainpage.html
----------------------------------------------------------------------
diff --git a/content/mainpage.html b/content/mainpage.html
index c008f72..436e5fc 100644
--- a/content/mainpage.html
+++ b/content/mainpage.html
@@ -187,8 +187,7 @@
Operations on CarbonData</a></li>
<li><a href="dml-operation-on-carbondata.html">DML
Operations on CarbonData</a></li>
- <li><a href="installation-guide.html">Cluster
- Installation and Deployment</a></li>
+ <li><a href="installation-guide.html">Installation Guide</a></li>
<li><a href="configuration-parameters.html">Configuring
CarbonData</a></li>
<li><a href="faq.html">FAQs</a></li>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/pdf/maven-pdf-plugin.pdf
----------------------------------------------------------------------
diff --git a/content/pdf/maven-pdf-plugin.pdf b/content/pdf/maven-pdf-plugin.pdf
index 290e323..91bdbef 100644
Binary files a/content/pdf/maven-pdf-plugin.pdf and b/content/pdf/maven-pdf-plugin.pdf differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/quick-start-guide.html
----------------------------------------------------------------------
diff --git a/content/quick-start-guide.html b/content/quick-start-guide.html
index 26cb0f0..8c7a1b7 100644
--- a/content/quick-start-guide.html
+++ b/content/quick-start-guide.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -203,25 +203,35 @@ import org.apache.spark.sql.CarbonSession._
<ul>
<li>Create a CarbonSession :</li>
</ul>
-<pre><code>val carbon = SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession("<hdfs store path>")
+<pre><code>val carbon = SparkSession.builder().config(sc.getConf)
+ .getOrCreateCarbonSession("<hdfs store path>")
</code></pre>
-<p><strong>NOTE</strong>: By default metastore location is pointed to <code>../carbon.metastore</code>, user can provide own metastore location to CarbonSession like <code>SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession("<hdfs store path>", "<local metastore path>")</code></p>
+<p><strong>NOTE</strong>: By default metastore location is pointed to <code>../carbon.metastore</code>, user can provide own metastore location to CarbonSession like <code>SparkSession.builder().config(sc.getConf) .getOrCreateCarbonSession("<hdfs store path>", "<local metastore path>")</code></p>
<h4>
<a id="executing-queries" class="anchor" href="#executing-queries" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Executing Queries</h4>
<h6>
<a id="creating-a-table" class="anchor" href="#creating-a-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Creating a Table</h6>
-<pre><code>scala>carbon.sql("CREATE TABLE IF NOT EXISTS test_table(id string, name string, city string, age Int) STORED BY 'carbondata'")
+<pre><code>scala>carbon.sql("CREATE TABLE
+ IF NOT EXISTS test_table(
+ id string,
+ name string,
+ city string,
+ age Int)
+ STORED BY 'carbondata'")
</code></pre>
<h6>
<a id="loading-data-to-a-table" class="anchor" href="#loading-data-to-a-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Loading Data to a Table</h6>
-<pre><code>scala>carbon.sql("LOAD DATA INPATH 'sample.csv file path' INTO TABLE test_table")
+<pre><code>scala>carbon.sql("LOAD DATA INPATH 'sample.csv file path'
+ INTO TABLE test_table")
</code></pre>
<p><strong>NOTE</strong>: Please provide the real file path of <code>sample.csv</code> for the above script.</p>
<h6>
<a id="query-data-from-a-table" class="anchor" href="#query-data-from-a-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Query Data from a Table</h6>
<pre><code>scala>carbon.sql("SELECT * FROM test_table").show()
-scala>carbon.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY city").show()
+scala>carbon.sql("SELECT city, avg(age), sum(age)
+ FROM test_table
+ GROUP BY city").show()
</code></pre>
<h2>
<a id="interactive-analysis-with-spark-shell-version-16" class="anchor" href="#interactive-analysis-with-spark-shell-version-16" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Interactive Analysis with Spark Shell Version 1.6</h2>
@@ -230,7 +240,8 @@ scala>carbon.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY ci
<p>Start Spark shell by running the following command in the Spark directory:</p>
<pre><code>./bin/spark-shell --jars <carbondata assembly jar path>
</code></pre>
-<p><strong>NOTE</strong>: Assembly jar will be available after <a href="https://github.com/apache/carbondata/blob/master/build/README.md" target=_blank>building CarbonData</a> and can be copied from <code>./assembly/target/scala-2.1x/carbondata_xxx.jar</code></p>
+<p><strong>NOTE</strong>: Assembly jar will be available after [building CarbonData](<a href="https://github.com/apache/carbondata/" target=_blank>https://github.com/apache/carbondata/</a>
+blob/master/build/README.md) and can be copied from <code>./assembly/target/scala-2.1x/carbondata_xxx.jar</code></p>
<p><strong>NOTE</strong>: In this shell, SparkContext is readily available as <code>sc</code>.</p>
<ul>
<li>In order to execute the Queries we need to import CarbonContext:</li>
@@ -247,20 +258,29 @@ scala>carbon.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY ci
<a id="executing-queries-1" class="anchor" href="#executing-queries-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Executing Queries</h4>
<h6>
<a id="creating-a-table-1" class="anchor" href="#creating-a-table-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Creating a Table</h6>
-<pre><code>scala>cc.sql("CREATE TABLE IF NOT EXISTS test_table (id string, name string, city string, age Int) STORED BY 'carbondata'")
+<pre><code>scala>cc.sql("CREATE TABLE
+ IF NOT EXISTS test_table (
+ id string,
+ name string,
+ city string,
+ age Int)
+ STORED BY 'carbondata'")
</code></pre>
<p>To see the table created :</p>
<pre><code>scala>cc.sql("SHOW TABLES").show()
</code></pre>
<h6>
<a id="loading-data-to-a-table-1" class="anchor" href="#loading-data-to-a-table-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Loading Data to a Table</h6>
-<pre><code>scala>cc.sql("LOAD DATA INPATH 'sample.csv file path' INTO TABLE test_table")
+<pre><code>scala>cc.sql("LOAD DATA INPATH 'sample.csv file path'
+ INTO TABLE test_table")
</code></pre>
<p><strong>NOTE</strong>: Please provide the real file path of <code>sample.csv</code> for the above script.</p>
<h6>
<a id="query-data-from-a-table-1" class="anchor" href="#query-data-from-a-table-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Query Data from a Table</h6>
<pre><code>scala>cc.sql("SELECT * FROM test_table").show()
-scala>cc.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY city").show()
+scala>cc.sql("SELECT city, avg(age), sum(age)
+ FROM test_table
+ GROUP BY city").show()
</code></pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/supported-data-types-in-carbondata.html
----------------------------------------------------------------------
diff --git a/content/supported-data-types-in-carbondata.html b/content/supported-data-types-in-carbondata.html
index 74ad405..9ec0e9a 100644
--- a/content/supported-data-types-in-carbondata.html
+++ b/content/supported-data-types-in-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/troubleshooting.html
----------------------------------------------------------------------
diff --git a/content/troubleshooting.html b/content/troubleshooting.html
index 9ca7338..fd2cc95 100644
--- a/content/troubleshooting.html
+++ b/content/troubleshooting.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -196,12 +196,9 @@ $OverrideCatalog$$overrides_$e
<p>Use the following command :</p>
</li>
</ol>
-<pre><code>```
- "mvn -Pspark-2.1 -Dspark.version {yourSparkVersion} clean package"
-```
-
-Note : Refrain from using "mvn clean package" without specifying the profile.
+<pre><code>"mvn -Pspark-2.1 -Dspark.version {yourSparkVersion} clean package"
</code></pre>
+<p>Note : Refrain from using "mvn clean package" without specifying the profile.</p>
<h2>
<a id="failed-to-execute-load-query-on-cluster" class="anchor" href="#failed-to-execute-load-query-on-cluster" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Failed to execute load query on cluster.</h2>
<p><strong>Symptom</strong></p>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/ce9d44e1/content/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --git a/content/useful-tips-on-carbondata.html b/content/useful-tips-on-carbondata.html
index a15f7a0..29235a2 100644
--- a/content/useful-tips-on-carbondata.html
+++ b/content/useful-tips-on-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -169,7 +169,7 @@ The following sections will elaborate on the above topics :</p>
<ul>
<li><a href="#suggestions-to-create-carbondata-table">Suggestions to create CarbonData Table</a></li>
<li><a href="#configuration-for-optimizing-data-loading-performance-for-massive-data">Configuration for Optimizing Data Loading performance for Massive Data</a></li>
-<li><a href="#optimizing-mass-data-loading">Optimizing Mass Data Loading</a></li>
+<li><a href="#configurations-for-optimizing-carbondata-performance">Optimizing Mass Data Loading</a></li>
</ul>
<h2>
<a id="suggestions-to-create-carbondata-table" class="anchor" href="#suggestions-to-create-carbondata-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Suggestions to Create CarbonData Table</h2>
@@ -277,7 +277,7 @@ The create table command can be modified as below :</p>
</ul>
<pre><code> create table carbondata_table(
Dime_1 String,
- BEGIN_TIME bigint
+ BEGIN_TIME bigint,
HOST String,
MSISDN String,
...
@@ -294,7 +294,7 @@ query performance. The create table command can be modified as below :</p>
</ul>
<pre><code> create table carbondata_table(
Dime_1 String,
- BEGIN_TIME bigint
+ BEGIN_TIME bigint,
HOST String,
MSISDN String,
counter_1 double,
@@ -309,8 +309,8 @@ query performance. The create table command can be modified as below :</p>
<ul>
<li>
<p><strong>Columns of incremental character should be re-arranged at the end of dimensions</strong></p>
-<p>Consider the following scenario where data is loaded each day and the start_time is incremental for each load, it is
-suggested to put start_time at the end of dimensions.</p>
+<p>Consider the following scenario where data is loaded each day and the begin_time is incremental for each load, it is
+suggested to put begin_time at the end of dimensions.</p>
<p>Incremental values are efficient in using min/max index. The create table command can be modified as below :</p>
</li>
</ul>
@@ -342,7 +342,7 @@ excessive memory usage.</p>
<p>CarbonData supports large data load, in this process sorting data while loading consumes a lot of memory and disk IO and
this can result sometimes in "Out Of Memory" exception.
If you do not have much memory to use, then you may prefer to slow the speed of data loading instead of data load failure.
-You can configure CarbonData by tuning following properties in carbon.properties file to get a better performance.:</p>
+You can configure CarbonData by tuning following properties in carbon.properties file to get a better performance.</p>
<table>
<thead>
<tr>
@@ -359,8 +359,8 @@ You can configure CarbonData by tuning following properties in carbon.properties
</tr>
<tr>
<td>carbon.sort.size</td>
-<td>Data loading</td>
<td>Default: 100000. The value should be >= 100.</td>
+<td>Threshold to write local file in sort step when loading data</td>
</tr>
<tr>
<td>carbon.sort.file.write.buffer.size</td>
@@ -385,7 +385,7 @@ You can configure CarbonData by tuning following properties in carbon.properties
</tbody>
</table>
<p>For example, if there are 10 million records ,and i have only 16 cores ,64GB memory, will be loaded to CarbonData table.
-Using the default configuration always fail in sort step. Modify carbon.properties as suggested below</p>
+Using the default configuration always fail in sort step. Modify carbon.properties as suggested below:</p>
<pre><code>carbon.number.of.cores.block.sort=1
carbon.merge.sort.reader.thread=1
carbon.sort.size=5000
@@ -430,14 +430,14 @@ scenarios. After the completion of POC, some of the configurations impacting the
</tr>
<tr>
<td>spark.sql.shuffle.partitions</td>
-<td>spark/con/spark-defaults.conf</td>
+<td>spark/conf/spark-defaults.conf</td>
<td>Querying</td>
<td>The number of task started when spark shuffle.</td>
<td>The value can be 1 to 2 times as much as the executor cores. In an aggregation scenario, reducing the number from 200 to 32 reduced the query time from 17 to 9 seconds.</td>
</tr>
<tr>
-<td>num-executors/executor-cores/executor-memory</td>
-<td>spark/con/spark-defaults.conf</td>
+<td>spark.executor.instances/spark.executor.cores/spark.executor.memory</td>
+<td>spark/conf/spark-defaults.conf</td>
<td>Querying</td>
<td>The number of executors, CPU cores, and memory used for CarbonData query.</td>
<td>In the bank scenario, we provide the 4 CPUs cores and 15 GB for each executor which can get good performance. This 2 value does not mean more the better. It needs to be configured properly in case of limited resources. For example, In the bank scenario, it has enough CPU 32 cores each node but less memory 64 GB each node. So we cannot give more CPU but less memory. For example, when 4 cores and 12GB for each executor. It sometimes happens GC during the query which impact the query performance very much from the 3 second to more than 15 seconds. In this scenario need to increase the memory or decrease the CPU cores.</td>
@@ -458,8 +458,7 @@ scenarios. After the completion of POC, some of the configurations impacting the
</tr>
</tbody>
</table>
-<p>Note: If your CarbonData instance is provided only for query, you may specify the conf 'spark.speculation=true' which is conf
-in spark.</p>
+<p>Note: If your CarbonData instance is provided only for query, you may specify the property 'spark.speculation=true' which is in conf directory of spark.</p>
</div>
</div>
</div>
[2/4] carbondata-site git commit: Fixed Image linking issue in pdf
conversion And Added Update Html.
Posted by ch...@apache.org.
Fixed Image linking issue in pdf conversion And Added Update Html.
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/0a70c06d
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/0a70c06d
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/0a70c06d
Branch: refs/heads/asf-site
Commit: 0a70c06d4a057535b52252b0c98e902900c1a94a
Parents: 2ab4536
Author: jatin <ja...@knoldus.in>
Authored: Wed Jun 21 12:49:52 2017 +0530
Committer: jatin <ja...@knoldus.in>
Committed: Wed Jun 21 12:51:14 2017 +0530
----------------------------------------------------------------------
src/main/resources/application.conf | 3 +-
src/main/scala/MDFileConverter.scala | 21 +++++++
src/main/webapp/configuration-parameters.html | 14 +++--
src/main/webapp/data-management.html | 2 +-
.../webapp/ddl-operation-on-carbondata.html | 18 +++---
.../webapp/dml-operation-on-carbondata.html | 9 ++-
src/main/webapp/faq.html | 10 ++--
.../webapp/file-structure-of-carbondata.html | 2 +-
src/main/webapp/installation-guide.html | 58 ++++++++++---------
src/main/webapp/pdf/maven-pdf-plugin.pdf | Bin 193057 -> 230816 bytes
src/main/webapp/quick-start-guide.html | 40 +++++++++----
.../supported-data-types-in-carbondata.html | 2 +-
src/main/webapp/troubleshooting.html | 9 +--
src/main/webapp/useful-tips-on-carbondata.html | 27 +++++----
14 files changed, 136 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index f7f5a09..c7f35cd 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -17,4 +17,5 @@ footerPath="src/main/scala/html/footer.html"
outputFileLocation="src/main/webapp/"
apiUrl="https://raw.githubusercontent.com/apache/carbondata/master/docs/"
mdLink="https://api.github.com/markdown/raw"
-mdFileLocation="src/site/markdown/"
\ No newline at end of file
+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/0a70c06d/src/main/scala/MDFileConverter.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/MDFileConverter.scala b/src/main/scala/MDFileConverter.scala
index bc5a6f8..1fd0bef 100644
--- a/src/main/scala/MDFileConverter.scala
+++ b/src/main/scala/MDFileConverter.scala
@@ -2,6 +2,8 @@ import com.google.inject.Inject
import org.slf4j.{Logger, LoggerFactory}
import services.{ConfService, DataService, FileService}
+import scala.util.matching.Regex
+
class MDFileConverter @Inject()(fileService: FileService, confService: ConfService, dataService: DataService) {
val logger: Logger = LoggerFactory.getLogger(classOf[MDFileConverter])
val url: String = confService.readString("apiUrl")
@@ -20,6 +22,7 @@ class MDFileConverter @Inject()(fileService: FileService, confService: ConfServi
*/
def convertToHtml(status: Boolean): String = {
val listOfFiles: List[String] = confService.readListOfString("fileList")
+ val imageFileList: List[String] =confService.readListOfString("imagesFilesList")
val statusList: List[String] = listOfFiles.map { file =>
val fileURLContent: String = dataService.dataOnGetRequest(url + file + inputFileExtension)
val getFileData: Option[String] = dataService.dataOnPostRequest(fileURLContent)
@@ -28,6 +31,12 @@ class MDFileConverter @Inject()(fileService: FileService, confService: ConfServi
logger.info(s"Begin writing [ $file outputFileExtension ] at $location")
val statusHtmlFile = fileService.writeToFile(location + file + outputFileExtension, headerContent + fileData + footerContent)
saveMdFilesForPDF(status, fileURLContent, file)
+ if (imageFileList.contains(file)) {
+ saveMdFilesForPDF(status, changeImageLink(fileURLContent), file)
+ }
+ else {
+ saveMdFilesForPDF(status, fileURLContent, file)
+ }
if (statusHtmlFile) {
logger.info(s"Successfully written [ $file $outputFileExtension ] at $location")
"Success"
@@ -53,6 +62,7 @@ class MDFileConverter @Inject()(fileService: FileService, confService: ConfServi
/**
* saves the fetched MD Files for generation of PDF
+ *
* @param status
* @param fileURLContent
* @param file
@@ -67,5 +77,16 @@ class MDFileConverter @Inject()(fileService: FileService, confService: ConfServi
false
}
}
+ /**
+ * changes git link of image to local image for generation of pdf
+ *
+ * @param content
+ * @return
+ */
+ private def changeImageLink(content: String): String = {
+ val modifyImagePattern: Regex = """(../docs/images/)([a-zA-Z0-9-/._]+)(\?raw=true)""".r
+ val contentAfterModifyImageLink: String = modifyImagePattern replaceAllIn(content, "../../src/site/images/"+"$2"+"")
+ contentAfterModifyImageLink
+ }
}
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/configuration-parameters.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/configuration-parameters.html b/src/main/webapp/configuration-parameters.html
index 77b7f77..b257b1e 100644
--- a/src/main/webapp/configuration-parameters.html
+++ b/src/main/webapp/configuration-parameters.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -283,6 +283,12 @@
<td>Enabling this parameter considers persistent data. Enabling this will reduce the execution time of UPDATE operation.</td>
<td></td>
</tr>
+<tr>
+<td>carbon.load.global.sort.partitions</td>
+<td>0</td>
+<td>The Number of partitions to use when shuffling data for sort. If user don't configurate or configurate it less than 1, it uses the number of map tasks as reduce tasks. In general, we recommend 2-3 tasks per CPU core in your cluster.</td>
+<td></td>
+</tr>
</tbody>
</table>
<ul>
@@ -481,7 +487,7 @@
<tr>
<td>carbon.numberof.preserve.segments</td>
<td>0</td>
-<td>If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default.</td>
+<td>If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments = 2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default.</td>
</tr>
<tr>
<td>carbon.allowed.compaction.days</td>
@@ -534,7 +540,7 @@
<tr>
<td>high.cardinality.identify.enable</td>
<td>true</td>
-<td>If the parameter is true, the high cardinality columns of the dictionary code are automatically recognized and these columns will not be used as global dictionary encoding. If the parameter is false, all dictionary encoding columns are used as dictionary encoding. The high cardinality column must meet the following requirements: value of cardinality > configured value of high.cardinalityEqually, the value of cardinality is higher than the threshold.value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageEqually, the ratio of the cardinality value to data row number is higher than the configured percentage.</td>
+<td>If the parameter is true, the high cardinality columns of the dictionary code are automatically recognized and these columns will not be used as global dictionary encoding. If the parameter is false, all dictionary encoding columns are used as dictionary encoding. The high cardinality column must meet the following requirements: value of cardinality > configured value of high.cardinality. Equally, the value of cardinality is higher than the threshold.value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentage. Equally, the ratio of the cardinality value to data row number is higher than the configured percentage. Note: If SINGLE_PASS is used during data load, then this property will be disabled.</td>
</tr>
<tr>
<td>high.cardinality.threshold</td>
@@ -544,7 +550,7 @@
<tr>
<td>high.cardinality.row.count.percentage</td>
<td>80</td>
-<td>Percentage to identify whether column cardinality is more than configured percent of total row count.Configuration value formula:Value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageThe value of the parameter must be larger than 0.</td>
+<td>Percentage to identify whether column cardinality is more than configured percent of total row count.Configuration value formula:Value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentage. The value of the parameter must be larger than 0.</td>
</tr>
<tr>
<td>carbon.cutOffTimestamp</td>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/data-management.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/data-management.html b/src/main/webapp/data-management.html
index 7349e7f..f835e12 100644
--- a/src/main/webapp/data-management.html
+++ b/src/main/webapp/data-management.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/ddl-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/ddl-operation-on-carbondata.html b/src/main/webapp/ddl-operation-on-carbondata.html
index d37088f..735ca17 100644
--- a/src/main/webapp/ddl-operation-on-carbondata.html
+++ b/src/main/webapp/ddl-operation-on-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -250,8 +250,8 @@
<p>Column groups with more than one column are stored in row format, instead of columnar format. By default, each column is a separate column group.</p>
</li>
</ul>
-<pre><code>TBLPROPERTIES ('COLUMN_GROUPS'='(column1, column2),
-(Column3,Column4,Column5)')
+<pre><code> TBLPROPERTIES ('COLUMN_GROUPS'='(column1, column2),
+ (Column3,Column4,Column5)')
</code></pre>
<ul>
<li>
@@ -426,11 +426,14 @@ By default inverted index is enabled. The user can disable the inverted index cr
<a id="examples-1" class="anchor" href="#examples-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Examples:</h4>
<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING);
</code></pre>
-<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING) TBLPROPERTIES('DICTIONARY_EXCLUDE'='b1');
+<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING)
+ TBLPROPERTIES('DICTIONARY_EXCLUDE'='b1');
</code></pre>
-<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING) TBLPROPERTIES('DICTIONARY_INCLUDE'='a1');
+<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING)
+ TBLPROPERTIES('DICTIONARY_INCLUDE'='a1');
</code></pre>
-<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING) TBLPROPERTIES('DEFAULT.VALUE.a1'='10');
+<pre><code> ALTER TABLE carbon ADD COLUMNS (a1 INT, b1 STRING)
+ TBLPROPERTIES('DEFAULT.VALUE.a1'='10');
</code></pre>
<h3>
<a id="drop-columns" class="anchor" href="#drop-columns" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a><strong>DROP COLUMNS</strong>
@@ -493,7 +496,8 @@ By default inverted index is enabled. The user can disable the inverted index cr
<a id="change-data-type" class="anchor" href="#change-data-type" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a><strong>CHANGE DATA TYPE</strong>
</h3>
<p>This command is used to change the data type from INT to BIGINT or decimal precision from lower to higher.</p>
-<pre><code> ALTER TABLE [db_name.]table_name CHANGE col_name col_name changed_column_type;
+<pre><code> ALTER TABLE [db_name.]table_name
+ CHANGE col_name col_name changed_column_type;
</code></pre>
<h4>
<a id="parameter-description-5" class="anchor" href="#parameter-description-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Parameter Description</h4>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/dml-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/dml-operation-on-carbondata.html b/src/main/webapp/dml-operation-on-carbondata.html
index bf5442f..babba56 100644
--- a/src/main/webapp/dml-operation-on-carbondata.html
+++ b/src/main/webapp/dml-operation-on-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -263,7 +263,7 @@ OPTIONS(property_name=property_value, ...)
</li>
<li>
<p><strong>COMPLEX_DELIMITER_LEVEL_2:</strong> Split the complex type nested data column in a row. Applies level_1 delimiter & applies level_2 based on complex data type (eg., a:b$c:d --> Array> = {{a,b},{c,d}}).</p>
-<pre><code>OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':')
+<pre><code>OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':')
</code></pre>
</li>
<li>
@@ -297,6 +297,9 @@ column2:dictionaryFilePath2')
<li>
<p>If this option is set to some invalid value other than TRUE or FALSE then it uses the default value.</p>
</li>
+<li>
+<p>If this option is set to TRUE, then high.cardinality.identify.enable property will be disabled during data load.</p>
+</li>
</ul>
</li>
</ul>
@@ -543,6 +546,7 @@ SET (column_name1, column_name2,) =
</tr>
</tbody>
</table>
+<p>NOTE: This functionality is currently not supported in Spark 2.x and will support soon.</p>
<h3>
<a id="usage-guidelines-2" class="anchor" href="#usage-guidelines-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Usage Guidelines</h3>
<p>The following conditions must be met for successful updation :</p>
@@ -604,6 +608,7 @@ and EXISTS( SELECT * FROM table3 o WHERE o.column2 > 1);
</tr>
</tbody>
</table>
+<p>NOTE: This functionality is currently not supported in Spark 2.x and will support soon.</p>
<h3>
<a id="examples-2" class="anchor" href="#examples-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Examples</h3>
<pre><code>DELETE FROM columncarbonTable1 d WHERE d.column1 = 'china';
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/faq.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/faq.html b/src/main/webapp/faq.html
index 049011e..84a118d 100644
--- a/src/main/webapp/faq.html
+++ b/src/main/webapp/faq.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -203,10 +203,12 @@ By default <strong>carbon.badRecords.location</strong> specifies the following l
<a id="how-to-specify-store-location-while-creating-carbon-session" class="anchor" href="#how-to-specify-store-location-while-creating-carbon-session" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>How to specify store location while creating carbon session?</h2>
<p>The store location specified while creating carbon session is used by the CarbonData to store the meta data like the schema, dictionary files, dictionary meta data and sort indexes.</p>
<p>Try creating <code>carbonsession</code> with <code>storepath</code> specified in the following manner :</p>
-<pre><code>val carbon = SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession(<store_path>)
+<pre><code>val carbon = SparkSession.builder().config(sc.getConf)
+ .getOrCreateCarbonSession(<store_path>)
</code></pre>
<p>Example:</p>
-<pre><code>val carbon = SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession("hdfs://localhost:9000/carbon/store ")
+<pre><code>val carbon = SparkSession.builder().config(sc.getConf)
+ .getOrCreateCarbonSession("hdfs://localhost:9000/carbon/store")
</code></pre>
<h2>
<a id="what-is-carbon-lock-type" class="anchor" href="#what-is-carbon-lock-type" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>What is Carbon Lock Type?</h2>
@@ -223,7 +225,7 @@ The property carbon.lock.type configuration specifies the type of lock to be acq
<p>In order to build CarbonData project it is necessary to specify the spark profile. The spark profile sets the Spark Version. You need to specify the <code>spark version</code> while using Maven to build project.</p>
<h2>
<a id="how-carbon-will-behave-when-execute-insert-operation-in-abnormal-scenarios" class="anchor" href="#how-carbon-will-behave-when-execute-insert-operation-in-abnormal-scenarios" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>How Carbon will behave when execute insert operation in abnormal scenarios?</h2>
-<p>Carbon support insert operation, you can refer to the syntax mentioned in <a href="http://carbondata.apache.org/dml-operation-on-carbondata" target=_blank>DML Operations on CarbonData</a>.
+<p>Carbon support insert operation, you can refer to the syntax mentioned in <a href="dml-operation-on-carbondata.html">DML Operations on CarbonData</a>.
First, create a soucre table in spark-sql and load data into this created table.</p>
<pre><code>CREATE TABLE source_table(
id String,
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/file-structure-of-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/file-structure-of-carbondata.html b/src/main/webapp/file-structure-of-carbondata.html
index 8bae601..3567f59 100644
--- a/src/main/webapp/file-structure-of-carbondata.html
+++ b/src/main/webapp/file-structure-of-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/installation-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/installation-guide.html b/src/main/webapp/installation-guide.html
index 3437e56..d74bbb9 100644
--- a/src/main/webapp/installation-guide.html
+++ b/src/main/webapp/installation-guide.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -209,6 +209,8 @@
</li>
<li>
<p>In Spark node[master], configure the properties mentioned in the following table in <code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</p>
+</li>
+</ol>
<table>
<thead>
<tr>
@@ -220,19 +222,19 @@
<tbody>
<tr>
<td>spark.driver.extraJavaOptions</td>
-<td><code>-Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = $SPARK_HOME/conf/carbon.properties</code></td>
<td>A string of extra JVM options to pass to the driver. For instance, GC settings or other logging.</td>
</tr>
<tr>
<td>spark.executor.extraJavaOptions</td>
-<td><code>-Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = $SPARK_HOME/conf/carbon.properties</code></td>
<td>A string of extra JVM options to pass to executors. For instance, GC settings or other logging. <strong>NOTE</strong>: You can enter multiple values separated by space.</td>
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code> file:</p>
+<ol start="7">
+<li>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code> file:</li>
+</ol>
<table>
<thead>
<tr>
@@ -253,14 +255,12 @@
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Verify the installation. For example:</p>
+<ol start="8">
+<li>Verify the installation. For example:</li>
+</ol>
<pre><code>./spark-shell --master spark://HOSTNAME:PORT --total-executor-cores 2
--executor-memory 2G
</code></pre>
-</li>
-</ol>
<p><strong>NOTE</strong>: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.</p>
<p>To get started with CarbonData : <a href="quick-start-guide.html">Quick Start</a>, <a href="ddl-operation-on-carbondata.html">DDL Operations on CarbonData</a></p>
<h2>
@@ -286,13 +286,15 @@
</li>
<li>
<p>Create <code>tar,gz</code> file of carbonlib folder and move it inside the carbonlib folder.</p>
+</li>
+</ol>
<pre><code>cd $SPARK_HOME
tar -zcvf carbondata.tar.gz carbonlib/
mv carbondata.tar.gz carbonlib/
</code></pre>
-</li>
-<li>
-<p>Configure the properties mentioned in the following table in <code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</p>
+<ol start="4">
+<li>Configure the properties mentioned in the following table in <code>$SPARK_HOME/conf/spark-defaults.conf</code> file.</li>
+</ol>
<table>
<thead>
<tr>
@@ -320,7 +322,7 @@ mv carbondata.tar.gz carbonlib/
<tr>
<td>spark.executor.extraJavaOptions</td>
<td>A string of extra JVM options to pass to executors. For instance <strong>NOTE</strong>: You can enter multiple values separated by space.</td>
-<td><code>-Dcarbon.properties.filepath=carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = carbon.properties</code></td>
</tr>
<tr>
<td>spark.executor.extraClassPath</td>
@@ -335,13 +337,13 @@ mv carbondata.tar.gz carbonlib/
<tr>
<td>spark.driver.extraJavaOptions</td>
<td>A string of extra JVM options to pass to the driver. For instance, GC settings or other logging.</td>
-<td><code>-Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties</code></td>
+<td><code>-Dcarbon.properties.filepath = $SPARK_HOME/conf/carbon.properties</code></td>
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code>:</p>
+<ol start="5">
+<li>Add the following properties in <code>$SPARK_HOME/conf/carbon.properties</code>:</li>
+</ol>
<table>
<thead>
<tr>
@@ -362,14 +364,12 @@ mv carbondata.tar.gz carbonlib/
</tr>
</tbody>
</table>
-</li>
-<li>
-<p>Verify the installation.</p>
-<pre><code> ./bin/spark-shell --master yarn-client --driver-memory 1g
- --executor-cores 2 --executor-memory 2G
-</code></pre>
-</li>
+<ol start="6">
+<li>Verify the installation.</li>
</ol>
+<pre><code> ./bin/spark-shell --master yarn-client --driver-memory 1g
+ --executor-cores 2 --executor-memory 2G
+</code></pre>
<p><strong>NOTE</strong>: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.</p>
<p>Getting started with CarbonData : <a href="quick-start-guide.html">Quick Start</a>, <a href="ddl-operation-on-carbondata.html">DDL Operations on CarbonData</a></p>
<h2>
@@ -378,7 +378,8 @@ mv carbondata.tar.gz carbonlib/
<a id="starting-carbondata-thrift-server" class="anchor" href="#starting-carbondata-thrift-server" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Starting CarbonData Thrift Server.</h3>
<p>a. cd <code>$SPARK_HOME</code></p>
<p>b. Run the following command to start the CarbonData thrift server.</p>
-<pre><code>./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true
+<pre><code>./bin/spark-submit
+--conf spark.sql.hive.thriftServer.singleSession=true
--class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
$SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path>
</code></pre>
@@ -407,7 +408,8 @@ $SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path>
<ul>
<li>Start with default memory and executors.</li>
</ul>
-<pre><code>./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true
+<pre><code>./bin/spark-submit
+--conf spark.sql.hive.thriftServer.singleSession=true
--class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
$SPARK_HOME/carbonlib
/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/pdf/maven-pdf-plugin.pdf
----------------------------------------------------------------------
diff --git a/src/main/webapp/pdf/maven-pdf-plugin.pdf b/src/main/webapp/pdf/maven-pdf-plugin.pdf
index 290e323..91bdbef 100644
Binary files a/src/main/webapp/pdf/maven-pdf-plugin.pdf and b/src/main/webapp/pdf/maven-pdf-plugin.pdf differ
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/quick-start-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/quick-start-guide.html b/src/main/webapp/quick-start-guide.html
index 26cb0f0..8c7a1b7 100644
--- a/src/main/webapp/quick-start-guide.html
+++ b/src/main/webapp/quick-start-guide.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -203,25 +203,35 @@ import org.apache.spark.sql.CarbonSession._
<ul>
<li>Create a CarbonSession :</li>
</ul>
-<pre><code>val carbon = SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession("<hdfs store path>")
+<pre><code>val carbon = SparkSession.builder().config(sc.getConf)
+ .getOrCreateCarbonSession("<hdfs store path>")
</code></pre>
-<p><strong>NOTE</strong>: By default metastore location is pointed to <code>../carbon.metastore</code>, user can provide own metastore location to CarbonSession like <code>SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession("<hdfs store path>", "<local metastore path>")</code></p>
+<p><strong>NOTE</strong>: By default metastore location is pointed to <code>../carbon.metastore</code>, user can provide own metastore location to CarbonSession like <code>SparkSession.builder().config(sc.getConf) .getOrCreateCarbonSession("<hdfs store path>", "<local metastore path>")</code></p>
<h4>
<a id="executing-queries" class="anchor" href="#executing-queries" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Executing Queries</h4>
<h6>
<a id="creating-a-table" class="anchor" href="#creating-a-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Creating a Table</h6>
-<pre><code>scala>carbon.sql("CREATE TABLE IF NOT EXISTS test_table(id string, name string, city string, age Int) STORED BY 'carbondata'")
+<pre><code>scala>carbon.sql("CREATE TABLE
+ IF NOT EXISTS test_table(
+ id string,
+ name string,
+ city string,
+ age Int)
+ STORED BY 'carbondata'")
</code></pre>
<h6>
<a id="loading-data-to-a-table" class="anchor" href="#loading-data-to-a-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Loading Data to a Table</h6>
-<pre><code>scala>carbon.sql("LOAD DATA INPATH 'sample.csv file path' INTO TABLE test_table")
+<pre><code>scala>carbon.sql("LOAD DATA INPATH 'sample.csv file path'
+ INTO TABLE test_table")
</code></pre>
<p><strong>NOTE</strong>: Please provide the real file path of <code>sample.csv</code> for the above script.</p>
<h6>
<a id="query-data-from-a-table" class="anchor" href="#query-data-from-a-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Query Data from a Table</h6>
<pre><code>scala>carbon.sql("SELECT * FROM test_table").show()
-scala>carbon.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY city").show()
+scala>carbon.sql("SELECT city, avg(age), sum(age)
+ FROM test_table
+ GROUP BY city").show()
</code></pre>
<h2>
<a id="interactive-analysis-with-spark-shell-version-16" class="anchor" href="#interactive-analysis-with-spark-shell-version-16" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Interactive Analysis with Spark Shell Version 1.6</h2>
@@ -230,7 +240,8 @@ scala>carbon.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY ci
<p>Start Spark shell by running the following command in the Spark directory:</p>
<pre><code>./bin/spark-shell --jars <carbondata assembly jar path>
</code></pre>
-<p><strong>NOTE</strong>: Assembly jar will be available after <a href="https://github.com/apache/carbondata/blob/master/build/README.md" target=_blank>building CarbonData</a> and can be copied from <code>./assembly/target/scala-2.1x/carbondata_xxx.jar</code></p>
+<p><strong>NOTE</strong>: Assembly jar will be available after [building CarbonData](<a href="https://github.com/apache/carbondata/" target=_blank>https://github.com/apache/carbondata/</a>
+blob/master/build/README.md) and can be copied from <code>./assembly/target/scala-2.1x/carbondata_xxx.jar</code></p>
<p><strong>NOTE</strong>: In this shell, SparkContext is readily available as <code>sc</code>.</p>
<ul>
<li>In order to execute the Queries we need to import CarbonContext:</li>
@@ -247,20 +258,29 @@ scala>carbon.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY ci
<a id="executing-queries-1" class="anchor" href="#executing-queries-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Executing Queries</h4>
<h6>
<a id="creating-a-table-1" class="anchor" href="#creating-a-table-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Creating a Table</h6>
-<pre><code>scala>cc.sql("CREATE TABLE IF NOT EXISTS test_table (id string, name string, city string, age Int) STORED BY 'carbondata'")
+<pre><code>scala>cc.sql("CREATE TABLE
+ IF NOT EXISTS test_table (
+ id string,
+ name string,
+ city string,
+ age Int)
+ STORED BY 'carbondata'")
</code></pre>
<p>To see the table created :</p>
<pre><code>scala>cc.sql("SHOW TABLES").show()
</code></pre>
<h6>
<a id="loading-data-to-a-table-1" class="anchor" href="#loading-data-to-a-table-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Loading Data to a Table</h6>
-<pre><code>scala>cc.sql("LOAD DATA INPATH 'sample.csv file path' INTO TABLE test_table")
+<pre><code>scala>cc.sql("LOAD DATA INPATH 'sample.csv file path'
+ INTO TABLE test_table")
</code></pre>
<p><strong>NOTE</strong>: Please provide the real file path of <code>sample.csv</code> for the above script.</p>
<h6>
<a id="query-data-from-a-table-1" class="anchor" href="#query-data-from-a-table-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Query Data from a Table</h6>
<pre><code>scala>cc.sql("SELECT * FROM test_table").show()
-scala>cc.sql("SELECT city, avg(age), sum(age) FROM test_table GROUP BY city").show()
+scala>cc.sql("SELECT city, avg(age), sum(age)
+ FROM test_table
+ GROUP BY city").show()
</code></pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/supported-data-types-in-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/supported-data-types-in-carbondata.html b/src/main/webapp/supported-data-types-in-carbondata.html
index 74ad405..9ec0e9a 100644
--- a/src/main/webapp/supported-data-types-in-carbondata.html
+++ b/src/main/webapp/supported-data-types-in-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/troubleshooting.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/troubleshooting.html b/src/main/webapp/troubleshooting.html
index 9ca7338..fd2cc95 100644
--- a/src/main/webapp/troubleshooting.html
+++ b/src/main/webapp/troubleshooting.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -196,12 +196,9 @@ $OverrideCatalog$$overrides_$e
<p>Use the following command :</p>
</li>
</ol>
-<pre><code>```
- "mvn -Pspark-2.1 -Dspark.version {yourSparkVersion} clean package"
-```
-
-Note : Refrain from using "mvn clean package" without specifying the profile.
+<pre><code>"mvn -Pspark-2.1 -Dspark.version {yourSparkVersion} clean package"
</code></pre>
+<p>Note : Refrain from using "mvn clean package" without specifying the profile.</p>
<h2>
<a id="failed-to-execute-load-query-on-cluster" class="anchor" href="#failed-to-execute-load-query-on-cluster" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Failed to execute load query on cluster.</h2>
<p><strong>Symptom</strong></p>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/0a70c06d/src/main/webapp/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/useful-tips-on-carbondata.html b/src/main/webapp/useful-tips-on-carbondata.html
index a15f7a0..29235a2 100644
--- a/src/main/webapp/useful-tips-on-carbondata.html
+++ b/src/main/webapp/useful-tips-on-carbondata.html
@@ -125,7 +125,7 @@
</ul>
</div><!--/.nav-collapse -->
<div id="search-box">
- <form method="get" action="http://www.google.com/search">
+ <form method="get" action="http://www.google.com/search" target="_blank">
<div class="search-block">
<table border="0" cellpadding="0" width="100%">
<tr>
@@ -169,7 +169,7 @@ The following sections will elaborate on the above topics :</p>
<ul>
<li><a href="#suggestions-to-create-carbondata-table">Suggestions to create CarbonData Table</a></li>
<li><a href="#configuration-for-optimizing-data-loading-performance-for-massive-data">Configuration for Optimizing Data Loading performance for Massive Data</a></li>
-<li><a href="#optimizing-mass-data-loading">Optimizing Mass Data Loading</a></li>
+<li><a href="#configurations-for-optimizing-carbondata-performance">Optimizing Mass Data Loading</a></li>
</ul>
<h2>
<a id="suggestions-to-create-carbondata-table" class="anchor" href="#suggestions-to-create-carbondata-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Suggestions to Create CarbonData Table</h2>
@@ -277,7 +277,7 @@ The create table command can be modified as below :</p>
</ul>
<pre><code> create table carbondata_table(
Dime_1 String,
- BEGIN_TIME bigint
+ BEGIN_TIME bigint,
HOST String,
MSISDN String,
...
@@ -294,7 +294,7 @@ query performance. The create table command can be modified as below :</p>
</ul>
<pre><code> create table carbondata_table(
Dime_1 String,
- BEGIN_TIME bigint
+ BEGIN_TIME bigint,
HOST String,
MSISDN String,
counter_1 double,
@@ -309,8 +309,8 @@ query performance. The create table command can be modified as below :</p>
<ul>
<li>
<p><strong>Columns of incremental character should be re-arranged at the end of dimensions</strong></p>
-<p>Consider the following scenario where data is loaded each day and the start_time is incremental for each load, it is
-suggested to put start_time at the end of dimensions.</p>
+<p>Consider the following scenario where data is loaded each day and the begin_time is incremental for each load, it is
+suggested to put begin_time at the end of dimensions.</p>
<p>Incremental values are efficient in using min/max index. The create table command can be modified as below :</p>
</li>
</ul>
@@ -342,7 +342,7 @@ excessive memory usage.</p>
<p>CarbonData supports large data load, in this process sorting data while loading consumes a lot of memory and disk IO and
this can result sometimes in "Out Of Memory" exception.
If you do not have much memory to use, then you may prefer to slow the speed of data loading instead of data load failure.
-You can configure CarbonData by tuning following properties in carbon.properties file to get a better performance.:</p>
+You can configure CarbonData by tuning following properties in carbon.properties file to get a better performance.</p>
<table>
<thead>
<tr>
@@ -359,8 +359,8 @@ You can configure CarbonData by tuning following properties in carbon.properties
</tr>
<tr>
<td>carbon.sort.size</td>
-<td>Data loading</td>
<td>Default: 100000. The value should be >= 100.</td>
+<td>Threshold to write local file in sort step when loading data</td>
</tr>
<tr>
<td>carbon.sort.file.write.buffer.size</td>
@@ -385,7 +385,7 @@ You can configure CarbonData by tuning following properties in carbon.properties
</tbody>
</table>
<p>For example, if there are 10 million records ,and i have only 16 cores ,64GB memory, will be loaded to CarbonData table.
-Using the default configuration always fail in sort step. Modify carbon.properties as suggested below</p>
+Using the default configuration always fail in sort step. Modify carbon.properties as suggested below:</p>
<pre><code>carbon.number.of.cores.block.sort=1
carbon.merge.sort.reader.thread=1
carbon.sort.size=5000
@@ -430,14 +430,14 @@ scenarios. After the completion of POC, some of the configurations impacting the
</tr>
<tr>
<td>spark.sql.shuffle.partitions</td>
-<td>spark/con/spark-defaults.conf</td>
+<td>spark/conf/spark-defaults.conf</td>
<td>Querying</td>
<td>The number of task started when spark shuffle.</td>
<td>The value can be 1 to 2 times as much as the executor cores. In an aggregation scenario, reducing the number from 200 to 32 reduced the query time from 17 to 9 seconds.</td>
</tr>
<tr>
-<td>num-executors/executor-cores/executor-memory</td>
-<td>spark/con/spark-defaults.conf</td>
+<td>spark.executor.instances/spark.executor.cores/spark.executor.memory</td>
+<td>spark/conf/spark-defaults.conf</td>
<td>Querying</td>
<td>The number of executors, CPU cores, and memory used for CarbonData query.</td>
<td>In the bank scenario, we provide the 4 CPUs cores and 15 GB for each executor which can get good performance. This 2 value does not mean more the better. It needs to be configured properly in case of limited resources. For example, In the bank scenario, it has enough CPU 32 cores each node but less memory 64 GB each node. So we cannot give more CPU but less memory. For example, when 4 cores and 12GB for each executor. It sometimes happens GC during the query which impact the query performance very much from the 3 second to more than 15 seconds. In this scenario need to increase the memory or decrease the CPU cores.</td>
@@ -458,8 +458,7 @@ scenarios. After the completion of POC, some of the configurations impacting the
</tr>
</tbody>
</table>
-<p>Note: If your CarbonData instance is provided only for query, you may specify the conf 'spark.speculation=true' which is conf
-in spark.</p>
+<p>Note: If your CarbonData instance is provided only for query, you may specify the property 'spark.speculation=true' which is in conf directory of spark.</p>
</div>
</div>
</div>
[3/4] carbondata-site git commit: Enhance And Fixed UI Bugs
Posted by ch...@apache.org.
Enhance And Fixed UI Bugs
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/69cfd212
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/69cfd212
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/69cfd212
Branch: refs/heads/asf-site
Commit: 69cfd21218934b95d97087229afaa79e320eafad
Parents: 20e101e 0a70c06
Author: chenliang613 <ch...@apache.org>
Authored: Fri Jun 23 03:40:22 2017 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Jun 23 03:40:22 2017 +0800
----------------------------------------------------------------------
src/main/resources/application.conf | 3 +-
src/main/scala/MDFileConverter.scala | 21 +++++
src/main/scala/html/header.html | 2 +-
src/main/webapp/.htaccess | 1 +
src/main/webapp/configuration-parameters.html | 14 ++-
src/main/webapp/css/style.css | 46 +++++-----
src/main/webapp/data-management.html | 2 +-
.../webapp/ddl-operation-on-carbondata.html | 18 ++--
.../webapp/dml-operation-on-carbondata.html | 9 +-
src/main/webapp/errorpage.html | 92 +++++++++++++++++++
src/main/webapp/faq.html | 10 +-
.../webapp/file-structure-of-carbondata.html | 2 +-
src/main/webapp/images/404error.png | Bin 0 -> 15082 bytes
src/main/webapp/index.html | 2 +-
src/main/webapp/installation-guide.html | 58 ++++++------
src/main/webapp/js/custom.js | 73 ++++-----------
src/main/webapp/mainpage.html | 3 +-
src/main/webapp/pdf/maven-pdf-plugin.pdf | Bin 193057 -> 230816 bytes
src/main/webapp/quick-start-guide.html | 40 ++++++--
.../supported-data-types-in-carbondata.html | 2 +-
src/main/webapp/troubleshooting.html | 9 +-
src/main/webapp/useful-tips-on-carbondata.html | 27 +++---
22 files changed, 273 insertions(+), 161 deletions(-)
----------------------------------------------------------------------