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/04/12 11:52:18 UTC
[50/54] incubator-carbondata-site git commit: added properties in
configuration files
added properties in configuration files
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/commit/54e179b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/tree/54e179b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/diff/54e179b0
Branch: refs/heads/asf-site
Commit: 54e179b0b75f64312abcc7e19cc4b5753a024368
Parents: b357108
Author: PallaviSingh1992 <pa...@yahoo.co.in>
Authored: Thu Apr 6 18:31:59 2017 +0530
Committer: PallaviSingh1992 <pa...@yahoo.co.in>
Committed: Thu Apr 6 18:31:59 2017 +0530
----------------------------------------------------------------------
src/main/scala/FileModification.scala | 1 +
src/main/scala/FileOperationMain.scala | 4 ++--
.../webapp/dml-operation-on-carbondata.html | 9 -------
src/main/webapp/index.html | 25 ++++++--------------
src/main/webapp/mainpage.html | 4 ++--
src/main/webapp/troubleshooting.html | 4 ++--
6 files changed, 14 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/54e179b0/src/main/scala/FileModification.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/FileModification.scala b/src/main/scala/FileModification.scala
index e7b3e8f..2cbfd73 100644
--- a/src/main/scala/FileModification.scala
+++ b/src/main/scala/FileModification.scala
@@ -12,6 +12,7 @@ class FileModification {
val outputFileExtension = ".html"
import scala.io.Source
+
val headerContent: String = Source.fromFile(ConfigFactory.load().getString("headerPath")).mkString
val footerContent: String = Source.fromFile(ConfigFactory.load().getString("footerPath")).mkString
http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/54e179b0/src/main/scala/FileOperationMain.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/FileOperationMain.scala b/src/main/scala/FileOperationMain.scala
index bf14f86..2dd027e 100644
--- a/src/main/scala/FileOperationMain.scala
+++ b/src/main/scala/FileOperationMain.scala
@@ -5,8 +5,8 @@ class FileOperationMain
object FileOperationMain {
def main(args: Array[String]) {
val logger = LoggerFactory.getLogger(classOf[FileOperationMain])
- val fileObject=new FileModification
- val status =fileObject.convertToHtml()
+ 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/54e179b0/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 c53811f..c05e461 100644
--- a/src/main/webapp/dml-operation-on-carbondata.html
+++ b/src/main/webapp/dml-operation-on-carbondata.html
@@ -308,14 +308,6 @@ column2:dictionaryFilePath2')
<p>NOTE: Date formats are specified by date pattern strings. The date pattern letters in CarbonData are same as in JAVA. Refer to <a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html" target=_blank>SimpleDateFormat</a>.</p>
</li>
<li>
-<p><strong>USE_KETTLE:</strong> This option is used to specify whether to use kettle for loading data or not. By default kettle is not used for data loading.</p>
-
-<pre><code>OPTIONS('USE_KETTLE'='FALSE')
-</code></pre>
-
-<p>Note : It is recommended to set the value for this option as false.</p>
-</li>
-<li>
<p><strong>SINGLE_PASS:</strong> Single Pass Loading enables single job to finish data loading with dictionary generation on the fly. It enhances performance in the scenarios where the subsequent data loading after initial load involves fewer incremental updates on the dictionary.</p>
<p>This option specifies whether to use single pass for loading data or not. By default this option is set to FALSE.</p>
@@ -345,7 +337,6 @@ options('DELIMITER'=',', 'QUOTECHAR'='"','COMMENTCHAR'='#',
'MULTILINE'='true','ESCAPECHAR'='\','COMPLEX_DELIMITER_LEVEL_1'='$',
'COMPLEX_DELIMITER_LEVEL_2'=':',
'ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary',
-'USE_KETTLE'='FALSE',
'SINGLE_PASS'='TRUE'
)
</code></pre>
http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/54e179b0/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 1251041..5c482b9 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -423,21 +423,10 @@
<i class="fa fa-facebook-square" aria-hidden="true"></i></a>
<a href="https://twitter.com/search?q=%23CarbonData" target="_blank"> <i
class="fa fa-twitter-square" aria-hidden="true"></i></a>
- <a> <i class="fa fa-linkedin-square" aria-hidden="true"></i></a>
+ <a href="https://www.linkedin.com/groups/10334501"> <i
+ class="fa fa-linkedin-square" aria-hidden="true"></i></a>
</p>
</div>
- <!--<div class="cell celllatestnews">
- <h4 class="title">Latest News
- <span class="title-underline"></span>
- </h4>
- <div class="newsblock">
- Apache CarbonData is honored with
- <a href="https://www.blackducksoftware.com/open-source-rookies-2016#Bigdata"
- target="_blank"> <strong> Black Duck Open Source ROOKIES of the Year 2016 Award</strong></a>
- as the most innovative and influential open source project launched during the
- year 2016.
- </div>
- </div>-->
</div>
</div>
</div>
@@ -510,7 +499,7 @@
</h4>
<div class="col-md-4 col-sm-6">
- <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction" id="ref_butn">
+ <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction" id="ref_butn" target="_blank">
<div class="cd-columnblock">
<div class="iconbox">
<i class="icon uniquedata"></i>
@@ -524,7 +513,7 @@
</div>
<div class="col-md-4 col-sm-6">
- <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction" id="ref_butn">
+ <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction" id="ref_butn" target="_blank">
<div class="cd-columnblock">
<div class="iconbox">
<i class="icon multilevelindexing"></i>
@@ -537,7 +526,7 @@
</div>
<div class="col-md-4 col-sm-6">
- <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction">
+ <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction" target="_blank">
<div class="cd-columnblock">
<div class="iconbox">
<i class="icon deepsparkintegration"></i>
@@ -549,7 +538,7 @@
</div>
<div class="col-md-4 col-sm-6">
- <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction">
+ <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction" target="_blank">
<div class="cd-columnblock">
<div class="iconbox">
<i class="icon advancedpushdownoptimization"></i>
@@ -563,7 +552,7 @@
</div>
<div class="col-md-4 col-sm-6">
- <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction">
+ <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction" target="_blank">
<div class="cd-columnblock">
<div class="iconbox">
<i class="icon dictionaryencoding"></i>
http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/54e179b0/src/main/webapp/mainpage.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/mainpage.html b/src/main/webapp/mainpage.html
index 68d5329..16c511f 100644
--- a/src/main/webapp/mainpage.html
+++ b/src/main/webapp/mainpage.html
@@ -176,8 +176,8 @@
and Features</a></li>
<li><a href="supported-data-types-in-carbondata.html">Data
Types</a></li>
- <li><a href="file-structure-of-carbondata.html">CarbonData
- File Structure</a></a></li>
+ <li><a href="installation-guide.html">CarbonData
+ Installation Guide</a></a></li>
<li><a href="configuration-parameters.html">Configuring
CarbonData</a></li>
<li><a href="data-management.html">Using
http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/54e179b0/src/main/webapp/troubleshooting.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/troubleshooting.html b/src/main/webapp/troubleshooting.html
index 58d7d76..96ac1f2 100644
--- a/src/main/webapp/troubleshooting.html
+++ b/src/main/webapp/troubleshooting.html
@@ -382,7 +382,7 @@ For example, you can use scp to copy this file to all the nodes.</p>
<p><strong>Procedure</strong></p>
-<p>Worker must wait for the query execution to complete and the table to release the lock for another query execution to succeed..</p>
+<p>Worker must wait for the query execution to complete and the table to release the lock for another query execution to succeed.</p>
<h2>
<a id="failed-to-create-a-table-with-a-single-numeric-column" class="anchor" href="#failed-to-create-a-table-with-a-single-numeric-column" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Failed to create a table with a single numeric column.</h2>
@@ -396,7 +396,7 @@ For example, you can use scp to copy this file to all the nodes.</p>
<p><strong>Possible Cause</strong></p>
-<p>Behavior not supported.</p>
+<p>Behaviour not supported.</p>
<p><strong>Procedure</strong></p>