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/05/11 23:32:44 UTC
[2/2] carbondata-site git commit: optimize carbonscript code
optimize carbonscript code
Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/51c60829
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/51c60829
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/51c60829
Branch: refs/heads/asf-site
Commit: 51c60829cec194c8ac4ef98e79f7a79d18ab1c24
Parents: 4406397 d0f3baf
Author: chenliang613 <ch...@huawei.com>
Authored: Fri May 12 07:32:25 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Fri May 12 07:32:25 2017 +0800
----------------------------------------------------------------------
carbonscript.sh | 2 +
content/configuration-parameters.html | 4 +
content/data-management.html | 4 +
content/ddl-operation-on-carbondata.html | 4 +
content/dml-operation-on-carbondata.html | 4 +
content/faq.html | 4 +
content/file-structure-of-carbondata.html | 4 +
content/installation-guide.html | 4 +
content/quick-start-guide.html | 4 +
content/supported-data-types-in-carbondata.html | 4 +
content/troubleshooting.html | 4 +
content/useful-tips-on-carbondata.html | 4 +
pom.xml | 56 +++++-
src/main/scala/FileModification.scala | 75 --------
src/main/scala/FileOperationMain.scala | 13 --
src/main/scala/MDFileConverter.scala | 53 ++++++
src/main/scala/MdFileHandler.scala | 54 ++++++
src/main/scala/MdFilehandler.scala | 84 +++------
src/main/scala/Module.scala | 10 +
src/main/scala/WebsiteLauncher.scala | 13 ++
src/main/scala/services/ConfService.scala | 9 +
src/main/scala/services/ConfServiceImpl.scala | 32 ++++
src/main/scala/services/DataService.scala | 7 +
src/main/scala/services/DataServiceImpl.scala | 51 ++++++
src/main/scala/services/FileService.scala | 7 +
src/main/scala/services/FileServiceImpl.scala | 43 +++++
src/main/webapp/configuration-parameters.html | 4 +
src/main/webapp/data-management.html | 4 +
.../webapp/ddl-operation-on-carbondata.html | 4 +
.../webapp/dml-operation-on-carbondata.html | 4 +
src/main/webapp/faq.html | 4 +
.../webapp/file-structure-of-carbondata.html | 4 +
src/main/webapp/installation-guide.html | 4 +
src/main/webapp/quick-start-guide.html | 4 +
.../supported-data-types-in-carbondata.html | 4 +
src/main/webapp/troubleshooting.html | 4 +
src/main/webapp/useful-tips-on-carbondata.html | 4 +
src/test/resources/scalastyle_config.xml | 181 +++++++++++++++++++
src/test/scala/MDFileConverterSpec.scala | 36 ++++
src/test/scala/MdFileHandlerSpec.scala | 38 ++++
.../scala/Service/FileServiceImplSpec.scala | 30 +++
41 files changed, 732 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/configuration-parameters.html
----------------------------------------------------------------------
diff --cc content/configuration-parameters.html
index b943b31,63943eb..66d3da3
--- a/content/configuration-parameters.html
+++ b/content/configuration-parameters.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/data-management.html
----------------------------------------------------------------------
diff --cc content/data-management.html
index 8c36daf,b3a9c99..d0e1611
--- a/content/data-management.html
+++ b/content/data-management.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/ddl-operation-on-carbondata.html
----------------------------------------------------------------------
diff --cc content/ddl-operation-on-carbondata.html
index 29297c5,81e8664..04fdb51
--- a/content/ddl-operation-on-carbondata.html
+++ b/content/ddl-operation-on-carbondata.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/dml-operation-on-carbondata.html
----------------------------------------------------------------------
diff --cc content/dml-operation-on-carbondata.html
index c404840,e0c234e..830fb3e
--- a/content/dml-operation-on-carbondata.html
+++ b/content/dml-operation-on-carbondata.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/faq.html
----------------------------------------------------------------------
diff --cc content/faq.html
index 67f04cf,54fcc09..5e9f490
--- a/content/faq.html
+++ b/content/faq.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/file-structure-of-carbondata.html
----------------------------------------------------------------------
diff --cc content/file-structure-of-carbondata.html
index 2e55d72,985b116..30d3c6f
--- a/content/file-structure-of-carbondata.html
+++ b/content/file-structure-of-carbondata.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/installation-guide.html
----------------------------------------------------------------------
diff --cc content/installation-guide.html
index df2381c,fd31349..300b6b0
--- a/content/installation-guide.html
+++ b/content/installation-guide.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/quick-start-guide.html
----------------------------------------------------------------------
diff --cc content/quick-start-guide.html
index 214d3e8,633bc6c..e125977
--- a/content/quick-start-guide.html
+++ b/content/quick-start-guide.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/supported-data-types-in-carbondata.html
----------------------------------------------------------------------
diff --cc content/supported-data-types-in-carbondata.html
index 4fdc494,9757fb3..754438a
--- a/content/supported-data-types-in-carbondata.html
+++ b/content/supported-data-types-in-carbondata.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/troubleshooting.html
----------------------------------------------------------------------
diff --cc content/troubleshooting.html
index 0fb49f2,7ae7dc7..a929ae0
--- a/content/troubleshooting.html
+++ b/content/troubleshooting.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/content/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --cc content/useful-tips-on-carbondata.html
index e7d9bcb,b5ff71c..cc8110c
--- a/content/useful-tips-on-carbondata.html
+++ b/content/useful-tips-on-carbondata.html
@@@ -73,12 -73,9 +73,16 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
++ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
+ target="_blank">Release Guide</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>
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/scala/MdFilehandler.scala
----------------------------------------------------------------------
diff --cc src/main/scala/MdFilehandler.scala
index 072eaf1,0000000..6fae74e
mode 100644,000000..100644
--- a/src/main/scala/MdFilehandler.scala
+++ b/src/main/scala/MdFilehandler.scala
@@@ -1,86 -1,0 +1,54 @@@
- import java.io.{File, PrintWriter}
-
- import com.typesafe.config.ConfigFactory
- 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
++import com.google.inject.Inject
++import org.slf4j.{Logger, LoggerFactory}
++import services.{FileService, ConfService}
+
+import scala.util.matching.Regex
- import scala.collection.JavaConverters._
+
- /**
- * Created by pallavi on 4/4/17.
- */
- class MdFilehandler {
++class MdFileHandler @Inject()(confService: ConfService, fileService: FileService) {
+
- val logger = LoggerFactory.getLogger(classOf[MdFilehandler])
++ val logger: Logger = LoggerFactory.getLogger(classOf[MdFileHandler])
+
+ /**
+ * converts .md extension to .html extension
+ * changes location of image from local to git repository
+ *
+ * @param input
+ * @return contents of file
+ */
- 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 modifyHttpsFileLink ="""(<a href=\"https)://([a-zA-Z0-9-/.]+)(\")""".r
- val modifyHttpFileLink ="""(<a href=\"http)://([a-zA-Z0-9-/.]+)(\")""".r
++ def convertMdExtensions(input: String): String = {
++ val modifyContentPattern: Regex = new Regex("id=\"user-content-")
++ val modifyMdPattern: Regex = new Regex(".md")
++ val modifyImagePattern: Regex = new Regex("<img src=\"../docs")
++ val modifyHttpsFileLink: Regex ="""(<a href=\"https)://([a-zA-Z0-9-/.]+)(\")""".r
++ val modifyHttpFileLink: Regex ="""(<a href=\"http)://([a-zA-Z0-9-/.]+)(\")""".r
++ val replacingImageContent: String = "<img src=\"https://github.com/apache/carbondata/blob/master/docs"
+ val contentAfterRemovingUserContent: String = modifyContentPattern replaceAllIn(input, "id=\"")
+ val contentAfterReplacingId: String = modifyMdPattern replaceAllIn(contentAfterRemovingUserContent, ".html")
- val contentAfterReplacingImage: String = modifyImagePattern replaceAllIn(contentAfterReplacingId, "<img src=\"https://github.com/apache/carbondata/blob/master/docs")
++ val contentAfterReplacingImage: String = modifyImagePattern replaceAllIn(contentAfterReplacingId,replacingImageContent)
+ val contentAfterReplacingHttpsFileLink: String = modifyHttpsFileLink replaceAllIn(contentAfterReplacingImage, "$1://$2$3 target=_blank")
+ val contentAfterReplacingFileLink: String = modifyHttpFileLink replaceAllIn(contentAfterReplacingHttpsFileLink, "$1://$2$3 target=_blank")
+ contentAfterReplacingFileLink
+ }
+
- def ConvertReadMeExtension(): List[String] = {
- val listOfFiles = ConfigFactory.load().getStringList("fileListToRetain").asScala.toList
- logger.info(s"List of files to retain .md extensions : $listOfFiles")
- val location = ConfigFactory.load().getString("outputFileLocation")
- val outputFileExtension = ".html"
- val modifyMdPattern = new Regex("(README)(.html)")
-
- listOfFiles.map { file =>
- val fileURLContent = scala.io.Source.fromFile("src/main/webapp/" + file + outputFileExtension).mkString
- val writer = new PrintWriter(new File(location + file + outputFileExtension))
- val fileContent = modifyMdPattern replaceAllIn(fileURLContent, "$1.md")
- writer.write(fileContent)
- writer.close()
- fileContent
- }
-
- }
-
+ /**
- * gets content of the file through rest call
++ * This handles the exeception cases for retaining .md extensions in some files
+ *
- * @param data file Url
- * @return contents of the file in responseBody if found else None is returned
++ * @return list of files
+ */
- def getFileContent(data: String): Option[String] = {
- val httpClient = new DefaultHttpClient()
- val httpRequest: HttpPost = new HttpPost(ConfigFactory.load().getString("mdLink"));
- 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")}}")
- if (httpResponse.getStatusLine.toString.contains("OK"))
- Some(responseBody.toString)
- else {
- logger.error(s"Fetching file fails {${httpResponse.getStatusLine}}")
- None
++ def convertReadMeExtensions(): List[String] = {
++ val listOfFiles: List[String] = confService.readListOfString("fileListToRetain")
++ logger.info(s"List of files to retain .md extensions : $listOfFiles")
++ val location: String = confService.readString("outputFileLocation")
++ val outputFileExtension: String = ".html"
++ val modifyMdPattern: Regex = new Regex("(README)(.html)")
++ listOfFiles.map { file =>
++ val fileURLContent: String = fileService.readFromFile("src/main/webapp/" + file + outputFileExtension)
++ val fileContent: String = modifyMdPattern replaceAllIn(fileURLContent, "$1.md")
++ fileService.writeToFile(location + file + outputFileExtension, fileContent)
++ fileContent
+ }
+
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/configuration-parameters.html
----------------------------------------------------------------------
diff --cc src/main/webapp/configuration-parameters.html
index b943b31,26af266..66d3da3
--- a/src/main/webapp/configuration-parameters.html
+++ b/src/main/webapp/configuration-parameters.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/data-management.html
----------------------------------------------------------------------
diff --cc src/main/webapp/data-management.html
index 8c36daf,b0fc15e..d0e1611
--- a/src/main/webapp/data-management.html
+++ b/src/main/webapp/data-management.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/ddl-operation-on-carbondata.html
----------------------------------------------------------------------
diff --cc src/main/webapp/ddl-operation-on-carbondata.html
index 29297c5,ad03f57..04fdb51
--- a/src/main/webapp/ddl-operation-on-carbondata.html
+++ b/src/main/webapp/ddl-operation-on-carbondata.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/dml-operation-on-carbondata.html
----------------------------------------------------------------------
diff --cc src/main/webapp/dml-operation-on-carbondata.html
index c404840,200ddd3..830fb3e
--- a/src/main/webapp/dml-operation-on-carbondata.html
+++ b/src/main/webapp/dml-operation-on-carbondata.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/faq.html
----------------------------------------------------------------------
diff --cc src/main/webapp/faq.html
index 67f04cf,8b9bcc7..5e9f490
--- a/src/main/webapp/faq.html
+++ b/src/main/webapp/faq.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/file-structure-of-carbondata.html
----------------------------------------------------------------------
diff --cc src/main/webapp/file-structure-of-carbondata.html
index 2e55d72,053ddc3..30d3c6f
--- a/src/main/webapp/file-structure-of-carbondata.html
+++ b/src/main/webapp/file-structure-of-carbondata.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/installation-guide.html
----------------------------------------------------------------------
diff --cc src/main/webapp/installation-guide.html
index df2381c,9edae64..300b6b0
--- a/src/main/webapp/installation-guide.html
+++ b/src/main/webapp/installation-guide.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/quick-start-guide.html
----------------------------------------------------------------------
diff --cc src/main/webapp/quick-start-guide.html
index 214d3e8,0211362..e125977
--- a/src/main/webapp/quick-start-guide.html
+++ b/src/main/webapp/quick-start-guide.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/supported-data-types-in-carbondata.html
----------------------------------------------------------------------
diff --cc src/main/webapp/supported-data-types-in-carbondata.html
index 4fdc494,bc455dc..754438a
--- a/src/main/webapp/supported-data-types-in-carbondata.html
+++ b/src/main/webapp/supported-data-types-in-carbondata.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/troubleshooting.html
----------------------------------------------------------------------
diff --cc src/main/webapp/troubleshooting.html
index 0fb49f2,3d9d711..a929ae0
--- a/src/main/webapp/troubleshooting.html
+++ b/src/main/webapp/troubleshooting.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/51c60829/src/main/webapp/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --cc src/main/webapp/useful-tips-on-carbondata.html
index e7d9bcb,fbce733..cc8110c
--- a/src/main/webapp/useful-tips-on-carbondata.html
+++ b/src/main/webapp/useful-tips-on-carbondata.html
@@@ -73,10 -73,10 +73,14 @@@
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"
+ <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
target="_blank">Contributing to CarbonData</a></li>
<li>
++<<<<<<< HEAD
+ <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
++=======
+ <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
++>>>>>>> pr-34
target="_blank">Release Guide</a></li>
<li>
<a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"