http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/content/js/mdNavigation.js ---------------------------------------------------------------------- diff --git a/content/js/mdNavigation.js b/content/js/mdNavigation.js deleted file mode 100644 index ce34ca5..0000000 --- a/content/js/mdNavigation.js +++ /dev/null @@ -1,51 +0,0 @@ -//Purpose of this JS - function loadContentUsingIdAttr(listOfLinks){ - for(var i = 0; i < listOfLinks.length; i++){ - var idAttr = $(listOfLinks[i]).attr("id"); - if(idAttr == undefined){ - var hrefLink = $(listOfLinks[i]).attr("href"); - if(hrefLink.indexOf("http") !== 0){ - $(listOfLinks[i]).click(function(e){ - $("#viewpage").load($(e.currentTarget).attr("href")); - if($(this).is('a:not([href^="#"])')) { - }else{ - $('a').off('click') - } - return false - }) - $("#viewpage a").attr("target", '_blank'); - } - } - } - } - - -//Purpose of this JS - setTimeout(function(){ - var contentLinks = $("#viewpage a"); - loadContentUsingIdAttr(contentLinks); - if($(this).is('a:not([href^="#"])')) { - }else{ - $('#viewpage>li>a').off('click'); - } - }, 500); - -//Purpose of this JS - $('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) + ']'); - if (target.length) - { $('html, body').animate({scrollTop: target.offset().top - 52 }, 500); - return false; - } - } - }); - -//Documentation page print -function divPrint() { - $("#viewpage").addClass("printable"); - window.print(); -} - -
http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/content/meetup.html ---------------------------------------------------------------------- diff --git a/content/meetup.html b/content/meetup.html deleted file mode 100644 index b3d1776..0000000 --- a/content/meetup.html +++ /dev/null @@ -1,285 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link href='images/favicon.ico' rel='shortcut icon' type='image/x-icon'> - <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> - <title>CarbonData:Meetup</title> - - <!-- Bootstrap --> - - <link rel="stylesheet" href="css/bootstrap.min.css"> - <link href="css/style.css" rel="stylesheet"> - <link href="css/print.css" rel="stylesheet"> - <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> - <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js";></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js";></script> - <![endif]--> -</head> -<body> -<header> - <nav class="navbar navbar-default navbar-custom cd-navbar-wrapper"> - <div class="container"> - <div class="navbar-header"> - <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" - data-toggle="collapse" class="navbar-toggle collapsed" type="button"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a href="index.html" class="logo"> - <img src="images/CarbonDataLogo.png" alt="CarbonData logo" - title="CarbocnData logo"/> - </a> - </div> - <div class="navbar-collapse collapse cd_navcontnt" id="navbar"> - <ul class="nav navbar-nav navbar-right navlist-custom"> - <li><a href="index.html" class="hidden-xs"><i class="fa fa-home" - aria-hidden="true"></i> </a></li> - <li><a href="index.html" class="hidden-lg hidden-md hidden-sm">Home</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" - aria-haspopup="true" aria-expanded="false">Download <span - class="caret"></span></a> - <ul class="dropdown-menu"> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/1.0.0-incubating"; - target="_blank">Apache CarbonData 1.0.0</a></li> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.2.0-incubating"; - target="_blank">Apache CarbonData 0.2.0</a></li> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.1-incubating"; - target="_blank">Apache CarbonData 0.1.1</a></li> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.0-incubating"; - target="_blank">Apache CarbonData 0.1.0</a></li> - <li> - <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Releases"; - target="_blank">Release Archive</a></li> - </ul> - </li> - <li><a href="docs/latest/mainpage.html?page=userguide" - class="">Documentation</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" - aria-haspopup="true" aria-expanded="false">Community <span - class="caret"></span></a> - <ul class="dropdown-menu"> - <li> - <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"; - target="_blank">Contributing to CarbonData</a></li> - </li> - <li> - <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Committers"; - target="_blank">Project Committers</a></li> - <li><a href="meetup.html">CarbonData Meetups </a></li> - <li><a href="security.html">Apache CarbonData Security</a></li> - </ul> - </li> - <li class="dropdown"> - <a href="http://www.apache.org/"; - class="apache_link hidden-xs dropdown-toggle" data-toggle="dropdown" - role="button" aria-haspopup="true" aria-expanded="false">Apache</a> - <ul class="dropdown-menu"> - <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a> - </li> - <li><a href="http://www.apache.org/licenses/"; - target="_blank">License</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html"; - target="_blank">Sponsorship</a></li> - <li><a href="http://www.apache.org/foundation/thanks.html"; - target="_blank">Thanks</a></li> - </ul> - </li> - <li class="dropdown"> - <a href="http://www.apache.org/"; - class="hidden-lg hidden-md hidden-sm dropdown-toggle" - data-toggle="dropdown" role="button" aria-haspopup="true" - aria-expanded="false">Apache</a> - <ul class="dropdown-menu"> - <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a> - </li> - <li><a href="http://www.apache.org/licenses/"; - target="_blank">License</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html"; - target="_blank">Sponsorship</a></li> - <li><a href="http://www.apache.org/foundation/thanks.html"; - target="_blank">Thanks</a></li> - </ul> - </li> - <li> - <a href="#" id="search-icon"><i class="fa fa-search" aria-hidden="true"></i></a> - - </li> - </ul> - </div><!--/.nav-collapse --> - <div id="search-box"> - <form method="get" action="http://www.google.com/search";> - <div class="search-block"> - <table border="0" cellpadding="0" width="100%"> - <tr> - <td style="width:80%"> - <input type="text" name="q" size=" 5" maxlength="255" value="" - class="search-input"/> - </td> - <td style="width:20%"> - <input type="submit" value="Search"/></td> - </tr> - <tr> - <td align="left" style="font-size:75%" colspan="2"> - <input type="checkbox" name="sitesearch" - value="carbondata.apache.org" checked/> Only search for - CarbonData - </td> - </tr> - </table> - </div> - </form> - </div> - </div> - </nav> -</header> <!-- end Header part --> - -<div class="fixed-padding"></div> <!-- top padding with fixde header --> - -<section style="position:relative; overflow:hidden "> - <div class="meetup-banber-bg"> - <img src="images/CDbannerSliderbg.jpg" alt="CarbonData banner"/> - </div> - - <div class="meetup-banber"> - <div class="container-fluid"> - <div class="col-md-12 col-sm-12"> - <h1 class="title-heading">Meetups - <span class="title-underline"></span> - </h1> - </div> - </div> - </div> -</section> - -<section> - <div class="container-fluid"> - <div class="col-md-12 col-sm-12"> - <div class="meetup-details"> - <h2 class="title-heading"> Premiure Events - <span class="title-underline"></span> - </h2> - <div class="meetup-info"> - <div class="row"> - <div class="col-md-10 col-sm-9"> - <h2 class="meetup-title">Oscon - Austin TX<span class="meetup-date">May 2016</span> - </h2> - <!--<p class="meetup-location"> </p>--> - <p>The agenda for the meetup was 'Carbondata : A New Hadoop File Format - for Faster Data Analysis'. It focused on the inception and - introduction of CarbonData to the open source community.</p> - </div> - <div class="col-md-2 col-sm-3"> - <div class="meetup-icon"> - <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609"; - target="blank"> - <i class="fa fa-angle-right" aria-hidden="true"></i> - </a> - </div> - </div> - </div> - </div> - <div class="meetup-info"> - <div class="row"> - <div class="col-md-10 col-sm-9"> - <h2 class="meetup-title">Beijing<span - class="meetup-date">Oct 29, 2016</span></h2> - <!-- <p class="meetup-location"> </p>--> - <p>The agenda for the meetup was 'CarbonData : An Indexed Columnar File - Format for Interactive query'. It detailedly introduced the - architecture and techniques of Apache CarbonData ,followed by a - tutorial session and open discussion about future plans of Apache - Carbondata.</p> - </div> - <div class="col-md-2 col-sm-3"> - <div class="meetup-icon"> - <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66849573"; - target="blank"> - <i class="fa fa-angle-right" aria-hidden="true"></i> - </a> - </div> - </div> - </div> - </div> - <div class="meetup-info"> - <div class="row"> - <div class="col-md-10 col-sm-9"> - <h2 class="meetup-title">Spark Summit East 2017-Apache CarbonData<span class="meetup-date">Feb 8, 2017</span> - </h2> - <!--<p class="meetup-location"> </p>--> - <p>The agenda for the meetup was 'Apache Carbondata: An Indexed Columnar File Format for Interactive Query with Spark SQL'</p> - </div> - <div class="col-md-2 col-sm-3"> - <div class="meetup-icon"> - <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=68714802"; - target="blank"> - <i class="fa fa-angle-right" aria-hidden="true"></i> - </a> - </div> - </div> - </div> - </div> - </div> - </div> - </div> -</section> - -<!-- - <footer> - <div class="topcontant"> - <div class="container-fluid"> - <div class="col-md-4 col-sm-4"> - <p class="footext"> - Apache CarbonData, CarbonData, Apache, the Apache feather logo, and the Apache CarbonData project logo are trademarks of The Apache Software Foundation - </p> - - </div> - <div class="col-md-8 col-sm-8"> - <ul class="footer-nav"> - <li><a href="">Site Map</a></li> - <li><a href="">Service</a></li> - <li><a href="">Contact us</a></li> - </ul> - </div> - </div> - </div> - <div class="bottomcontant"> - <div class="container-fluid"> - <div class="col-md-8 col-sm-8"> - <p class="copyright-txt">Copyright © 2016. All rights reserved | - <a href="http://www.apache.org/"; class="term-links">Apache Software Foundation </a> | - <a href="http://www.apache.org/foundation/policies/privacy.html"; class="term-links" target="blank"> Privacy Policy </a> - </p> - - </div> - <div class="col-md-4 col-sm-4"> - <div class="social-icon"> - <a href="#" class="icons"><i class="fa fa-facebook" aria-hidden="true"></i></a> - <a href="#" class="icons"><i class="fa fa-twitter" aria-hidden="true"></i></a> - <a href="#" class="icons"><i class="fa fa-linkedin" aria-hidden="true"></i></a> - </div> - </div> - </div> - </div> - </footer> --> - -<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> - -<script src="js/jquery.min.js"></script> -<!-- Include all compiled plugins (below), or include individual files as needed --> -<script src="js/bootstrap.min.js"></script> -<script src="js/custom.js"></script> -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/content/pdf/maven-pdf-plugin.pdf ---------------------------------------------------------------------- diff --git a/content/pdf/maven-pdf-plugin.pdf b/content/pdf/maven-pdf-plugin.pdf deleted file mode 100644 index bb24c64..0000000 Binary files a/content/pdf/maven-pdf-plugin.pdf and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/content/security.html ---------------------------------------------------------------------- diff --git a/content/security.html b/content/security.html deleted file mode 100644 index 205eba4..0000000 --- a/content/security.html +++ /dev/null @@ -1,173 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link href='images/favicon.ico' rel='shortcut icon' type='image/x-icon'> - <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> - <title>CarbonData:Security</title> - - <!-- Bootstrap --> - - <link rel="stylesheet" href="css/bootstrap.min.css"> - <link href="css/style.css" rel="stylesheet"> - <link href="css/print.css" rel="stylesheet" > - <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> - <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js";></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js";></script> - <![endif]--> -</head> -<body> -<header> - <nav class="navbar navbar-default navbar-custom cd-navbar-wrapper" > - <div class="container"> - <div class="navbar-header"> - <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-toggle="collapse" class="navbar-toggle collapsed" type="button"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a href="index.html" class="logo"> - <img src="images/CarbonDataLogo.png" alt="CarbonData logo" title="CarbocnData logo" /> - </a> - </div> - <div class="navbar-collapse collapse cd_navcontnt" id="navbar"> - <ul class="nav navbar-nav navbar-right navlist-custom"> - <li><a href="index.html" class="hidden-xs"><i class="fa fa-home" aria-hidden="true"></i> </a></li> - <li><a href="index.html" class="hidden-lg hidden-md hidden-sm">Home</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Download <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/1.0.0-incubating"; - target="_blank">Apache CarbonData 1.0.0</a></li> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.2.0-incubating"; - target="_blank">Apache CarbonData 0.2.0</a></li> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.1-incubating"; - target="_blank">Apache CarbonData 0.1.1</a></li> - <li> - <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.0-incubating"; - target="_blank">Apache CarbonData 0.1.0</a></li> - <li> - <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Releases"; - target="_blank">Release Archive</a></li> - </ul> - </li> - <li><a href="docs/latest/mainpage.html?page=userguide" class="">Documentation</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="https://github.com/apache/incubator-carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"; - target="_blank">Contributing to CarbonData</a></li></li> - <li><a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Committers"; target="_blank">Project Committers</a></li> - <li><a href="meetup.html">CarbonData Meetups </a></li> - <li><a href="security.html">Apache CarbonData Security </a></li> - </ul> - </li> - <li class="dropdown"> - <a href="http://www.apache.org/"; class="apache_link hidden-xs dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a> - <ul class="dropdown-menu"> - <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a></li> - <li><a href="http://www.apache.org/licenses/"; target="_blank">License</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html"; target="_blank">Sponsorship</a></li> - <li><a href="http://www.apache.org/foundation/thanks.html"; target="_blank">Thanks</a></li> - </ul> - </li> - <li class="dropdown"> - <a href="http://www.apache.org/"; class="hidden-lg hidden-md hidden-sm dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a> - <ul class="dropdown-menu"> - <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a></li> - <li><a href="http://www.apache.org/licenses/"; target="_blank">License</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html"; target="_blank">Sponsorship</a></li> - <li><a href="http://www.apache.org/foundation/thanks.html"; target="_blank">Thanks</a></li> - </ul> - </li> - <li> - <a href="#" id="search-icon" ><i class="fa fa-search" aria-hidden="true"></i></a> - </li> - </ul> - </div><!--/.nav-collapse --> - - <div id="search-box" > - <form method="get" action="http://www.google.com/search";> - <div class="search-block"> - <table border="0" cellpadding="0" width="100%"> - <tr> - <td style="width:80%"> - <input type="text" name="q" size=" 5" maxlength="255" value="" class="search-input" /> - </td> - <td style="width:20%"> - <input type="submit" value="Search" /></td></tr> - <tr><td align="left" style="font-size:75%" colspan="2"> - <input type="checkbox" name="sitesearch" value="carbondata.apache.org" checked /> Only search for CarbonData </td></tr> - </table> - </div> - </form> - </div> - - </div> - </nav> -</header> <!-- end Header part --> - -<div class="fixed-padding"></div> <!-- top padding with fixde header --> - -<section style="position:relative; overflow:hidden "> - <div class="meetup-banber-bg"> - <img src="images/CDbannerSliderbg.jpg" alt="CarbonData banner" /> - </div> - - <div class="meetup-banber" style="padding:30px"> - <div class="container-fluid"> - <div class="col-md-12 col-sm-12"> - <h1 class="title-heading"> - Indexed Columnar Data Format for Faster Analytics on <br>Big Data Platforms. - - <span class="title-underline"></span> - </h1> - </div> - </div> - </div> -</section> - -<section> - <div class="container"> - <div class="row"> - <div class="col-md-12 col-sm-12"> - <div class="security-block"> - <h1 class="title-heading"> Apache CarbonData Security - <span class="title-underline"></span> - </h1> - - <p> - The Apache Software Foundation takes a rigorous standpoint in annihilating the security issues in its software projects. Apache CarbonData is highly sensitive and forthcoming to issues pertaining to its features and functionality. - </p> - <p>If you have apprehensions regarding CarbonDataâs security or you discover vulnerability or potential threat, donât hesitate to get in touch with the Apache Security Team by dropping a mail at <a href="mailto:secur...@apache.org";> secur...@apache.org</a>. In the mail, specify the project name CarbonData with the description of the issue or potential threat. You are also urged to recommend the way to reproduce and replicate the issue. The security team and the CarbonData community will get back to you after assessing and analysing the findings.</p> - <p> - PLEASE PAY ATTENTION to report the security issue on the security email before disclosing it on public domain. - </p> - <p> - The ASF Security Team maintains a page with the description of how vulnerabilities and potential threats are handled, check their <a href="http://www.apache.org/security/"; target="_blank">Web page</a> for more Details. - </p> - - </div> - </div> - </div> - </div> -</section> - - -<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> - -<script src="js/jquery.min.js"></script> -<!-- Include all compiled plugins (below), or include individual files as needed --> -<script src="js/bootstrap.min.js"></script> -<script src="js/custom.js"></script> -<script src="js/mdNavigation.js" type="text/javascript"></script> -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6537995..89fb3ac 100644 --- a/pom.xml +++ b/pom.xml @@ -40,40 +40,32 @@ <maven.wagon.version>1.0-beta-6</maven.wagon.version> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>com.ruleoftech</groupId> - <artifactId>markdown-page-generator-plugin</artifactId> - <version>0.10</version> - </dependency> - </dependencies> - </dependencyManagement> - <build> <plugins> - <!--HTML Generation --> <plugin> - <groupId>com.ruleoftech</groupId> - <artifactId>markdown-page-generator-plugin</artifactId> - <version>0.10</version> - <executions> - <execution> - <phase>process-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <version>2.12.1</version> + <!-- <executions> + <execution> + <goals> + <goal>add-source</goal> + <goal>compile</goal> + <goal>testCompile</goal> + </goals> + </execution> + </executions>--> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> <configuration> - <inputDirectory>./src/site/markdown</inputDirectory> - <outputDirectory>${basedir}/target/ver_doc</outputDirectory> - <inputEncoding>UTF-8</inputEncoding> - <outputEncoding>ISO-8859-15</outputEncoding> + <mainClass>FileOperationMain</mainClass> </configuration> </plugin> - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> @@ -86,32 +78,7 @@ <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory> </configuration> </plugin> - <!--PDF Generation Plugin --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pdf-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>pdf</id> - <phase>site</phase> - <goals> - <goal>pdf</goal> - </goals> - <configuration> - <outputDirectory>${project.reporting.outputDirectory}</outputDirectory> - <includeReports>false</includeReports> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-markdown</artifactId> - <version>1.6</version> - </dependency> - </dependencies> - </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -127,34 +94,45 @@ <outputDirectory>${basedir}/content</outputDirectory> <resources> <resource> - <directory>${basedir}/target/site-17</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>publish-pdf</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/content/pdf</outputDirectory> - <resources> - <resource> - <directory>${basedir}/target/pdf</directory> + <directory>${basedir}/src/main/webapp</directory> <filtering>false</filtering> - <includes> - <include>**/*.pdf</include> - </includes> </resource> </resources> </configuration> </execution> </executions> </plugin> + </plugins> </build> + + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>2.12.1</version> + </dependency> + + <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.3</version> + </dependency> + + <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.25</version> + </dependency> + + <!-- https://mvnrepository.com/artifact/com.typesafe/config --> + <dependency> + <groupId>com.typesafe</groupId> + <artifactId>config</artifactId> + <version>1.3.1</version> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/resources/application.conf ---------------------------------------------------------------------- diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf new file mode 100644 index 0000000..a4f0f94 --- /dev/null +++ b/src/main/resources/application.conf @@ -0,0 +1,11 @@ +fileList=["configuration-parameters", + "ddl-operation-on-carbondata","quick-start-guide", + "dml-operation-on-carbondata", + "data-management", + "faq", + "file-structure-of-carbondata", + "installation-guide", + "supported-data-types-in-carbondata", + "troubleshooting", + "useful-tips-on-carbondata" + ] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/scala/FileModification.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/FileModification.scala b/src/main/scala/FileModification.scala new file mode 100644 index 0000000..b09ab79 --- /dev/null +++ b/src/main/scala/FileModification.scala @@ -0,0 +1,54 @@ +import java.io.{File, PrintWriter} +import collection.JavaConverters._ + +import com.typesafe.config.ConfigFactory +import org.slf4j.LoggerFactory + +class FileModification { + val logger = LoggerFactory.getLogger(classOf[FileModification]) + val url = "https://raw.githubusercontent.com/apache/incubator-carbondata/master/docs/"; + val inputFileExtension = ".md" + val outputFileExtension = ".html" + + import scala.io.Source + + val headerContent: String = Source.fromFile("/home/pallavi/WorkSpace/CarbonData/carbondata--site/src/main/scala/html/header.html").mkString + val footerContent: String =Source.fromFile("/home/pallavi/WorkSpace/CarbonData/carbondata--site/src/main/scala/html/footer.html").mkString + + val location = "/home/pallavi/WorkSpace/CarbonData/incubator-carbondata-site/src/main/webapp/" + val fileReadObject = new MdFilehandler + + def convertToHtml(): String = { + val listOfFiles = readListOfFiles() + val statusList = listOfFiles.map { file => + val fileURLContent = scala.io.Source.fromURL(url + file + inputFileExtension).mkString + val getFileData = fileReadObject.getFileContent(fileURLContent) + getFileData match { + case Some(data: String) => val fileData = fileReadObject.ConvertMdExtension(data) + logger.info("Begin writing [" + file + "." + outputFileExtension + "] at " + location) + writeToFile(location + file + outputFileExtension, fileData) + logger.info("Successfully written [" + file + "." + outputFileExtension + "] at " + location) + "Success" + case None => logger.error(s"$file Conversion failed ") + "Failure" + } + } + + if (statusList.contains("Failure")) + "Some Files Failed To Convert" + else + "All files successfully Converted" + } + + private def readListOfFiles(): List[String] = { + val listOfFiles = ConfigFactory.load().getStringList("fileList").asScala.toList + logger.info(s"List of files : $listOfFiles") + listOfFiles + } + + private def writeToFile(path: String, data: String): Unit = { + val writer = new PrintWriter(new File(path)) + writer.write(headerContent + data + footerContent) + writer.close() + } +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/scala/FileOperationMain.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/FileOperationMain.scala b/src/main/scala/FileOperationMain.scala new file mode 100644 index 0000000..b763fee --- /dev/null +++ b/src/main/scala/FileOperationMain.scala @@ -0,0 +1,15 @@ +import org.slf4j.LoggerFactory + +/** + * Created by knoldus on 3/4/17. + */ +class FileOperationMain + +object FileOperationMain { + def main(args: Array[String]) { + val logger = LoggerFactory.getLogger(classOf[FileOperationMain]) + val fileObject=new FileModification + val status =fileObject.convertToHtml() + logger.info(s"File Conversion to html : $status") + } +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/scala/MdFilehandler.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/MdFilehandler.scala b/src/main/scala/MdFilehandler.scala new file mode 100644 index 0000000..cd0f05d --- /dev/null +++ b/src/main/scala/MdFilehandler.scala @@ -0,0 +1,46 @@ +import scala.util.matching.Regex +import org.apache.http.HttpResponse +import org.apache.http.client.methods.HttpPost +import org.apache.http.impl.client.DefaultHttpClient +import org.apache.http.util.EntityUtils +import org.slf4j.LoggerFactory + +/** + * Created by pallavi on 4/4/17. + */ +class MdFilehandler { + + val logger = LoggerFactory.getLogger(classOf[MdFilehandler]) + + def ConvertMdExtension(input: String): String = { + val modifyContentPattern = new Regex("id=\"user-content-") + val modifyMdPattern = new Regex(".md") + val modifyImagePattern=new Regex("<img src=\"../docs") + val contentAfterRemovingUserContent: String = modifyContentPattern replaceAllIn(input, "id=\"") + val contentAfterReplacingId: String = modifyMdPattern replaceAllIn(contentAfterRemovingUserContent, ".html") + val contentAfterReplacingImage: String = modifyImagePattern replaceAllIn(contentAfterReplacingId, "<img src=\"https://github.com/apache/incubator-carbondata/blob/master/docs";) + contentAfterReplacingImage + } + + def getFileContent(data: String): Option[String] = { + val httpClient = new DefaultHttpClient() + val httpRequest: HttpPost = new HttpPost("https://api.github.com/markdown/raw";); + httpRequest.setHeader("Content-type", "text/plain") + + import org.apache.http.entity.StringEntity; + val test = new StringEntity(data) + httpRequest.setEntity(test) + val httpResponse: HttpResponse = httpClient.execute(httpRequest) + val responseBody = EntityUtils.toString(httpResponse.getEntity()) + logger.info(s"status : {${httpResponse.getStatusLine.toString.contains("OK")}}") + // println("--------->" + responseBody.toString) + if(httpResponse.getStatusLine.toString.contains("OK")) + Some(responseBody.toString) + else { + logger.error(s"Fetching file fails {${httpResponse.getStatusLine}}") + None + } + + } + +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/scala/html/footer.html ---------------------------------------------------------------------- diff --git a/src/main/scala/html/footer.html b/src/main/scala/html/footer.html new file mode 100644 index 0000000..47aa819 --- /dev/null +++ b/src/main/scala/html/footer.html @@ -0,0 +1,16 @@ +</div> +</div> +</div> +</div> +<div class="doc-footer"> + <a href="#top" class="scroll-top">Top</a> +</div> +</div> +</section> +</div> +</div> +</div> +</section><!-- End systemblock part --> +<script src="js/custom.js"></script> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/scala/html/header.html ---------------------------------------------------------------------- diff --git a/src/main/scala/html/header.html b/src/main/scala/html/header.html new file mode 100644 index 0000000..ee6f9aa --- /dev/null +++ b/src/main/scala/html/header.html @@ -0,0 +1,157 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link href='images/favicon.ico' rel='shortcut icon' type='image/x-icon'> + <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> + <title>CarbonData</title> + <style> + + </style> + <!-- Bootstrap --> + + <link rel="stylesheet" href="css/bootstrap.min.css"> + <link href="css/style.css" rel="stylesheet"> + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js";></script> + <script src="https://oss.maxcdn.scom/respond/1.4.2/respond.min.js";></script> + <![endif]--> + <script src="js/jquery.min.js"></script> + <script src="js/bootstrap.min.js"></script> + + +</head> +<body> +<header> + <nav class="navbar navbar-default navbar-custom cd-navbar-wrapper"> + <div class="container"> + <div class="navbar-header"> + <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-toggle="collapse" + class="navbar-toggle collapsed" type="button"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a href="index.html" class="logo"> + <img src="images/CarbonDataLogo.png" alt="CarbonData logo" title="CarbocnData logo"/> + </a> + </div> + <div class="navbar-collapse collapse cd_navcontnt" id="navbar"> + <ul class="nav navbar-nav navbar-right navlist-custom"> + <li><a href="index.html" class="hidden-xs"><i class="fa fa-home" aria-hidden="true"></i> </a> + </li> + <li><a href="index.html" class="hidden-lg hidden-md hidden-sm">Home</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle " data-toggle="dropdown" role="button" aria-haspopup="true" + aria-expanded="false"> Download <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/1.0.0-incubating"; + target="_blank">Apache CarbonData 1.0.0</a></li> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.2.0-incubating"; + target="_blank">Apache CarbonData 0.2.0</a></li> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.1-incubating"; + target="_blank">Apache CarbonData 0.1.1</a></li> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.0-incubating"; + target="_blank">Apache CarbonData 0.1.0</a></li> + <li> + <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Releases"; + target="_blank">Release Archive</a></li> + </ul> + </li> + <li><a href="mainpage.html" class="">Documentation</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" + aria-expanded="false">Community <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li> + <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"; + target="_blank">Contributing to CarbonData</a></li> + <li> + <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"; + target="_blank">Project PPMC and Committers</a></li> + <li> + <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609"; + target="_blank">CarbonData Meetups</a></li> + <li><a href="../../security.html">Apache CarbonData Security</a></li> + <li><a href="https://issues.apache.org/jira/browse/CARBONDATA"; target="_blank">Apache + Jira</a></li> + </ul> + </li> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="apache_link hidden-xs dropdown-toggle" + data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/"; target="_blank">License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html"; + target="_blank">Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html"; target="_blank">Thanks</a></li> + </ul> + </li> + + <li class="dropdown"> + <a href="http://www.apache.org/"; class="hidden-lg hidden-md hidden-sm dropdown-toggle" + data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/"; target="_blank">License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html"; + target="_blank">Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html"; target="_blank">Thanks</a></li> + </ul> + </li> + + <li> + <a href="#" id="search-icon"><i class="fa fa-search" aria-hidden="true"></i></a> + + </li> + + </ul> + </div><!--/.nav-collapse --> + <div id="search-box"> + <form method="get" action="http://www.google.com/search";> + <div class="search-block"> + <table border="0" cellpadding="0" width="100%"> + <tr> + <td style="width:80%"> + <input type="text" name="q" size=" 5" maxlength="255" value="" + class="search-input"/> + </td> + <td style="width:20%"> + <input type="submit" value="Search"/></td> + </tr> + <tr> + <td align="left" style="font-size:75%" colspan="2"> + <input type="checkbox" name="sitesearch" value="carbondata.apache.org" checked/> + Only search for CarbonData + </td> + </tr> + </table> + </div> + </form> + </div> + </div> + </nav> +</header> <!-- end Header part --> + +<div class="fixed-padding"></div> <!-- top padding with fixde header --> + +<section><!-- Dashboard nav --> + <div class="container-fluid q"> + <div class="col-sm-12 col-md-12 maindashboard"> + <div class="row"> + <section> + <div style="padding:10px 15px;"> + <div id="viewpage" name="viewpage"> + <div class="row"> + <div class="col-sm-12 col-md-12"> + <div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/webapp/configuration-parameters.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/configuration-parameters.html b/src/main/webapp/configuration-parameters.html new file mode 100644 index 0000000..8a632df --- /dev/null +++ b/src/main/webapp/configuration-parameters.html @@ -0,0 +1,635 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link href='images/favicon.ico' rel='shortcut icon' type='image/x-icon'> + <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> + <title>CarbonData</title> + <style> + + </style> + <!-- Bootstrap --> + + <link rel="stylesheet" href="css/bootstrap.min.css"> + <link href="css/style.css" rel="stylesheet"> + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js";></script> + <script src="https://oss.maxcdn.scom/respond/1.4.2/respond.min.js";></script> + <![endif]--> + <script src="js/jquery.min.js"></script> + <script src="js/bootstrap.min.js"></script> + + +</head> +<body> +<header> + <nav class="navbar navbar-default navbar-custom cd-navbar-wrapper"> + <div class="container"> + <div class="navbar-header"> + <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-toggle="collapse" + class="navbar-toggle collapsed" type="button"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a href="index.html" class="logo"> + <img src="images/CarbonDataLogo.png" alt="CarbonData logo" title="CarbocnData logo"/> + </a> + </div> + <div class="navbar-collapse collapse cd_navcontnt" id="navbar"> + <ul class="nav navbar-nav navbar-right navlist-custom"> + <li><a href="index.html" class="hidden-xs"><i class="fa fa-home" aria-hidden="true"></i> </a> + </li> + <li><a href="index.html" class="hidden-lg hidden-md hidden-sm">Home</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle " data-toggle="dropdown" role="button" aria-haspopup="true" + aria-expanded="false"> Download <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/1.0.0-incubating"; + target="_blank">Apache CarbonData 1.0.0</a></li> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.2.0-incubating"; + target="_blank">Apache CarbonData 0.2.0</a></li> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.1-incubating"; + target="_blank">Apache CarbonData 0.1.1</a></li> + <li> + <a href="https://www.apache.org/dyn/closer.lua/incubator/carbondata/0.1.0-incubating"; + target="_blank">Apache CarbonData 0.1.0</a></li> + <li> + <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Releases"; + target="_blank">Release Archive</a></li> + </ul> + </li> + <li><a href="mainpage.html" class="">Documentation</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" + aria-expanded="false">Community <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li> + <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"; + target="_blank">Contributing to CarbonData</a></li> + <li> + <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"; + target="_blank">Project PPMC and Committers</a></li> + <li> + <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609"; + target="_blank">CarbonData Meetups</a></li> + <li><a href="../../security.html">Apache CarbonData Security</a></li> + <li><a href="https://issues.apache.org/jira/browse/CARBONDATA"; target="_blank">Apache + Jira</a></li> + </ul> + </li> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="apache_link hidden-xs dropdown-toggle" + data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/"; target="_blank">License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html"; + target="_blank">Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html"; target="_blank">Thanks</a></li> + </ul> + </li> + + <li class="dropdown"> + <a href="http://www.apache.org/"; class="hidden-lg hidden-md hidden-sm dropdown-toggle" + data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache</a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/"; target="_blank">Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/"; target="_blank">License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html"; + target="_blank">Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html"; target="_blank">Thanks</a></li> + </ul> + </li> + + <li> + <a href="#" id="search-icon"><i class="fa fa-search" aria-hidden="true"></i></a> + + </li> + + </ul> + </div><!--/.nav-collapse --> + <div id="search-box"> + <form method="get" action="http://www.google.com/search";> + <div class="search-block"> + <table border="0" cellpadding="0" width="100%"> + <tr> + <td style="width:80%"> + <input type="text" name="q" size=" 5" maxlength="255" value="" + class="search-input"/> + </td> + <td style="width:20%"> + <input type="submit" value="Search"/></td> + </tr> + <tr> + <td align="left" style="font-size:75%" colspan="2"> + <input type="checkbox" name="sitesearch" value="carbondata.apache.org" checked/> + Only search for CarbonData + </td> + </tr> + </table> + </div> + </form> + </div> + </div> + </nav> +</header> <!-- end Header part --> + +<div class="fixed-padding"></div> <!-- top padding with fixde header --> + +<section><!-- Dashboard nav --> + <div class="container-fluid q"> + <div class="col-sm-12 col-md-12 maindashboard"> + <div class="row"> + <section> + <div style="padding:10px 15px;"> + <div id="viewpage" name="viewpage"> + <div class="row"> + <div class="col-sm-12 col-md-12"> + <div> + +<h1> +<a id="configuring-carbondata" class="anchor" href="#configuring-carbondata" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Configuring CarbonData</h1> + +<p>This tutorial guides you through the advanced configurations of CarbonData :</p> + +<ul> +<li><a href="#system-configuration">System Configuration</a></li> +<li><a href="#performance-configuration">Performance Configuration</a></li> +<li><a href="#miscellaneous-configuration">Miscellaneous Configuration</a></li> +<li><a href="#spark-configuration">Spark Configuration</a></li> +</ul> + +<h2> +<a id="system-configuration" class="anchor" href="#system-configuration" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>System Configuration</h2> + +<p>This section provides the details of all the configurations required for the CarbonData System.</p> + +<p><b></b></p><p align="center">System Configuration in carbon.properties</p> + +<table> +<thead> +<tr> +<th>Property</th> +<th>Default Value</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td>carbon.storelocation</td> +<td>/user/hive/warehouse/carbon.store</td> +<td>Location where CarbonData will create the store, and write the data in its own format. NOTE: Store location should be in HDFS.</td> +</tr> +<tr> +<td>carbon.ddl.base.hdfs.url</td> +<td>hdfs://hacluster/opt/data</td> +<td>This property is used to configure the HDFS relative path, the path configured in carbon.ddl.base.hdfs.url will be appended to the HDFS path configured in fs.defaultFS. If this path is configured, then user need not pass the complete path while dataload. For example: If absolute path of the csv file is hdfs://10.18.101.155:54310/data/cnbc/2016/xyz.csv, the path "hdfs://10.18.101.155:54310" will come from property fs.defaultFS and user can configure the /data/cnbc/ as carbon.ddl.base.hdfs.url. Now while dataload user can specify the csv path as /2016/xyz.csv.</td> +</tr> +<tr> +<td>carbon.badRecords.location</td> +<td>/opt/Carbon/Spark/badrecords</td> +<td>Path where the bad records are stored.</td> +</tr> +<tr> +<td>carbon.kettle.home</td> +<td>$SPARK_HOME/carbonlib/carbonplugins</td> +<td>Configuration for loading the data with kettle.</td> +</tr> +<tr> +<td>carbon.data.file.version</td> +<td>2</td> +<td>If this parameter value is set to 1, then CarbonData will support the data load which is in old format(0.x version). If the value is set to 2(1.x onwards version), then CarbonData will support the data load of new format only.</td> +</tr> +</tbody> +</table> + +<h2> +<a id="performance-configuration" class="anchor" href="#performance-configuration" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Performance Configuration</h2> + +<p>This section provides the details of all the configurations required for CarbonData Performance Optimization.</p> + +<p><b></b></p><p align="center">Performance Configuration in carbon.properties</p> + +<ul> +<li><strong>Data Loading Configuration</strong></li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +<th>Range</th> +</tr> +</thead> +<tbody> +<tr> +<td>carbon.sort.file.buffer.size</td> +<td>20</td> +<td>File read buffer size used during sorting. This value is expressed in MB.</td> +<td>Min=1 and Max=100</td> +</tr> +<tr> +<td>carbon.graph.rowset.size</td> +<td>100000</td> +<td>Rowset size exchanged between data load graph steps.</td> +<td>Min=500 and Max=1000000</td> +</tr> +<tr> +<td>carbon.number.of.cores.while.loading</td> +<td>6</td> +<td>Number of cores to be used while loading data.</td> +<td></td> +</tr> +<tr> +<td>carbon.sort.size</td> +<td>500000</td> +<td>Record count to sort and write intermediate files to temp.</td> +<td></td> +</tr> +<tr> +<td>carbon.enableXXHash</td> +<td>true</td> +<td>Algorithm for hashmap for hashkey calculation.</td> +<td></td> +</tr> +<tr> +<td>carbon.number.of.cores.block.sort</td> +<td>7</td> +<td>Number of cores to use for block sort while loading data.</td> +<td></td> +</tr> +<tr> +<td>carbon.max.driver.lru.cache.size</td> +<td>-1</td> +<td>Max LRU cache size upto which data will be loaded at the driver side. This value is expressed in MB. Default value of -1 means there is no memory limit for caching. Only integer values greater than 0 are accepted.</td> +<td></td> +</tr> +<tr> +<td>carbon.max.executor.lru.cache.size</td> +<td>-1</td> +<td>Max LRU cache size upto which data will be loaded at the executor side. This value is expressed in MB. Default value of -1 means there is no memory limit for caching. Only integer values greater than 0 are accepted. If this parameter is not configured, then the carbon.max.driver.lru.cache.size value will be considered.</td> +<td></td> +</tr> +<tr> +<td>carbon.merge.sort.prefetch</td> +<td>true</td> +<td>Enable prefetch of data during merge sort while reading data from sort temp files in data loading.</td> +<td></td> +</tr> +<tr> +<td>carbon.update.persist.enable</td> +<td>true</td> +<td>Enabling this parameter considers persistent data. Enabling this will reduce the execution time of UPDATE operation.</td> +<td></td> +</tr> +</tbody> +</table> + +<ul> +<li><strong>Compaction Configuration</strong></li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +<th>Range</th> +</tr> +</thead> +<tbody> +<tr> +<td>carbon.number.of.cores.while.compacting</td> +<td>2</td> +<td>Number of cores which are used to write data during compaction.</td> +<td></td> +</tr> +<tr> +<td>carbon.compaction.level.threshold</td> +<td>4, 3</td> +<td>This property is for minor compaction which decides how many segments to be merged. Example: If it is set as 2, 3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment.</td> +<td>Valid values are from 0-100.</td> +</tr> +<tr> +<td>carbon.major.compaction.size</td> +<td>1024</td> +<td>Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. This value is expressed in MB.</td> +<td></td> +</tr> +<tr> +<td>carbon.horizontal.compaction.enable</td> +<td>true</td> +<td>This property is used to turn ON/OFF horizontal compaction. After every DELETE and UPDATE statement, horizontal compaction may occur in case the delta (DELETE/ UPDATE) files becomes more than specified threshold.</td> +<td></td> +</tr> +<tr> +<td>carbon.horizontal.UPDATE.compaction.threshold</td> +<td>1</td> +<td>This property specifies the threshold limit on number of UPDATE delta files within a segment. In case the number of delta files goes beyond the threshold, the UPDATE delta files within the segment becomes eligible for horizontal compaction and compacted into single UPDATE delta file.</td> +<td>Values between 1 to 10000.</td> +</tr> +<tr> +<td>carbon.horizontal.DELETE.compaction.threshold</td> +<td>1</td> +<td>This property specifies the threshold limit on number of DELETE delta files within a block of a segment. In case the number of delta files goes beyond the threshold, the DELETE delta files for the particular block of the segment becomes eligible for horizontal compaction and compacted into single DELETE delta file.</td> +<td>Values between 1 to 10000.</td> +</tr> +</tbody> +</table> + +<ul> +<li><strong>Query Configuration</strong></li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +<th>Range</th> +</tr> +</thead> +<tbody> +<tr> +<td>carbon.number.of.cores</td> +<td>4</td> +<td>Number of cores to be used while querying.</td> +<td></td> +</tr> +<tr> +<td>carbon.inmemory.record.size</td> +<td>120000</td> +<td>Number of records to be in memory while querying.</td> +<td>Min=100000 and Max=240000</td> +</tr> +<tr> +<td>carbon.enable.quick.filter</td> +<td>false</td> +<td>Improves the performance of filter query.</td> +<td></td> +</tr> +<tr> +<td>no.of.cores.to.load.blocks.in.driver</td> +<td>10</td> +<td>Number of core to load the blocks in driver.</td> +<td></td> +</tr> +</tbody> +</table> + +<h2> +<a id="miscellaneous-configuration" class="anchor" href="#miscellaneous-configuration" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Miscellaneous Configuration</h2> + +<p><b></b></p><p align="center">Extra Configuration in carbon.properties</p> + +<ul> +<li> +<strong>Time format for CarbonData</strong> </li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Format</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td>carbon.timestamp.format</td> +<td>yyyy-MM-dd HH:mm:ss</td> +<td>Timestamp format of input data used for timestamp data type.</td> +</tr> +</tbody> +</table> + +<ul> +<li><strong>Dataload Configuration</strong></li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td>carbon.sort.file.write.buffer.size</td> +<td>10485760</td> +<td>File write buffer size used during sorting.</td> +</tr> +<tr> +<td>carbon.lock.type</td> +<td>LOCALLOCK</td> +<td>This configuration specifies the type of lock to be acquired during concurrent operations on table. There are following types of lock implementation: - LOCALLOCK: Lock is created on local file system as file. This lock is useful when only one spark driver (thrift server) runs on a machine and no other CarbonData spark application is launched concurrently. - HDFSLOCK: Lock is created on HDFS file system as file. This lock is useful when multiple CarbonData spark applications are launched and no ZooKeeper is running on cluster and HDFS supports file based locking.</td> +</tr> +<tr> +<td>carbon.sort.intermediate.files.limit</td> +<td>20</td> +<td>Minimum number of intermediate files after which merged sort can be started.</td> +</tr> +<tr> +<td>carbon.block.meta.size.reserved.percentage</td> +<td>10</td> +<td>Space reserved in percentage for writing block meta data in CarbonData file.</td> +</tr> +<tr> +<td>carbon.csv.read.buffersize.byte</td> +<td>1048576</td> +<td>csv reading buffer size.</td> +</tr> +<tr> +<td>high.cardinality.value</td> +<td>100000</td> +<td>To identify and apply compression for non-high cardinality columns.</td> +</tr> +<tr> +<td>carbon.merge.sort.reader.thread</td> +<td>3</td> +<td>Maximum no of threads used for reading intermediate files for final merging.</td> +</tr> +<tr> +<td>carbon.load.metadata.lock.retries</td> +<td>3</td> +<td>Maximum number of retries to get the metadata lock for loading data to table.</td> +</tr> +<tr> +<td>carbon.load.metadata.lock.retry.timeout.sec</td> +<td>5</td> +<td>Interval between the retries to get the lock.</td> +</tr> +<tr> +<td>carbon.tempstore.location</td> +<td>/opt/Carbon/TempStoreLoc</td> +<td>Temporary store location. By default it takes System.getProperty("java.io.tmpdir").</td> +</tr> +<tr> +<td>carbon.load.log.counter</td> +<td>500000</td> +<td>Data loading records count logger.</td> +</tr> +</tbody> +</table> + +<ul> +<li><strong>Compaction Configuration</strong></li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<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> +</tr> +<tr> +<td>carbon.allowed.compaction.days</td> +<td>0</td> +<td>Compaction will merge the segments which are loaded with in the specific number of days configured. Example: If the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged. This is disabled by default.</td> +</tr> +<tr> +<td>carbon.enable.auto.load.merge</td> +<td>false</td> +<td>To enable compaction while data loading.</td> +</tr> +</tbody> +</table> + +<ul> +<li><strong>Query Configuration</strong></li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td>max.query.execution.time</td> +<td>60</td> +<td>Maximum time allowed for one query to be executed. The value is in minutes.</td> +</tr> +<tr> +<td>carbon.enableMinMax</td> +<td>true</td> +<td>Min max is feature added to enhance query performance. To disable this feature, set it false.</td> +</tr> +</tbody> +</table> + +<ul> +<li><strong>Global Dictionary Configurations</strong></li> +</ul> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<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> +</tr> +<tr> +<td>high.cardinality.threshold</td> +<td>1000000</td> +<td>high.cardinality.threshold</td> +</tr> +<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> +</tr> +<tr> +<td>carbon.cutOffTimestamp</td> +<td>1970-01-01 05:30:00</td> +<td>Sets the start date for calculating the timestamp. Java counts the number of milliseconds from start of "1970-01-01 00:00:00". This property is used to customize the start of position. For example "2000-01-01 00:00:00". The date must be in the form "carbon.timestamp.format". NOTE: The CarbonData supports data store up to 68 years from the cut-off time defined. For example, if the cut-off time is 1970-01-01 05:30:00, then the data can be stored up to 2038-01-01 05:30:00.</td> +</tr> +<tr> +<td>carbon.timegranularity</td> +<td>SECOND</td> +<td>The property used to set the data granularity level DAY, HOUR, MINUTE, or SECOND.</td> +</tr> +</tbody> +</table> + +<h2> +<a id="spark-configuration" class="anchor" href="#spark-configuration" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Spark Configuration</h2> + +<p><b></b></p><p align="center">Spark Configuration Reference in spark-defaults.conf</p> + +<table> +<thead> +<tr> +<th>Parameter</th> +<th>Default Value</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td>spark.driver.memory</td> +<td>1g</td> +<td>Amount of memory to be used by the driver process.</td> +</tr> +<tr> +<td>spark.executor.memory</td> +<td>1g</td> +<td>Amount of memory to be used per executor process.</td> +</tr> +<tr> +<td>spark.sql.bigdata.register.analyseRule</td> +<td>org.apache.spark.sql.hive.acl.CarbonAccessControlRules</td> +<td>CarbonAccessControlRules need to be set for enabling Access Control.</td> +</tr> +</tbody> +</table> +</div> +</div> +</div> +</div> +<div class="doc-footer"> + <a href="#top" class="scroll-top">Top</a> +</div> +</div> +</section> +</div> +</div> +</div> +</section><!-- End systemblock part --> +<script src="js/custom.js"></script> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/webapp/css/mdstyle.css ---------------------------------------------------------------------- diff --git a/src/main/webapp/css/mdstyle.css b/src/main/webapp/css/mdstyle.css deleted file mode 100644 index b8fbef1..0000000 --- a/src/main/webapp/css/mdstyle.css +++ /dev/null @@ -1,83 +0,0 @@ - - - -#viewpage body{font-family:'Open Sans', arial, helvatica, sans-serif; color: #888} - -#leftmenu ol li, #leftmenu ul li { list-style-type: none;} - -#leftmenu ol, #leftmenu ul {margin-top: 0; margin-bottom: 10px; margin-left:0; } -/*#leftmenu ol li a, #leftmenu ul li a{margin-bottom:0px; color: #444; display:block; font-weight: 600;font-size: 12px; line-height:24px}*/ -#leftmenu ol li a, #leftmenu ul li a { margin-bottom: 0px; color: #666; display: block; border-bottom: 1px solid #e7e7e7; - font-weight: 600; font-size: 12px; line-height: 28px; background: #f1f1f1;padding-left: 10px;} - -#leftmenu ol li a:hover, #leftmenu ul li a:hover{color: #00a0d2;} -/*#leftmenu ol ol, #leftmenu ol ul, #leftmenu ul ol, #leftmenu ul ul { margin-bottom: 0; margin-left:15px;}*/ -#leftmenu ol ol, #leftmenu ol ul, #leftmenu ul ol, #leftmenu ul ul {margin-bottom: 0; margin-left: 0;} - -/*#leftmenu ol ol a, -#leftmenu ol ul a, -#leftmenu ul ol a, -#leftmenu ul ul a{ margin-top:8px; margin-bottom:8px; font-weight: 500; font-size: 12px; line-height: 16px} -*/ -#leftmenu ol ol a, -#leftmenu ol ul a, -#leftmenu ul ol a, -#leftmenu ul ul a { padding-top: 6px; padding-bottom: 6px; font-weight: 500; font-size: 12px; line-height: 16px; - background: #f9f9f9; padding-left: 20px;border-bottom: 1px solid #eee; color: #0096cc;} - -/*#leftmenu ul ul ul{margin-left: 30px;}*/ -#leftmenu ul ul ul {margin-left: 0;} -/*#leftmenu ul ul ul a{color: #666; line-height: 16px; margin: 0 0 6px -6px;}*/ -#leftmenu ul ul ul a { color: #666; line-height: 16px; margin: 0; padding:6px 0 6px 30px; background: #fff; -border-bottom: 1px dashed #e1e1e1;} -#leftmenu ul ul ul li{list-style-type: none;} - -#leftmenu h1, #viewpage h1 { font-size: 22px; padding-top: 14px; border-bottom: 1px solid #ddd; - color: #444; font-weight: bold;line-height: 30px; margin: 0 0 5px; padding: 5px 0 5px 10px;} -#leftmenu h1{ font-size: 18px} - - - - - - -#viewpage h2, #viewpage h3, #viewpage h4 { - font-size: 16px; - margin-bottom: 10px; - padding-top: 10px;font-weight: bold; - text-decoration: underline; - color: #444; -} - -#viewpage h2{ font-size: 18px} - -#viewpage p { - margin-bottom: 10px; - font-size: 13px; - padding: 0; - line-height: 18px; - color: #666; - text-align:justify; -} - -#viewpage p img{ max-width: 100%;} -#viewpage p strong {font-weight: 600;} -#viewpage ul, #viewpage ol { padding: 0; margin: 0 0 10px;} - -#viewpage a {color: #00a0d2; text-decoration: none; font-size: 13px; cursor: pointer;} -#viewpage a:hover, #viewpage a:focus {color: #ff943d;text-decoration: none;} -#viewpage li {margin-left: 20px; line-height: 24px; color: #666} -#viewpage hr{ display:none;} -#viewpage table {color: #444;} -#viewpage td{word-break: break-all;} -#viewpage th { white-space: nowrap;} - - -#viewpage h2 { position: relative; } -#viewpage h2:before{ display: block; content: " "; margin-top: -2px; height:40px; visibility: hidden; } - -#viewpage code { - color: #dd6300; - background-color: #f8f8f8; - border-radius: 4px; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/webapp/css/print.css ---------------------------------------------------------------------- diff --git a/src/main/webapp/css/print.css b/src/main/webapp/css/print.css deleted file mode 100644 index 0ee9ef8..0000000 --- a/src/main/webapp/css/print.css +++ /dev/null @@ -1,10 +0,0 @@ -@media print { - body { color: #000; background: #fff; } - header{ display: none;} - .sidebar{ display: none;} - .fixed-padding{ display: none} - .doc-header .logo-print{ display:inline-block;} - .scroll-top, .print-icon{ display: none} - .printable{display: block;} - .doc-toc{ display: none} -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/4f8753c1/src/main/webapp/css/style.css ---------------------------------------------------------------------- diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 2aa6248..7fb0361 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -20,6 +20,26 @@ a:hover, a:focus{ color:#ff943d; text-decoration:none} img{ max-width:100%; height:auto} +table { + border-collapse: collapse; + width: 100%; +} + +th, td { + text-align: left; + padding: 15px; + border-bottom: 1px solid #ddd; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; + border-top: 1px solid #ddd; +} + +th { + background-color: #f2f2f2; +} + +tr:nth-child(even){background-color: #f2f2f2} + .container-fluid{ max-width: 1180px} .container-fluid-full{ max-width: 100%} @@ -509,6 +529,15 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end .cd-quickbtns .title .title-underline{ height: 2px; width:50px; background: #444; margin:10px 0; padding: 0; display:block;} +.doc-heading { + margin: 10px 0 0; + padding:5px 0; +} + +.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;} + + .quickstart-btn { background: #ff943d; border: 1px solid #ff943d; @@ -543,6 +572,19 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end /*.quickstart-btn i.fa {font-size: 36px; position: absolute; left: 8px; top: 50%; margin-top: -19px;}*/ .quickstart-btn i.fa {font-size: 30px;position: absolute; left: 16px; top: 50%; margin-top: -16px;} +.ul-padding{ + padding-left: 20px; +} + +.div-styling{ + background: #f8f8f8; + padding: 5px 15px; +} + +.display-style{ + display: inline-block; +} + footer{ background: #111; padding:0; } footer .topcontant{ display: block; padding: 20px 0; } @@ -937,9 +979,22 @@ box-shadow: 0 3px 2px #aaa } display: block; text-align: justify} -/* ------------------- End Documentation Style here*/ +.cell.cellcummunity{ width:75%; padding-right: 2%} +.cell.celllatestnews { + width: 23%; + height: 100%; + background: #fdfdfd; + padding: 15px; + border: 2px solid #ff943d; +} +.cell{display: table-cell; vertical-align:top; height: 100%;} + +.celllatestnews .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;} +.celllatestnews .title .title-underline{ height: 2px; width:50px; background: #444; margin:10px 0; padding: 0; display:block;} +.newsblock { margin-top: 20px;font-size: 13px;text-align: justify;} +/* ------------------- End Documentation Style here*/ /* Media Style */
