You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/12/01 17:08:36 UTC
[1/6] incubator-trafodion git commit: First phase of website update.
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 4283b5210 -> 05f4d35a4
First phase of website update.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/81594fff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/81594fff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/81594fff
Branch: refs/heads/master
Commit: 81594fffe602a224c999c6edf1579d4a96c06c36
Parents: 0ebc219
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Mon Nov 16 17:25:56 2015 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Mon Nov 16 17:25:56 2015 -0700
----------------------------------------------------------------------
docs/src/site/asciidoc/index.adoc | 46 -------
docs/src/site/resources/css/site.css | 197 ++++++-----------------------
docs/src/site/site.xml | 199 +++++++++++++++++++-----------
pom.xml | 48 +++----
4 files changed, 193 insertions(+), 297 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/81594fff/docs/src/site/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/src/site/asciidoc/index.adoc b/docs/src/site/asciidoc/index.adoc
deleted file mode 100644
index 6d19759..0000000
--- a/docs/src/site/asciidoc/index.adoc
+++ /dev/null
@@ -1,46 +0,0 @@
-////
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-:linkattrs:
-:last-update-label!:
-
-[NOTE]
-======================================================================================================================================================
-Trafodion is currently transitioning to the Apache Incubator. This website is for the Apache Trafodion project and is *under development*.
-You might want to visit Trafodion's previous website located at link:https://wiki.trafodion.org[https://wiki.trafodion.org, window="_blank"] which is
-not affiliated with Apache.
-======================================================================================================================================================
-
-= Welcome to Apache Trafodion
-link:http://trafodion.incubator.apache.org[Apache Trafodion] is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on
-link:http://hadoop.apache.org[Hadoop, window="_blank"]. The name .Trafodion. (the Welsh word for transactions, pronounced .Tra-vod-eee-on.) was chosen
-specifically to emphasize the differentiation that Trafodion provides in closing a critical gap in the Hadoop ecosystem. Trafodion builds on the
-scalability, elasticity, and flexibility of Hadoop. Trafodion extends Hadoop to provide guaranteed transactional integrity, enabling new kinds of big data
-applications to run on Hadoop. To learn more, see the link:http://docs.trafodion.org/Trafodion_Product_Brief.pdf[Trafodion Product Brief (pdf 162 KB), window="_blank"]
-
-= Key Features
-* Full-functioned ANSI SQL language support
-* JDBC/ODBC connectivity for Linux/Windows clients
-* Distributed ACID transaction protection across multiple statements, tables and rows
-* Performance improvements for OLTP workloads with compile-time and run-time optimizations
-* Support for large data sets using a parallel-aware query optimizer
-
-= Key Benefits
-* Reuse existing SQL skills and improve developer productivity
-* Distributed ACID transactions guarantee data consistency across multiple rows and tables
-* Interoperability with existing tools and applications
-* Hadoop and Linux distribution neutral
-* Easy to add to your existing Hadoop infrastructure
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/81594fff/docs/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/css/site.css b/docs/src/site/resources/css/site.css
index 44b5f1e..b644917 100644
--- a/docs/src/site/resources/css/site.css
+++ b/docs/src/site/resources/css/site.css
@@ -1,188 +1,65 @@
-/**
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-* @@@ END COPYRIGHT @@@
- */
-
-/* Theme Trafodian
-- for use with the Trafodian project hosted on and by Apache */
-
-/* Scaffolding */
+.color-highlight {
+ color: #225E9B;
+}
body {
- /* background: #f2f2f2 url('images/theme/background-grid.png') top center repeat; */
- background-color: #eeeeee;
- padding-top: 70px;
- padding-bottom: 0px;
+ background-image:url(../images/bg.png);
}
-footer {
- background-color: #ababab;
- height: auto;
- text-align: center;
- margin: 30px 0px 0px 0px;
- padding: 10px;
+body[class*="page-themes-bootswatch"] {
+ background-image: none;
}
-/* Menus and Navigation */
-
-.theme-dropdown .dropdown-menu {
- position: static;
- display: block;
- margin-bottom: 20px;
+body[class*="page-themes-bootswatch"] .color-highlight {
+ color: inherit;
}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
- background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
- background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
- background-color: #e8e8e8;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
- background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
- background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
- background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
- background-color: #2e6da4;
-}
-.navbar-default {
- background-image: -webkit-linear-gradient(top, #dedede 0%, #999999 100%);
- background-image: -o-linear-gradient(top, #dedede 0%, #999999 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#dedede), to(#999999));
- background-image: linear-gradient(to bottom, #dedede 0%, #999999 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdedede', endColorstr='#ff999999', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
-}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .active > a {
- background-image: -webkit-linear-gradient(top, #dedede 0%, #eeeeee 100%);
- background-image: -o-linear-gradient(top, #dedede 0%, #eeeeee 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#dedede), to(#eeeeee));
- background-image: linear-gradient(to bottom, #dedede 0%, #eeeeee 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdedede', endColorstr='#ffeeeeee', GradientType=0);
- -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
-}
-.navbar-brand,
-.navbar-nav > li > a {
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
-}
-.navbar-inverse {
- background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222222 100%);
- background-image: -o-linear-gradient(top, #3c3c3c 0%, #222222 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222222));
- background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- border-radius: 4px;
-}
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .active > a {
- background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
- background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
- background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
- -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
- box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
-}
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
- border-radius: 0;
+.thumbnail-row {
+ margin-top: 10px;
}
-/* Jumbotron */
-
-.theme-showcase > p > .btn {
- margin: 5px 0;
+/*h1, */h2 {
+ margin-top: 30px;
}
-.theme-showcase .navbar .container {
- width: auto;
+h3, h4, h5, h6 {
+ margin-top: 20px;
}
-.jumbotron {
- background-color: transparent;
+.carousel-caption a {
+ color: white;
}
-.jumbotron h1 {
+/* A bit of workaround for links being not clickable due to :before element in headings */
+.project-reflow-parent.page-index h2[id]:before {
+ height: 30px;
+ margin-top: -30px;
}
-#jumbotron-message {
- float: right;
- clear: left;
+.project-reflow-parent.page-index .sidebar {
+ margin-top: 10px;
}
-/* Headings */
-
-.page-header {
- border-bottom: 5px solid #999999;
- clear: both;
+.project-reflow-parent.page-index .sidebar {
+ margin-top: 10px;
}
-/* Trafodian-Specific */
-
-#trafodian-announcement {
- text-align: center;
- width: 75%;
- margin: 10px auto;
- padding: 10px;
- border: 5px solid #999999;
- background-color: #dedede;
+.project-reflow-parent.page-index .sidebar h3 {
+ margin-top: 10px;
}
-#trafodian-sandbox {
- float: right;
- width: 280px;
- height: 280px;
- margin: auto auto 10px 10px;
- padding: 10px;
- border: 5px solid #999999;
- background-color: #dedede;
-}
-#breadcrumbs {
- display: none !important;
-}
+@media (min-width: 980px) {
+ .page-themes-bootswatch-readable .navbar.affix {
+ top: 60px;
+ }
+
+ .page-themes-bootswatch-cerulean .navbar.affix {
+ top: 50px;
+ }
-h1 {
- border-bottom: 5px solid #999999;
+ .page-themes-bootswatch-spruce .navbar.affix {
+ top: 55px;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/81594fff/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 88f62b5..83d0960 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -19,99 +19,158 @@
*/
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
- <bannerLeft>
- <name>Apache Trafodion</name>
- <href>http://trafodion.incubator.apache.org</href>
- </bannerLeft>
- <bannerRight>
- <name>Transactional SQL-on-Hadoop DBMS</name>
- </bannerRight>
+<project name="Apache Trafodion">
<publishDate position="none"/>
<version position="none"/>
-
<skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.4</version>
+ <groupId>lt.velykis.maven.skins</groupId>
+ <artifactId>reflow-maven-skin</artifactId>
+ <version>1.1.1</version>
</skin>
+ <bannerLeft>
+ <!-- Apache Trafodion, but with "Trafodion" highlighted -->
+ <name><![CDATA[
+ Apache <span class="color-highlight">Trafodion</span>
+ ]]>
+ </name>
+ <href>index.html</href>
+ </bannerLeft>
+
<custom>
- <fluidoSkin>
- <topBarEnabled>true</topBarEnabled>
- <!--
- <topBarContainerStyle>width: 90%;</topBarContainerStyle>
- <topBarIcon>
- <name>Apache Trafodion</name>
- <alt>Apache Trafodion</alt>
- <src>/images/topbar-logo.png</src>
- <href>/index.html</href>
- </topBarIcon>
- -->
- <sideBarEnabled>false</sideBarEnabled>
- <skipGenerationDate>true</skipGenerationDate>
- </fluidoSkin>
+ <reflowSkin>
+ <!-- Set to false for local testing -->
+ <protocolRelativeURLs>false</protocolRelativeURLs>
+ <theme>bootswatch-cerulean</theme>
+ <titleTemplate>%1$s %2$s</titleTemplate>
+ <skinAttribution>false</skinAttribution>
+ <breadcrumbs>true</breadcrumbs>
+ <smoothScroll>true</smoothScroll>
+ <highlightJs>true</highlightJs>
+ <brand>
+ <!-- Brand text in top-left part of the site -->
+ <name>
+ <![CDATA[
+ Apache <span class="color-highlight">Trafodion</span>
+ ]]>
+ </name>
+ <href>index.html</href>
+ </brand>
+ <slogan>Transactional SQL-on-Hadoop Database</slogan>
+ <!-- Use Table of Contents at the top of the page (max 6 elements) -->
+ <toc>top</toc>
+ <tocTopMax>9</tocTopMax>
+ <bottomNav maxSpan="8" >
+ <column>About</column>
+ <column>Using</column>
+ <column>Features</column>
+ <column>Reference</column>
+ </bottomNav>
+ <bottomDescription>
+ <![CDATA[
+ <a href="http://trafodion.apache.org/">Apache Trafodion</a> is a webscale SQL-on-Hadoop solution enabling transactional or operational
+ workloads on Hadoop. <br /><br />The name "Trafodion" (the Welsh word for transactions, pronounced
+ "Tra-vod-eee-on") was chosen specifically to emphasize the differentiation that
+ Trafodion provides in closing a critical gap in the Hadoop ecosystem.<br /><br />
+ Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Trafodion extends
+ Hadoop to provide guaranteed transactional integrity, enabling new kinds of big data
+ applications to run on Hadoop.
+ ]]>
+ </bottomDescription>
+ <pages>
+ <index>
+ <titleTemplate>%1$s</titleTemplate>
+ <!-- no ToC on the main index page -->
+ <toc>false</toc>
+ <!-- no breadcrumbs on the main index page -->
+ <breadcrumbs>false</breadcrumbs>
+ <markPageHeader>false</markPageHeader>
+ <sections>
+ <carousel />
+ <body />
+ <columns>2</columns>
+ <body />
+ </sections>
+ </index>
+ <issue-tracking><toc>false</toc></issue-tracking>
+ <license><toc>false</toc></license>
+ <mail-lists><toc>false</toc></mail-lists>
+ <release-notes><toc>false</toc></release-notes>
+ <website><markPageHeader>false</markPageHeader></website>
+ </pages>
+ </reflowSkin>
</custom>
<body>
- <head>
- <script type="text/javascript">
-
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- ga('create','UA-52475605-1','auto');ga('send','pageview');
-
- </script>
- </head>
-
- <breadcrumbs position="none"/>
-
- <menu name="Apache Trafodion Project">
- <item name="Overview" href="index.html"/>
- <item name="License" href="license.html" />
- <item name="Release Notes" href="https://issues.apache.org/jira/browse/TRAFODION?report=com.atlassian.jira.plugin.system.project:changelog-panel#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel" target="_blank" />
- <item name="Issue Tracking" href="issue-tracking.html" />
- <item name="Source Repository" href="source-repository.html" />
- <item name="Apache JIRA" href="https://issues.apache.org/jira/browse/TRAFODION" target="_blank" />
- <item name="LaunchPad (old bug tracker)" href="https://launchpad.net/trafodion" target="_blank" />
+ <!--
+ <breadcrumbs>
+ <item name="Trafodion" href="index.html"/>
+ </breadcrumbs>
+ -->
+ <menu name="About">
+ <item href="index.html" name="Overview"/>
+ <item href="new-features.html" name="New Features"/>
+ <item href="roadmap.html" name="Roadmap"/>
+ <item href="performance.html" name="Performance"/>
+ <item href="team-list.html" name="Team"/>
+ <item href="presentations.html" name="Presentations"/>
+ <item href="mail-lists.html" name="Mailing List"/>
+ <item href="source-repository.html" name="Source Repository"/>
+ <item href="issue-tracking.html" name="Issue Tracking"/>
+ <item href="download.html" name="Download"/>
+ <item href="install.html" name="Install"/>
+ <item href="http:divider" name=""/>
+ <item href="license.html" name="License"/>
+ <item href="http://www.apache.org/foundation/sponsorship.html" name="Sponsorship" target="_blank"/>
+ <item href="http://www.apache.org/foundation/thanks.html" name="Thanks" target="_blank"/>
+ <item href="http://www.apache.org/security/" name="Security" target="_blank"/>
</menu>
- <menu name="Documentation">
- <item name="Apache Wiki" href="https://cwiki.apache.org/confluence/display/TRAFODION/Apache+Trafodion+Home" target="_blank" />
- <item name="Old Wiki" href="https://wiki.trafodion.org" target="_blank"/>
- <item name="FAQ" href="https://wiki.trafodion.org/wiki/index.php/FAQ" target="_blank" />
+ <menu name="Using">
+ <item href="faq.html" name="F.A.Q."/>
+ <item href="quickstart.html" name="Quick Start"/>
+ <item href="http:divider" name=""/>
+ <item href="udf-tutorial.html" name="UDF API Tutorial"/>
</menu>
- <menu name="Community">
- <item name="Mailing Lists" href="mail-lists.html" />
- <item name="Team" href="team-list.html" />
+ <menu name="Features">
+ <item href="architecture.html" name="Architecture Overview"/>
+ <item href="technology-previews.html" name="Technology Preview"/>
</menu>
- <menu name="Download">
- <item name="Apache Downloads" href="http://www.apache.org/dyn/closer.cgi/trafodion/" target="_blank" />
- <item name="Old Downloads" href="http://downloads.trafodion.org" target="_blank" />
- </menu>
- <menu name="Git">
- <item name="Apache GIT" href="https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git" target="_blank" />
- <item name="Apache GitHub" href="https://github.com/apache/incubator-trafodion" target="_blank" />
- <item name="Old GIT" href="https://github.com/trafodion" target="_blank" />
+ <menu name="Documentation">
+ <item href="documentation.html" name="Documenation Library"/>
+ <item href="http:divider" name=""/>
+ <item href="release-notes.html" name="Release Notes"/>
+ <item href="install.html" name="Installation Guide"/>
+ <item href="docs/apache_trafodion_client_installation_guide.pdf" name="Client Installation Guide"/>
+ <item href="http:divider" name=""/>
+ <item href="docs/apache_trafodion_reference_guide.pdf" name="SQL Reference Guide"/>
+ <item href="connectivity-reference" name="Connectivity Reference Guide"/>
+ <item href="docs/apache_trafodion_trafci_guide.pdf" name="Command Interface Guide"/>
+ <item href="rest-reference" name="REST Reference Guide"/>
+ <item href="http:divider" name=""/>
+ <item href="docs/apache_trafodion_odb_user_guide.pdf" name="ODB User Guide"/>
+ <item href="data-loading.html" name="Data Loading Guide"/>
+ <item href="open-cart.html" name="Opencart Demo Guide"/>
</menu>
- <menu name="ASF">
- <item name="Apache Software Foundation" href="http://www.apache.org/foundation/" target="_blank" />
- <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html" target="_blank" />
- <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html" target="_blank" />
+ <menu name="Contributing">
+ <item href="contribute.html" name="How to Contribute"/>
+ <item href="develop.html" name="How to Develop"/>
+ <item href="website.html" name="How to Update Website"/>
+ <item href="release.html" name="How to Test"/>
+ <item href="release.html" name="How to Release"/>
+ <item href="http:divider" name=""/>
+ <item href="design-papers.html" name="Design Paper Template"/>
</menu>
<footer>
+ <hr />
<div class="row span16">
<span>Disclaimer: Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making
process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</span><br /><br />
<span>Apache, Apache Maven, Apache Maven Fluido Skin, the Apache feather logo, the Apache Maven project logo and the Apache Incubator project logo
- are trademarks of The Apache Software Foundation.</span><br />
+ are trademarks of The Apache Software Foundation.</span><br /><br />
<span>
<a href="http://www.apache.org" target="_blank"><img id="asf-logo" alt="Apache Software Foundation" src="images/logos/feather-small.gif" /></a>
<a href="http://incubator.apache.org/" target="_blank"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.gif" /></a>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/81594fff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eaf9a63..53cf8e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,10 +27,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>16</version>
- <relativePath/>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>16</version>
+ <relativePath/>
<!-- no parent resolution -->
</parent>
@@ -299,7 +299,7 @@
<contributor>
<name>Rohit Jain</name>
<email>rohit dot jain at esgyn dot com</email>
- <timezone>-8</timezone>
+ <timezone>-6</timezone>
<organization>Esgyn Corp</organization>
</contributor>
<contributor>
@@ -307,6 +307,11 @@
<email>pierre dot smits at gmail dot com</email>
<timezone>+2</timezone>
</contributor>
+ <contributor>
+ <name>Gunnar Tapper</name>
+ <email>gunnar dot tapper at esgyn dot com</email>
+ <timezone>-7</timezone>
+ </contributor>
</contributors>
<properties>
@@ -343,6 +348,23 @@
<artifactId>wagon-ssh</artifactId>
<version>2.2</version>
</dependency>
+ <!-- Markdown is used for the website pages -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>lt.velykis.maven.skins</groupId>
+ <artifactId>reflow-velocity-tools</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <!-- Reflow skin requires Velocity >= 1.7 -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
<!-- For building docs from asciidoctor -->
<dependency>
<groupId>org.asciidoctor</groupId>
@@ -387,22 +409,6 @@
</configuration>
<executions>
<execution>
- <id>output-html</id>
- <phase>site</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <attributes>
- <imagesdir>./images</imagesdir>
- <icons>font</icons>
- <stylesheet>trafodion.css</stylesheet>
- <last-update-label>false</last-update-label>
- </attributes>
- <backend>html5</backend>
- </configuration>
- </execution>
- <execution>
<id>output-pdf</id>
<phase>site</phase>
<goals>
[6/6] incubator-trafodion git commit: Merge remote branch
'origin/pr/179/head' into mrg_85
Posted by su...@apache.org.
Merge remote branch 'origin/pr/179/head' into mrg_85
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/05f4d35a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/05f4d35a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/05f4d35a
Branch: refs/heads/master
Commit: 05f4d35a4686c49cfcf54b8a2f41f5051ccdd662
Parents: 4283b52 aeef01e
Author: Suresh Subbiah <su...@apache.org>
Authored: Tue Dec 1 16:08:10 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Dec 1 16:08:10 2015 +0000
----------------------------------------------------------------------
docs/src/site/asciidoc/index.adoc | 46 ----
docs/src/site/markdown/architecture-overview.md | 166 +++++++++++++
docs/src/site/markdown/code-organization.md | 50 ++++
docs/src/site/markdown/contribute.md | 68 ++++++
docs/src/site/markdown/index.md | 132 +++++++++++
docs/src/site/markdown/release-notes-1-3-0.md | 161 +++++++++++++
docs/src/site/markdown/release-notes.md | 31 +++
docs/src/site/markdown/website.md | 64 +++++
docs/src/site/resources/css/site.css | 183 ++++-----------
.../resources/images/carousel/processes.png | Bin 0 -> 492019 bytes
.../resources/images/carousel/revolution.png | Bin 0 -> 185424 bytes
.../site/resources/images/carousel/scale.png | Bin 0 -> 236303 bytes
.../site/resources/images/carousel/stack.png | Bin 0 -> 408722 bytes
.../site/resources/images/carousel/timeline.png | Bin 0 -> 322888 bytes
.../site/resources/images/logos/community.png | Bin 0 -> 6237 bytes
.../site/resources/images/logos/contribute.png | Bin 0 -> 4902 bytes
.../site/resources/images/logos/understand.png | Bin 0 -> 5925 bytes
docs/src/site/resources/images/logos/use.png | Bin 0 -> 2789 bytes
.../resources/images/process-architecture.png | Bin 0 -> 72704 bytes
docs/src/site/resources/images/revolution.png | Bin 0 -> 185535 bytes
.../presentations/dtm-architecture.pdf | Bin 0 -> 225959 bytes
docs/src/site/site.xml | 234 +++++++++++++------
pom.xml | 32 ++-
23 files changed, 911 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
[3/6] incubator-trafodion git commit: Adding files that were not
included in first commit.
Posted by su...@apache.org.
Adding files that were not included in first commit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/48943d86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/48943d86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/48943d86
Branch: refs/heads/master
Commit: 48943d86eae6abf88824e2b59ed0175eab4e2110
Parents: daa4e72
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Tue Nov 17 20:22:24 2015 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Tue Nov 17 20:22:24 2015 -0700
----------------------------------------------------------------------
docs/src/site/markdown/architecture-overview.md | 154 +++++++++++++++++
docs/src/site/markdown/code-organization.md | 50 ++++++
docs/src/site/markdown/contribute.md | 50 ++++++
docs/src/site/markdown/index.md | 128 ++++++++++++++
docs/src/site/markdown/release-notes-1-3-0.md | 169 +++++++++++++++++++
docs/src/site/markdown/release-notes.md | 31 ++++
docs/src/site/markdown/website.md | 58 +++++++
.../resources/images/carousel/processes.png | Bin 0 -> 492019 bytes
.../resources/images/carousel/revolution.png | Bin 0 -> 185424 bytes
.../site/resources/images/carousel/scale.png | Bin 0 -> 236303 bytes
.../site/resources/images/carousel/stack.png | Bin 0 -> 408722 bytes
.../site/resources/images/carousel/timeline.png | Bin 0 -> 322888 bytes
.../site/resources/images/logos/community.png | Bin 0 -> 6237 bytes
.../site/resources/images/logos/contribute.png | Bin 0 -> 4902 bytes
.../site/resources/images/logos/understand.png | Bin 0 -> 5925 bytes
docs/src/site/resources/images/logos/use.png | Bin 0 -> 2789 bytes
.../resources/images/process-architecture.png | Bin 0 -> 72704 bytes
docs/src/site/resources/images/revolution.png | Bin 0 -> 185535 bytes
.../presentations/dtm-architecture.pdf | Bin 0 -> 225959 bytes
19 files changed, 640 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/markdown/architecture-overview.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/architecture-overview.md b/docs/src/site/markdown/architecture-overview.md
new file mode 100644
index 0000000..c4fb519
--- /dev/null
+++ b/docs/src/site/markdown/architecture-overview.md
@@ -0,0 +1,154 @@
+## Overview ##
+
+Trafodion provides an operational SQL engine on top of Hadoop -- a solution targeted toward operational workloads in the Hadoop Big Data environment. Included are:
+
+* Fully functional ANSI SQL language support
+* Full ACID support for read/write queries including distributed transaction protection for multiple rows, tables and statements
+* Heterogeneous storage engine access including native access to data stores
+* Enhanced High Availability support for client applications
+* Support for large data sets using optimized intra-query parallelism
+* Performance improvements for OLTP workloads via compile and runtime optimizations
+
+Transaction management features include:
+
+* Transaction serializability using the HBase-Trx implementation of Multi-Version Concurrency Control
+* Transaction recovery to achieve database consistency
+* Thread-aware transaction management support to work with multi-threaded SQL clients
+* Non-transactional/direct access to HBase tables
+
+## Process Architecture ##
+
+The following figure depicts the Trafodion process architecture:
+
+
+
+The figure above should be interpreted as follows:
+
+* Client Applications talk to Trafodion via a JDBC or ODBC interface. The Trafodion drivers implement these interfaces, using an optimized Trafodion-specific wire protocol to talk to the Master Executor process in the SQL layer. The diagram shows a JDBC Type-4 driver configuration.
+* The Master Executor is the root process for executing SQL statements submitted via JDBC or ODBC. It contains a copy of the SQL compiler code. Most SQL statements are compiled within this process. The root of any compiled query plan is also executed in the Master Executor.
+* A few SQL statements (for example, DDL and some utilities) require a second instance of the compiler code; this is the CMP process in the diagram.
+* Trafodion supports several forms of execution-time parallelism. When a query plan requires parallelism, a set of ESP (Executor Server Processes) is dynamically spawned (if not already available). Each ESP executes a fragment of the query plan.
+* The DTM (Distributed Transaction Management) process manages distributed transactions. This includes log management and transaction coordination.
+* The Storage Engine layer consists of HBase and Hadoop processes. Trafodion allows SQL access to native HBase tables. Trafodion reads HBase metadata in order to process these tables. Trafodion also offers its own implementation of SQL table, stored as an HBase table, for applications that need a more efficient OLTP representation. Trafodion generates its own metadata for such tables, and stores that in HBase.
+
+## Connectivity ##
+
+The Database Connectivity Services (DCS) framework enables applications developed for ODBC/JDBC APIs to access a Trafodion SQL database server. DCS is a distributed service. It uses the underlying HBase ZooKeeper instance for its definition of a cluster. [Apache ZooKeeper] (http://zookeeper.apache.org/ "Zookeeper website") is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All participating nodes and clients need to be able to access the running ZooKeeper.
+
+DCS is a collection of components:
+
+* **ODBC/JDBC Drivers**: Provide a standard programming language middle-ware API for accessing database management systems (DBMS).
+* **DCS Master Process**: The DCS Master server is responsible for monitoring all server instances in the cluster. It assigns an ODBC/JDBC client connection request to a Master Executor (MXOSRVR) process. It also has a backup process that takes over the Master Executor role during failures.
+* **DCS Server Process**: This process is responsible for starting and keeping a Master Executor (MXOSRVR) server process executing. There is one DCS Server process per node in the cluster.
+* **Master Executor Process**: This is the database server that provides database access to ODBC/JDBC clients. There is a one-to-one relationship between an ODBC/JDBC client connection and a database server process. The Master Executor performs all SQL queries on behalf of its client's requests. It will perform all required SQL calls to execute a SQL query through the Executor to access HBase tables. The Master Executor is often referred to as MXOSRVR.
+
+## Transaction Subsystem ##
+
+Trafodion supports distributed ACID transaction semantics using the Multi-Version Concurrency Control (MVCC) model. The transaction management is built on top of a fork of the *HBase-trx* project implementing the following changes:
+
+* Upgraded it to work on HBase version 0.98.1 (for CDH 5.1) or 0.98.0 (for HDP 2.1).
+* Added support for parallel worker processes doing work on behalf of the same transaction.
+* Added support for global transactions, that is, transactions that can encompass resources (regions/HTables) across an HBase cluster.
+* Added transaction recovery after server failure.
+
+There is on Distributed Transaction Manager (DTM) process per node in a cluster running Trafodion. The DTM process owns and keeps track of all transactions that were started on that node. (In HBase-trx, transactions were tracked in the library code of each client, which meant that after a server failure, there was no way to restart the transaction manager for in-doubt transactions.)
+
+When a Trafodion client begins a SQL statement, it checks in with the Transaction Manager (TM) to begin the transaction. The TM returns a cluster-unique transaction ID. This transaction ID in turn is propagated by the Trafodion Executor to any processes that work on some fragment of that SQL statement. This transaction ID propagation occurs courtesy of a Trafodion messaging layer, which keeps track, for example, of whether a process death has occurred.
+
+When a Trafodion Executor process issues an HBase call, the modified client-side HBase-trx library can deduce which TM owns the transaction from the transaction ID, and registers itself with that TM if it has not already done so. Thus, at any given moment in time, a TM is aware of what processes are participating in a transaction.
+
+The original HBase-trx library worked by extending certain Java classes in the region server. Our implementation has for the most part changed to execute this library in co-processors. This allows better extensibility at the HBase level. With a class extension approach, only one feature could extend the HBase code. With co-processors, it is possible to host several extensions. Endpoint and observer co-processors perform the resource manager role in transaction processing.
+
+For additional details, please refer to the [Trafodion Distributed Transaction Management] (presentations/dtm-architecture.pdf) presentation.
+
+## Compiler Architecture ##
+
+The Trafodion Compiler translates SQL statements into query plans that can then be executed by the Trafodion execution engine, commonly called the Executor.
+
+The Compiler is a multi-pass compiler. Each pass transforms a representation of the SQL statement into a new or augmented representation which is input to the next pass. The sections below give more detail on each pass. The logic that calls each pass is in the CmpMain class, method CmpMain::compile. You can find that logic in file $MY_SQROOT/sql/sqlcomp/CmpMain.cpp.
+
+A copy of the compiler code runs in the Master process, which avoids inter-process message passing between the Compiler and Executor. At the moment the compiler code is not re-entrant, but it is a serially reusable resource within the Master. Some processing is recursive. For example, the execution logic for DDL statements is packaged with the compiler code. When we execute a DDL statement, the Executor spawns a separate Compiler process to execute that logic. For another example, the UPDATE STATISTICS utility dynamically generates SQL SELECT statements to obtain statistical data. Since we are not re-entrant, we spawn a separate Compiler process for this recursive processing.
+
+The compiler is written in C++.
+
+### Parser ###
+
+The parser pass performs lexical and syntactic analysis, transforming the SQL statement into a parse tree. Trafodion uses a hand-coded scanner for lexical analysis of UCS2 strings. (UTF-8 encoding for SQL statement text is support but is translated to UCS2 internally).
+
+The parser grammar is implemented as a set of Bison rules. The output of the parser is a tree of objects of class RelExpr, representing relational operators. Scalar expressions are represented by trees of ItemExpr objects, which are contained in the nodes of the RelExpr tree. This common model to represent a query is used throughout the compilation process.
+
+### Binder ###
+
+The binder pass takes the parse tree and decorates it with metadata information. All references to SQL objects (tables, views, columns and so on) are bound to their respective metadata. The binder also performs type synthesis. At this stage, errors such as the wrong data type being passed to a function call or that a column reference doesn't belong to any of the tables in scope are detected.
+
+The binder also manages a cache of query plans. If the binder detects that the new SQL statement is similar to one previously compiled, it simply reuses the earlier query plan (modifying parameters as needed), bypassing subsequent compiler passes. This can be significant as optimization is often the most expensive compilation phase.
+
+### Normalizer ###
+
+The SQL language is rich in redundancy. Many concepts can be expressed in multiple ways. For example, sub-queries can be expressed as joins. The DISTINCT clause can be transformed into GROUP BY. The normalizer pass removes this redundancy, transforming the parse tree into a normalized representation in the following steps.
+
+* **Predicate Pull-Up**: Predicates are pulled up the tree as high as is semantically possible. Then equivalence classes (Value Equivalence Groups or VEGs) are created for columns and values that are subject to equality predicates. References to such columns and values are then replaced with a reference to the equivalence class (VEG). Similarly equality predicates themselves are replaced with a predicate that simply points to the equivalence class. Predicate pull-up is how we achieve transitive closure.
+* **Normalization**: Predicates are pushed back down again, performing some optimizations. For example, if we have the query, select * from t1 join t2 on t1.a = t2.b where t1.a = 5, we can infer the predicate t2.b = 5 and push that down into the t2 scan operator.
+* **Semantic Query Optimization**: We perform unconditional transformations that depend on uniqueness or cardinality constraints.
+
+### Optimizer ###
+The Trafodion optimizer is a rule-based, cost-driven optimizer based on the Cascades Framework. By "rule-based", we mean that plan transformation is based on a set of rules coded within the Optimizer. (We don't mean syntax-driven optimization based on hints in the SQL statement text.) By "cost-driven", we mean that cost estimates are used to bound the search space.
+
+It is a top-down optimizer; that is, it generates an initial feasible plan for the query, then using rules, transforms that plan into semantically equivalent alternatives. The optimizer computes the cost of each plan, and uses these costs to bound its search for additional plans using a branch-and-bound algorithm. This is in contrast to classical, dynamic programming-style optimizers, that build up a set of plans "bottom-up", by first considering all one-table plans, then joins of two tables, then joins of three tables and so on.
+
+The optimizer itself is multiple passes, some of which can be bypassed depending on the optimization level chosen for the compile. The first pass simply generates the initial feasible plan. Subsequent passes apply successively richer sets of rules to traverse the search space. For example, we first consider only hash joins, and in later passes introduce the possibility of nested or merge joins.
+
+The optimizer makes a distinction between logical and physical expressions. A logical expression considers the semantics of an operator, for example, a join. Certain aspects of a plan pertain to logical expressions, for example estimated output row count. A physical expression considers the implementation of an operator, for example, a nested join. Certain aspects of a plan pertain to physical expressions, for example estimated message counts. Rules transform logical expressions into other logical expressions or into physical expressions. So, for example, join order would be permuted at the logical expression level, then join method considered as we implement the operator with a physical expression.
+
+Search spaces in general are exponential in size. So the optimizer is rich in heuristics to limit where it searches. The optimizer also takes into account variation: Estimations of cost for individual relational operators will be imperfect; the optimizer tries to pick plans that degrade gracefully if estimates are off the mark.
+
+Another factor the optimizer takes into account is that traversal can wrap back to a previously visited plan. The optimizer remembers plans previously visited in a "memo" structure (class CascadesMemo). Plans are hashed for quick lookup.
+
+### Pre-Code Generator ###
+
+The pre-code generator performs unconditional transformations after the optimization phase. References to elements of an equivalence class are replaced with the most efficient alternatives.
+
+For example, an equivalence class (VEG) containing { T1.A, T2.B, 5 }, in the context of a T2 scan operator results in the predicate T2.B = 5.
+
+### Generator ###
+
+The generator pass transforms the chosen optimized tree into a query plan which can then be executed by the Executor. Low-level optimizations of scalar expressions take place here. Many scalar expressions are generated in native machine code using the open source LLVM infrastructure. For those scalar operators where we have not yet implemented native expression support, we instead generate code that is interpreted at run time.
+
+### Heap Management ###
+
+In order to make heap management efficient, the Compiler uses heap classes, NAHeap, that it shares with the executor. One heap, the Statement heap, is used for objects that are particular to a given SQL statement's compilation, for example, parse tree nodes. At the end of statement compilation, we simply destroy the heap instead of calling "delete" on each of possibly thousands of objects. Another heap, the Context heap, is used for objects that may be reused across SQL statements. For example, metadata is cached within the compiler. As one can imagine, considerable care goes into selecting which heap to use when creating a given object, to avoid dangling references and other resource leaks. For example, access to a given file must be encapsulated in an object on the global heap, since on the statement heap we cannot count on execution of the destructor to close the file.
+
+### Error Management ###
+
+The Compiler captures error information into a ComDiagsArea object. The style of programming is to return on errors rather than throw exceptions. Calling logic then checks for the presence of errors before continuing. So, for example, the main logic that invokes each compiler pass checks for errors before proceeding to the next pass.
+
+## Executor Architecture ##
+
+The Trafodion Executor implements a data-flow architecture. That is, each relational operator is implemented as a set of tasks which are scheduled for execution. Operators communicate with each other using queues.
+
+### Relational Operators ###
+
+A query plan consists of a collection of fragments, each fragment being a portion of the query plan executed in a given process. Each fragment in turn is a tree of relational operators. A relational operator may in turn be decorated with additional scalar expressions. Relational operators in the query plan are represented by two class hierarchies, ex_tdb and ex_tcb. The ex_tdb (tdb = "task descriptor block") hierarchy contains the compiler-generated state for the operator. The ex_tcb (tcb = "task control block") hierarchy contains the run-time state for the operator. So, for example, the queue objects are pointed to by ex_tcb objects.
+
+### Scalar Expressions ###
+
+Scalar expressions are evaluated by an expression evaluator. If the expression could be compiled into native machine code, the expression evaluator simply invokes this code. Otherwise, the expression evaluator implements an interpreter. For historical reasons, there are actually two interpreters. The first (and oldest) is a high level clause-based expression evaluator: each clause roughly corresponds to a scalar operator in the original SQL text. The second (and newest) is a PCODE-based evaluator, implementing a lower-level machine-like instruction set. Most expressions that cannot be generated as native machine code are generated as PCODE; those few expressions that PCODE cannot cover are generated as clause expressions. For debugging purposes, it is possible to force the Compiler to generate PCODE instead of native machine code, or clause-based expressions instead of either native machine code or PCODE.
+
+### Interprocess Communication ###
+
+An IPC layer, shared with other components like the compiler, abstracts the (asynchronous) communication of objects across process boundaries. The sorts of things that flow are query plan objects, data rows, and error objects (ComDiagsArea).
+
+### Call Level Interface ###
+
+At the highest level of the Executor is the Call Level Interface (CLI) layer. This layer implements an ODBC-like interface to the Executor. Connectivity code communicates to the Executor using this interface. The CLI layer keeps track of such abstractions as SQL statements and cursors. It also provides an interface to retrieve SQL diagnostics.
+
+### Heap Management ###
+
+The Executor also uses the NAHeap classes for heap management. Again, there are statement heaps for objects local to a given SQL statement, and a global heap for objects that exist across statements.
+
+### Error Management ###
+The Executor too uses the ComDiagsArea classes for error management. Like the Compiler, the programming style relies on returns rather than exceptions; calling code is expected to check for the existence of errors and respond appropriately.
+
+### Statistics Reporting ###
+
+The Executor also collects statistics concerning the execution of a particular query. These statistics are available at the CLI interface at the conclusion of statement execution.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/markdown/code-organization.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/code-organization.md b/docs/src/site/markdown/code-organization.md
new file mode 100644
index 0000000..f8e3119
--- /dev/null
+++ b/docs/src/site/markdown/code-organization.md
@@ -0,0 +1,50 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+# Code Organization
+The Trafodion source repository is organized as follows:
+
+## Connectivity ##
+<span>
+ <table>
+ <tr>
+ <th>Directory</th>
+ <th>Contains</th>
+ </tr>
+ <tr>
+ <td><code>core/conn/jdbc_type2</code></td>
+ <td>JDBC type-4 client-side driver</td>
+ </tr>
+ <tr>
+ <td><code>jdbc_type4</code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>odb</code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>odbc</code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>security_dll</code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>unixodbc</code></td>
+ <td></td>
+ </tr>
+ </table>
+</span>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/markdown/contribute.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/contribute.md b/docs/src/site/markdown/contribute.md
new file mode 100644
index 0000000..de06f7b
--- /dev/null
+++ b/docs/src/site/markdown/contribute.md
@@ -0,0 +1,50 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the
+ License.
+-->
+
+# Contributing
+
+## Introduction
+
+**This projects exists because of the actions of its contributors!**
+
+First of all, a big **Thank You** from us for evaluating and/or using our products. We truly appreciate it! Our products exist, and continues to improve thanks to you. But you can help us and yourself more!
+
+As we are a community of volunteers working with the guidelines and policies of the Apache Software Foundation (the Apache Way) in mind, we welcome any kind of input you can provide to get better products. These contributions, whether you think of reporting bugs, supplying code enhancements, improvements to our documentation, answering questions in our mailing lists or anywhere else are valuable to us. Because these will help us in helping you.
+
+So, you consider contributing to our project. But how do you go about achieving this?
+
+Well, it is as easy as pie. The first thing you need to do is to subscribe to one of our [mailing lists](mail-lists.html) and you are set to go to deliver your first contribution: a posting there, about how great our products (code, documentation) are, what you found missing, or even the bug you're confronted with.
+
+After you have had your first contribution over and done with, it stays easy. You can:
+
+* Reply to questions, and/or share your viewpoint on how to get issues resolved.
+* Add to our [FAQ](faq.html), [Web Site](website.html), or [Wiki](wiki.html).
+* Share your code and document patches through our [issue tracking system](issue-tracking.html) (Jira).
+* Evaluate bugs and proposed improvements provided by others in our team.
+* Help with outlining and evaluating the future direction of our project and the development iterations of our products.
+
+To make it a bit more explicit, we are looking for:
+
+* Source code (bugs and improvements) contributions
+* Documentation assistance
+* Product and feature suggestions
+* Detailed and constructive feedback
+* Articles (case studies, white papers, etc) and presentations (speeches) about how our products helps or helped you.
+
+But the list is not limited to the above! If you feel we missed something there, please let us know (via our [mailing lists](mail-lists.html)).
+
+## Recognized Contributors
+
+For an overview of contributors who have gone the extra mile and registered their iCLA, look [here](team-list.html). If you want to go the extra mile, have a look at our [on-boarding page](onboarding.html).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
new file mode 100644
index 0000000..3af3200
--- /dev/null
+++ b/docs/src/site/markdown/index.md
@@ -0,0 +1,128 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+#### [Next Hadoop Wave][revolution]
+
+[][revolution]
+
+Trafodion brings enterprise-clas operational workloads to Hadoop! You can now run all of your data workloads on a single platform based on Hadoop.
+
+
+#### [Hadoop-Scale with SQL Access][scale]
+
+[][scale]
+
+Running out of room with your current SQL solution? Starting a new operational application? Trafodion allows you to work in SQL at Hadoop-scale levels.
+
+
+#### [Fully Integrated with HBase and Hive][stack]
+
+[][stack]
+
+Trafodion provides SQL access to structured, semi-structured, and unstructured data allowing you to run operational, historical, and analytical workloads on a single platform.
+
+
+[revolution]: http://trafodion.apache.org
+[scale]: http://trafodion.apache.org
+[stack]: index.html
+
+
+---
+
+Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Hadoop.
+
+The name "Trafodion" (the Welsh word for transactions, pronounced "Tra-vod-eee-on") was chosen specifically to emphasize the differentiation that Trafodion provides in closing a critical gap in the Hadoop ecosystem.
+
+Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Trafodion extends Hadoop to provide guaranteed transactional integrity, enabling new kinds of big data applications to run on Hadoop.
+
+---
+
+## Key Features
+
+* Full-functioned ANSI SQL language support
+* JDBC/ODBC connectivity for Linux/Windows clients
+* Distributed ACID transaction protection across multiple statements, tables and rows
+* Performance improvements for OLTP workloads with compile-time and run-time optimizations
+* Support for large data sets using a parallel-aware query optimizer
+
+
+## Key Benefits
+
+* Reuse existing SQL skills and improve developer productivity
+* Distributed ACID transactions guarantee data consistency across multiple rows and tables
+* Interoperability with existing tools and applications
+* Hadoop and Linux distribution neutral
+* Easy to add to your existing Hadoop infrastructure
+
+
+---
+
+<span >
+<!-- table class="hidetable" -->
+<table>
+<tr>
+<td width="25%" valign="top">
+<center>
+<h2>Understand</h2>
+<img src="images/logos/understand.png" width="108" height="108"/>
+</center>
+<h4>What makes Trafodion unique</h4>
+<ul>
+<li><a href="architecture-overview.html">Architecture</a></li>
+<li>Documentation</li>
+<li>Videos</li>
+<li>Frequently asked questions</li>
+</ul>
+</td>
+<td width="25%" valign="top">
+<center>
+<h2>Use</h2>
+<img src="images/logos/use.png" width="108" height="108"/>
+</center>
+<h4>Download and Try Trafodion</h4>
+<ul>
+<li><a href="index.html">Features</a> and roadmap</li>
+<li>Release Notes</li>
+<li>Download and install</li>
+<li>Quick Start</li>
+</ul>
+</td>
+<td width="25%" valign="top">
+<center>
+<h2>Contribute</h2>
+<img src="images/logos/contribute.png" width="108" height="108"/>
+</center>
+<h4>Help enhance Trafodion</h4>
+<ul>
+<li>Development environment</li>
+<li>Software architecture.</li>
+<li>Contribution workflow</li>
+<li>Participation</li>
+</ul>
+</td>
+<td width="25%" valign="top">
+<center>
+<h2>Community</h2>
+<img src="images/logos/community.png" width="108" height="108"/>
+</center>
+<h4>Be part of Trafodion</h4>
+<ul>
+<li>Join project team</li>
+<li>Community communication</li>
+<li>Conferences and meetups</li>
+<li>Events Calendar</li>
+</ul>
+</td>
+</tr>
+</table>
+</span>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/markdown/release-notes-1-3-0.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-3-0.md b/docs/src/site/markdown/release-notes-1-3-0.md
new file mode 100644
index 0000000..aa56817
--- /dev/null
+++ b/docs/src/site/markdown/release-notes-1-3-0.md
@@ -0,0 +1,169 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+# Release 1.3.0
+There are various ways to download and use this software see the Using the Software page for options.
+
+This is the first release of the Apache Trafodion (incubating) project. In addition to including a number of new features and improvements across the project, the focus of this release is to comply with Apache release guidelines.
+
+Build instructions are available [here](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61316378).
+
+## Supported Platforms
+The following platforms are supported in this release.
+
+<span>
+ <table>
+ <tr>
+ <td>**Operating Systems**</td>
+ <td>CentOS 6.5 -- 6.7</td>
+ </tr>
+ <tr>
+ <td>**Hadoop Distributions**</td>
+ <td>Cloudera distributions CDH 5.3.x<br />Hortonworks distribution HDP 2.2</td>
+ </tr>
+ <tr>
+ <td>**Java Version**</td>
+ <td>JDK 1.7.0_67 or newer</td>
+ </tr>
+ </table>
+</span>
+
+## New Features
+
+This release contains the following new features.
+
+<span>
+ <table>
+ <tr>
+ <th>Category</th>
+ <th>Feature</th>
+ <th>Defect ID</th>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Support native HBase tables as EXTERNAL tables.</td>
+ <td>(TRAFODION-1483)</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Support pre-splitting of unsalted tables.</td>
+ <td>(TRAFODION-50)</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Support for IDENTITY columns.</td>
+ <td>(TRAFODION-62)</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Support HBase region splitting and re-balancing with active transactions.</td>
+ <td>(TRAFODION-34)</td>
+ </tr>
+ <tr>
+ <td>Installer</td>
+ <td>Support for Batch feature in Installer.</td>
+ <td>(TRAFODION-1543)</td>
+ </tr>
+ <tr>
+ <td>Installer</td>
+ <td>Support for Cloudera parcels feature in Installer.</td>
+ <td>(TRAFODION-1452)</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Support for Multi-Temperate data – Part 1.</td>
+ <td>(TRAFODION-49)</td>
+ </tr>
+ <tr>
+ <td>UDF</td>
+ <td>Compile time interface for Table Mapping UDFs (TMUDF).</td>
+ <td>(TRAFODION-51)</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Support for multiple column families in a Trafodion table.</td>
+ <td>(TRAFODION-1419)</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Support for MODIFY COLUMN attribute for ALTER TABLE.</td>
+ <td>(TRAFODION-18)</td>
+ </tr>
+ </table>
+</span>
+
+## Improvements
+This release contains the following improvements.
+
+<span>
+ <table>
+ <tr>
+ <th>Category</th>
+ <th>Feature</th>
+ <th>Defect ID</th>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Enable HBase serialization feature.</td>
+ <td>TRAFODION-1462</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Enable EXPLAIN_IN_RMS feature by default.</td>
+ <td>TRAFODION-1460</td>
+ </tr>
+ <tr>
+ <td>Performance</td>
+ <td>Reduce the path length for IUD operations in Trafodion.</td>
+ <td>TRAFODION-1444</td>
+ </tr>
+ <tr>
+ <td>SQL</td>
+ <td>Enable Compressed Internal Format (CIF) for Trafodion scan operator.</td>
+ <td>TRAFODION-1424</td>
+ </tr>
+ <tr>
+ <td>Build</td>
+ <td>Maven components to use locally built JDBC jar file.</td>
+ <td>TRAFODION-1437</td>
+ </tr>
+ <tr>
+ <td>Build</td>
+ <td>Numerous build improvements.</td>
+ <td></td>
+ </tr>
+ </table>
+</span>
+
+## Fixes
+
+This release contains fixes for 114 bugs.
+
+## Known Issues
+
+### HBase Lease Timeout Patch
+
+HBase uses a lease mechanism to protect against memory leaks in Region Servers caused by potential client instabilities that would open scanners, but die before having the opportunity to close cleanly and release resources. This mechanism relies on a server side timer, configured by the 'hbase.client.scanner.timeout.period' parameter in 'hbase-site.xml'. If a client fails to call 'next()' within the timeout period, the server will assume the client died, and will force close the server side scanner and release resources. However, in Trafodion, there are legitimate use cases where client is busy doing heavy processing, and needs more time than specified in the default scanner timeout value. Increasing the 'hbase.client.scanner.timeout.period' value has the side effect of weakening the safety mechanism previously described.
+
+The HBase community agrees that the correct behavior of this safety feature should be to have the client *reset* the scanner and resume where it left off instead of giving up and throwing an exception. The change will be implemented in a future release of HBase. In the meantime, this release includes a mechanism to invoke the correct behavior via a custom setting. You can enable the behavior by adding this parameter in 'hbase-site.xml'.
+
+ <property>
+ <name>hbase.trafodion.patchclientscanner.enabled</name>
+ <value>true</value>
+ <description>
+ Enable a Trafodion feature to allow a client to reset the HBase scanner and resume where it left off instead of throwing an exception upon expiry of the HBase hbase.client.scanner.timeout.period timer.
+ </description>
+ </property>
+
+The default value of the parameter is **false**.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/markdown/release-notes.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes.md b/docs/src/site/markdown/release-notes.md
new file mode 100644
index 0000000..19f46e8
--- /dev/null
+++ b/docs/src/site/markdown/release-notes.md
@@ -0,0 +1,31 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+# Release Notes
+The following releases have been created for Trafodion.
+
+<span>
+ <table>
+ <tr>
+ <th>Release</th>
+ <th>Description</th>
+ <th>Date</th>
+ </tr>
+ <tr>
+ <td><a href="release-notes-1-3-0.html"><strong>1.3.0</strong></a></td>
+ <td>First Apache Release.</td>
+ <td>November 16, 2015</td>
+ </tr>
+ </table>
+</span>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/markdown/website.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/website.md b/docs/src/site/markdown/website.md
new file mode 100644
index 0000000..5fa6065
--- /dev/null
+++ b/docs/src/site/markdown/website.md
@@ -0,0 +1,58 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the
+ License.
+-->
+# Modify Web Site
+
+## Technology
+
+The Trafodion website uses the following technologies:
+
+* **Framework**: [Apache Maven Site](https://maven.apache.org)
+* **Skin**: [Reflow Maven Skin](http://andriusvelykis.github.io/reflow-maven-skin/)
+* **Theme**: [Bootswatch Cerulean](http://bootswatch.com/cerulean)
+* **Markup**: [markdown](https://daringfireball.net/projects/markdown/syntax)
+
+<a href="#" class="btn btn-primary btn-xs">Note</a> **<code>markdown</code>** was chosen since it supports inline HTML, which provides better table control than APT. Asciidoc does not work well with the Reflow Maven Skin — we tested.
+
+## Code Organization
+
+The code is located in the **<code>docs</code>** directory. The code organization follows the [Maven standard](https://maven.apache.org/guides/mini/guide-site.html).
+
+**<code>docs/src/site.xml</code>** is configured per the [Reflow Maven Skin documentation](http://andriusvelykis.github.io/reflow-maven-skin/skin/). Pages and menus are defined and configured in this file. By default, all pages use an automated table of contents; override as needed.
+
+**<code>docs/src/site/markdown</code>** contains the files that generate the different HTML files.
+
+**<code>docs/target</code>** contains the generated HTML files after you run a build.
+
+## Page Management
+
+You add/rename/delete pages in **<code>docs/src/site/markdown</code>**. You make corresponding changes in **<code>docs/src/site.xml</code>** adding/renaming/deleting pages from menus and defining page configuration; for example: removal of the table of contents bar and the special page formatting provided by the Reflow skin. Refer to the [Maven Documentation](http://maven.apache.org/plugins/maven-site-plugin/examples/sitedescriptor.html) for more information.
+
+## Developing Pages
+
+When possible, ensure that you write in active voice and to the point.
+
+Special functions such as buttons etc. can be access by clicking **Preview** in the theme preview. There's a \<\> feature on each function, which allows you to copy the special **<code>\<div\></code>** you need to insert the selected object.
+
+## Development and Build
+
+Typically, you'll use Eclipse to develop and build the website pages. The configuration goal is: **<code>clean site</code>**. The **<code>pom.xml</code>** file in the top-level directory drives the build steps for the web site.
+
+## Testing
+
+The website files are located in **<code>docs/target</code>**. Open **<code>index.html</code>** from your browser and test your changes.
+
+## Updating External Website
+
+To be written.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/carousel/processes.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/processes.png b/docs/src/site/resources/images/carousel/processes.png
new file mode 100644
index 0000000..3a183c8
Binary files /dev/null and b/docs/src/site/resources/images/carousel/processes.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/carousel/revolution.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/revolution.png b/docs/src/site/resources/images/carousel/revolution.png
new file mode 100644
index 0000000..51d60cf
Binary files /dev/null and b/docs/src/site/resources/images/carousel/revolution.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/carousel/scale.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/scale.png b/docs/src/site/resources/images/carousel/scale.png
new file mode 100644
index 0000000..8702614
Binary files /dev/null and b/docs/src/site/resources/images/carousel/scale.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/carousel/stack.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/stack.png b/docs/src/site/resources/images/carousel/stack.png
new file mode 100644
index 0000000..553686a
Binary files /dev/null and b/docs/src/site/resources/images/carousel/stack.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/carousel/timeline.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/timeline.png b/docs/src/site/resources/images/carousel/timeline.png
new file mode 100644
index 0000000..c0aedf7
Binary files /dev/null and b/docs/src/site/resources/images/carousel/timeline.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/logos/community.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/community.png b/docs/src/site/resources/images/logos/community.png
new file mode 100644
index 0000000..d42f051
Binary files /dev/null and b/docs/src/site/resources/images/logos/community.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/logos/contribute.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/contribute.png b/docs/src/site/resources/images/logos/contribute.png
new file mode 100644
index 0000000..7ba6a39
Binary files /dev/null and b/docs/src/site/resources/images/logos/contribute.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/logos/understand.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/understand.png b/docs/src/site/resources/images/logos/understand.png
new file mode 100644
index 0000000..11f382d
Binary files /dev/null and b/docs/src/site/resources/images/logos/understand.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/logos/use.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/use.png b/docs/src/site/resources/images/logos/use.png
new file mode 100644
index 0000000..04b2b53
Binary files /dev/null and b/docs/src/site/resources/images/logos/use.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/process-architecture.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/process-architecture.png b/docs/src/site/resources/images/process-architecture.png
new file mode 100644
index 0000000..9fe2bbb
Binary files /dev/null and b/docs/src/site/resources/images/process-architecture.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/images/revolution.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/revolution.png b/docs/src/site/resources/images/revolution.png
new file mode 100644
index 0000000..445dd4f
Binary files /dev/null and b/docs/src/site/resources/images/revolution.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48943d86/docs/src/site/resources/presentations/dtm-architecture.pdf
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/presentations/dtm-architecture.pdf b/docs/src/site/resources/presentations/dtm-architecture.pdf
new file mode 100644
index 0000000..addf7a4
Binary files /dev/null and b/docs/src/site/resources/presentations/dtm-architecture.pdf differ
[4/6] incubator-trafodion git commit: Merge branch 'master' of
git://git.apache.org/incubator-trafodion into TRAFODION-1507
Posted by su...@apache.org.
Merge branch 'master' of git://git.apache.org/incubator-trafodion into TRAFODION-1507
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c2493f1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c2493f1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c2493f1b
Branch: refs/heads/master
Commit: c2493f1b01c559f7211ae349299eda288c2d291e
Parents: 48943d8 e54c732
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Tue Nov 17 20:22:32 2015 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Tue Nov 17 20:22:32 2015 -0700
----------------------------------------------------------------------
core/rest/pom.xml | 7 +++---
core/sqf/sql/scripts/install_traf_components | 2 +-
core/sqf/sql/scripts/sqgen | 4 ++--
core/sql/generator/GenPreCode.cpp | 15 ++++++++-----
dcs/pom.xml | 9 ++++----
dcs/src/test/jdbc_test/jdbc_test.py | 23 ++++++++++++++++----
.../java/org/trafodion/jdbc_test/TestCat.java | 9 +++++---
.../java/org/trafodion/jdbc_test/Utils.java | 6 +++++
8 files changed, 51 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[2/6] incubator-trafodion git commit: This is the first checkin for
the web site update. The Maven skin has been changed with corresponding
changes in the pom.xml and site.xml files. The rest is new content,
which is now written in the markdown language.
Posted by su...@apache.org.
This is the first checkin for the web site update. The Maven skin has been
changed with corresponding changes in the pom.xml and site.xml files. The
rest is new content, which is now written in the markdown language.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/daa4e724
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/daa4e724
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/daa4e724
Branch: refs/heads/master
Commit: daa4e7245254f366533a764288bf6612e97c8bf2
Parents: 81594ff
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Tue Nov 17 15:26:31 2015 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Tue Nov 17 15:26:31 2015 -0700
----------------------------------------------------------------------
pom.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/daa4e724/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 53cf8e3..17e072e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -409,6 +409,22 @@
</configuration>
<executions>
<execution>
+ <id>output-html</id>
+ <phase>site</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <attributes>
+ <imagesdir>./images</imagesdir>
+ <icons>font</icons>
+ <stylesheet>trafodion.css</stylesheet>
+ <last-update-label>false</last-update-label>
+ </attributes>
+ <backend>html5</backend>
+ </configuration>
+ </execution>
+ <execution>
<id>output-pdf</id>
<phase>site</phase>
<goals>
[5/6] incubator-trafodion git commit: [TRAFODION-1507] Incorporated
review changes.
Posted by su...@apache.org.
[TRAFODION-1507] Incorporated review changes.
jenkings, skip test
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/aeef01ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/aeef01ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/aeef01ec
Branch: refs/heads/master
Commit: aeef01ecfbb955024ac2b7e6c4ca89cc9e672cfc
Parents: c2493f1
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Wed Nov 18 19:46:32 2015 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Wed Nov 18 19:46:32 2015 -0700
----------------------------------------------------------------------
docs/src/site/markdown/architecture-overview.md | 58 ++++++++++++--------
docs/src/site/markdown/contribute.md | 44 ++++++++++-----
docs/src/site/markdown/index.md | 12 ++--
docs/src/site/markdown/release-notes-1-3-0.md | 16 ++----
docs/src/site/markdown/website.md | 20 ++++---
docs/src/site/resources/css/site.css | 36 +++++++++++-
docs/src/site/site.xml | 57 +++++++++++++++----
7 files changed, 173 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aeef01ec/docs/src/site/markdown/architecture-overview.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/architecture-overview.md b/docs/src/site/markdown/architecture-overview.md
index c4fb519..658e91a 100644
--- a/docs/src/site/markdown/architecture-overview.md
+++ b/docs/src/site/markdown/architecture-overview.md
@@ -1,4 +1,16 @@
-## Overview ##
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
Trafodion provides an operational SQL engine on top of Hadoop -- a solution targeted toward operational workloads in the Hadoop Big Data environment. Included are:
@@ -16,7 +28,7 @@ Transaction management features include:
* Thread-aware transaction management support to work with multi-threaded SQL clients
* Non-transactional/direct access to HBase tables
-## Process Architecture ##
+# Process Architecture
The following figure depicts the Trafodion process architecture:
@@ -31,7 +43,7 @@ The figure above should be interpreted as follows:
* The DTM (Distributed Transaction Management) process manages distributed transactions. This includes log management and transaction coordination.
* The Storage Engine layer consists of HBase and Hadoop processes. Trafodion allows SQL access to native HBase tables. Trafodion reads HBase metadata in order to process these tables. Trafodion also offers its own implementation of SQL table, stored as an HBase table, for applications that need a more efficient OLTP representation. Trafodion generates its own metadata for such tables, and stores that in HBase.
-## Connectivity ##
+# Connectivity
The Database Connectivity Services (DCS) framework enables applications developed for ODBC/JDBC APIs to access a Trafodion SQL database server. DCS is a distributed service. It uses the underlying HBase ZooKeeper instance for its definition of a cluster. [Apache ZooKeeper] (http://zookeeper.apache.org/ "Zookeeper website") is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All participating nodes and clients need to be able to access the running ZooKeeper.
@@ -42,7 +54,7 @@ DCS is a collection of components:
* **DCS Server Process**: This process is responsible for starting and keeping a Master Executor (MXOSRVR) server process executing. There is one DCS Server process per node in the cluster.
* **Master Executor Process**: This is the database server that provides database access to ODBC/JDBC clients. There is a one-to-one relationship between an ODBC/JDBC client connection and a database server process. The Master Executor performs all SQL queries on behalf of its client's requests. It will perform all required SQL calls to execute a SQL query through the Executor to access HBase tables. The Master Executor is often referred to as MXOSRVR.
-## Transaction Subsystem ##
+# Transactions
Trafodion supports distributed ACID transaction semantics using the Multi-Version Concurrency Control (MVCC) model. The transaction management is built on top of a fork of the *HBase-trx* project implementing the following changes:
@@ -61,7 +73,7 @@ The original HBase-trx library worked by extending certain Java classes in the r
For additional details, please refer to the [Trafodion Distributed Transaction Management] (presentations/dtm-architecture.pdf) presentation.
-## Compiler Architecture ##
+# Compiler Architecture
The Trafodion Compiler translates SQL statements into query plans that can then be executed by the Trafodion execution engine, commonly called the Executor.
@@ -71,19 +83,19 @@ A copy of the compiler code runs in the Master process, which avoids inter-proce
The compiler is written in C++.
-### Parser ###
+## Parser
-The parser pass performs lexical and syntactic analysis, transforming the SQL statement into a parse tree. Trafodion uses a hand-coded scanner for lexical analysis of UCS2 strings. (UTF-8 encoding for SQL statement text is support but is translated to UCS2 internally).
+The parser pass performs lexical and syntactic analysis, transforming the SQL statement into a parse tree. Trafodion uses a hand-coded scanner for lexical analysis of UCS2 strings. (UTF-8 encoding for SQL statement text is supported but is translated to UCS2 internally).
The parser grammar is implemented as a set of Bison rules. The output of the parser is a tree of objects of class RelExpr, representing relational operators. Scalar expressions are represented by trees of ItemExpr objects, which are contained in the nodes of the RelExpr tree. This common model to represent a query is used throughout the compilation process.
-### Binder ###
+## Binder
The binder pass takes the parse tree and decorates it with metadata information. All references to SQL objects (tables, views, columns and so on) are bound to their respective metadata. The binder also performs type synthesis. At this stage, errors such as the wrong data type being passed to a function call or that a column reference doesn't belong to any of the tables in scope are detected.
The binder also manages a cache of query plans. If the binder detects that the new SQL statement is similar to one previously compiled, it simply reuses the earlier query plan (modifying parameters as needed), bypassing subsequent compiler passes. This can be significant as optimization is often the most expensive compilation phase.
-### Normalizer ###
+## Normalizer
The SQL language is rich in redundancy. Many concepts can be expressed in multiple ways. For example, sub-queries can be expressed as joins. The DISTINCT clause can be transformed into GROUP BY. The normalizer pass removes this redundancy, transforming the parse tree into a normalized representation in the following steps.
@@ -91,7 +103,7 @@ The SQL language is rich in redundancy. Many concepts can be expressed in multip
* **Normalization**: Predicates are pushed back down again, performing some optimizations. For example, if we have the query, select * from t1 join t2 on t1.a = t2.b where t1.a = 5, we can infer the predicate t2.b = 5 and push that down into the t2 scan operator.
* **Semantic Query Optimization**: We perform unconditional transformations that depend on uniqueness or cardinality constraints.
-### Optimizer ###
+## Optimizer
The Trafodion optimizer is a rule-based, cost-driven optimizer based on the Cascades Framework. By "rule-based", we mean that plan transformation is based on a set of rules coded within the Optimizer. (We don't mean syntax-driven optimization based on hints in the SQL statement text.) By "cost-driven", we mean that cost estimates are used to bound the search space.
It is a top-down optimizer; that is, it generates an initial feasible plan for the query, then using rules, transforms that plan into semantically equivalent alternatives. The optimizer computes the cost of each plan, and uses these costs to bound its search for additional plans using a branch-and-bound algorithm. This is in contrast to classical, dynamic programming-style optimizers, that build up a set of plans "bottom-up", by first considering all one-table plans, then joins of two tables, then joins of three tables and so on.
@@ -104,51 +116,51 @@ Search spaces in general are exponential in size. So the optimizer is rich in he
Another factor the optimizer takes into account is that traversal can wrap back to a previously visited plan. The optimizer remembers plans previously visited in a "memo" structure (class CascadesMemo). Plans are hashed for quick lookup.
-### Pre-Code Generator ###
+## Pre-Code Generator
The pre-code generator performs unconditional transformations after the optimization phase. References to elements of an equivalence class are replaced with the most efficient alternatives.
For example, an equivalence class (VEG) containing { T1.A, T2.B, 5 }, in the context of a T2 scan operator results in the predicate T2.B = 5.
-### Generator ###
+## Generator
The generator pass transforms the chosen optimized tree into a query plan which can then be executed by the Executor. Low-level optimizations of scalar expressions take place here. Many scalar expressions are generated in native machine code using the open source LLVM infrastructure. For those scalar operators where we have not yet implemented native expression support, we instead generate code that is interpreted at run time.
-### Heap Management ###
+## Heap Management
In order to make heap management efficient, the Compiler uses heap classes, NAHeap, that it shares with the executor. One heap, the Statement heap, is used for objects that are particular to a given SQL statement's compilation, for example, parse tree nodes. At the end of statement compilation, we simply destroy the heap instead of calling "delete" on each of possibly thousands of objects. Another heap, the Context heap, is used for objects that may be reused across SQL statements. For example, metadata is cached within the compiler. As one can imagine, considerable care goes into selecting which heap to use when creating a given object, to avoid dangling references and other resource leaks. For example, access to a given file must be encapsulated in an object on the global heap, since on the statement heap we cannot count on execution of the destructor to close the file.
-### Error Management ###
+## Error Management
The Compiler captures error information into a ComDiagsArea object. The style of programming is to return on errors rather than throw exceptions. Calling logic then checks for the presence of errors before continuing. So, for example, the main logic that invokes each compiler pass checks for errors before proceeding to the next pass.
-## Executor Architecture ##
+# Executor Architecture
The Trafodion Executor implements a data-flow architecture. That is, each relational operator is implemented as a set of tasks which are scheduled for execution. Operators communicate with each other using queues.
-### Relational Operators ###
+## Relational Operators
A query plan consists of a collection of fragments, each fragment being a portion of the query plan executed in a given process. Each fragment in turn is a tree of relational operators. A relational operator may in turn be decorated with additional scalar expressions. Relational operators in the query plan are represented by two class hierarchies, ex_tdb and ex_tcb. The ex_tdb (tdb = "task descriptor block") hierarchy contains the compiler-generated state for the operator. The ex_tcb (tcb = "task control block") hierarchy contains the run-time state for the operator. So, for example, the queue objects are pointed to by ex_tcb objects.
-### Scalar Expressions ###
+## Scalar Expressions
Scalar expressions are evaluated by an expression evaluator. If the expression could be compiled into native machine code, the expression evaluator simply invokes this code. Otherwise, the expression evaluator implements an interpreter. For historical reasons, there are actually two interpreters. The first (and oldest) is a high level clause-based expression evaluator: each clause roughly corresponds to a scalar operator in the original SQL text. The second (and newest) is a PCODE-based evaluator, implementing a lower-level machine-like instruction set. Most expressions that cannot be generated as native machine code are generated as PCODE; those few expressions that PCODE cannot cover are generated as clause expressions. For debugging purposes, it is possible to force the Compiler to generate PCODE instead of native machine code, or clause-based expressions instead of either native machine code or PCODE.
-### Interprocess Communication ###
+## Interprocess Communication
-An IPC layer, shared with other components like the compiler, abstracts the (asynchronous) communication of objects across process boundaries. The sorts of things that flow are query plan objects, data rows, and error objects (ComDiagsArea).
+An IPC layer, shared with other components such as the compiler, abstracts the (asynchronous) communication of objects across process boundaries. The sorts of things that flow are query plan objects, data rows, and error objects (ComDiagsArea).
-### Call Level Interface ###
+## Call Level Interface
At the highest level of the Executor is the Call Level Interface (CLI) layer. This layer implements an ODBC-like interface to the Executor. Connectivity code communicates to the Executor using this interface. The CLI layer keeps track of such abstractions as SQL statements and cursors. It also provides an interface to retrieve SQL diagnostics.
-### Heap Management ###
+## Heap Management
The Executor also uses the NAHeap classes for heap management. Again, there are statement heaps for objects local to a given SQL statement, and a global heap for objects that exist across statements.
-### Error Management ###
+## Error Management
The Executor too uses the ComDiagsArea classes for error management. Like the Compiler, the programming style relies on returns rather than exceptions; calling code is expected to check for the existence of errors and respond appropriately.
-### Statistics Reporting ###
+## Statistics Reporting
The Executor also collects statistics concerning the execution of a particular query. These statistics are available at the CLI interface at the conclusion of statement execution.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aeef01ec/docs/src/site/markdown/contribute.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/contribute.md b/docs/src/site/markdown/contribute.md
index de06f7b..81ea3d9 100644
--- a/docs/src/site/markdown/contribute.md
+++ b/docs/src/site/markdown/contribute.md
@@ -12,22 +12,29 @@
limitations under the
License.
-->
+<div class="alert alert-dismissible alert-info">
+ <button type="button" class="close" data-dismiss="alert">&close;</button>
+ <p>Contributing to this project is open to every person caring for the improvement of its product(s) and/or its community — anyone willing to further the project.</p>
-# Contributing
+<p>If you want to do more; for example, be recognized for your commitment or be eligible for privileges (privileges to commit changes to the code base or have a binding vote on the directions of this project), then please follow steps outlined on this page.</p>
+</div>
-## Introduction
+First of all, a big **Thank You** from us for evaluating and/or using our products. We truly appreciate it! Our products exist and continues to improve thanks to you. But you can help us and yourself more!
-**This projects exists because of the actions of its contributors!**
+We are a community of volunteers working with the guidelines and policies of the Apache Software Foundation (the Apache Way) in mind. Therefore, we welcome any kind of input you can provide to create better products. These contributions, whether you think of reporting bugs, supplying code enhancements, improvements to our documentation, answering questions in our mailing lists, or anywhere else are valuable to us. Because these will help us in helping you.
-First of all, a big **Thank You** from us for evaluating and/or using our products. We truly appreciate it! Our products exist, and continues to improve thanks to you. But you can help us and yourself more!
+Your first step toward more involvement in our project is to subscribe to one of our [mailing lists](mail-lists.html). Next, please consider making your first contribution by simply sending an e-mail to our community discussing; for example:
-As we are a community of volunteers working with the guidelines and policies of the Apache Software Foundation (the Apache Way) in mind, we welcome any kind of input you can provide to get better products. These contributions, whether you think of reporting bugs, supplying code enhancements, improvements to our documentation, answering questions in our mailing lists or anywhere else are valuable to us. Because these will help us in helping you.
+* What you like about Trafodion and its documentation.
+* What you find missing.
+* A bug you encountered.
-So, you consider contributing to our project. But how do you go about achieving this?
-
-Well, it is as easy as pie. The first thing you need to do is to subscribe to one of our [mailing lists](mail-lists.html) and you are set to go to deliver your first contribution: a posting there, about how great our products (code, documentation) are, what you found missing, or even the bug you're confronted with.
+Or, help us by writing articles, blog posts, or sharing information about Trafodion at conferences and on social media such as Twitter (\#trafodion).
-After you have had your first contribution over and done with, it stays easy. You can:
+---
+
+## Contribution Ideas
+You've made your first contribution. Now, you can get more involved. For example:
* Reply to questions, and/or share your viewpoint on how to get issues resolved.
* Add to our [FAQ](faq.html), [Web Site](website.html), or [Wiki](wiki.html).
@@ -35,7 +42,8 @@ After you have had your first contribution over and done with, it stays easy. Yo
* Evaluate bugs and proposed improvements provided by others in our team.
* Help with outlining and evaluating the future direction of our project and the development iterations of our products.
-To make it a bit more explicit, we are looking for:
+## Contribution Areas
+Want to be even more involved? Some areas you should consider:
* Source code (bugs and improvements) contributions
* Documentation assistance
@@ -43,8 +51,18 @@ To make it a bit more explicit, we are looking for:
* Detailed and constructive feedback
* Articles (case studies, white papers, etc) and presentations (speeches) about how our products helps or helped you.
-But the list is not limited to the above! If you feel we missed something there, please let us know (via our [mailing lists](mail-lists.html)).
+These are just ideas to get you started. If you feel we missed something there, please let us know (via our [mailing lists](mail-lists.html) ). Together, we can grow Trafodion and its community.
+
+----
+
+## Becoming a Registered Contributor
+Do you want to be recognized on the [Team page](team-list.html) like many of us are? If so, please do the following:
+
+1. Send an email to the dev mailing list of the project stating that you, as a contributor, want to do more and be listed on the Team page. Any community member with edit permissions to the source code can then add your details to the list.
+2. Send your [**ICLA**](https://www.apache.org/licenses/icla.txt) to the secretary of the Apache Software Foundation. Refer to the [Licenses](http://www.apache.org/licenses/) page for information about this requirement.
+
+ As soon as you have your ICLA registration confirmed, inform the community. You can now be added (by designated space admins) to:
-## Recognized Contributors
+ * The Trafodion Confluence Contributors group, so that you can add new and edit existing wiki pages.
+ * The Trafodion JIRA Contributors group, so that you can assign yourself to any open issue in order to bring it further to resolution and/or closure.
-For an overview of contributors who have gone the extra mile and registered their iCLA, look [here](team-list.html). If you want to go the extra mile, have a look at our [on-boarding page](onboarding.html).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aeef01ec/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
index 3af3200..19f7a61 100644
--- a/docs/src/site/markdown/index.md
+++ b/docs/src/site/markdown/index.md
@@ -75,8 +75,9 @@ Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Traf
<center>
<h2>Understand</h2>
<img src="images/logos/understand.png" width="108" height="108"/>
-</center>
<h4>What makes Trafodion unique</h4>
+<div class="customHr">.</div>
+</center>
<ul>
<li><a href="architecture-overview.html">Architecture</a></li>
<li>Documentation</li>
@@ -88,8 +89,9 @@ Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Traf
<center>
<h2>Use</h2>
<img src="images/logos/use.png" width="108" height="108"/>
-</center>
<h4>Download and Try Trafodion</h4>
+<div class="customHr">.</div>
+</center>
<ul>
<li><a href="index.html">Features</a> and roadmap</li>
<li>Release Notes</li>
@@ -101,8 +103,9 @@ Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Traf
<center>
<h2>Contribute</h2>
<img src="images/logos/contribute.png" width="108" height="108"/>
-</center>
<h4>Help enhance Trafodion</h4>
+<div class="customHr">.</div>
+</center>
<ul>
<li>Development environment</li>
<li>Software architecture.</li>
@@ -114,8 +117,9 @@ Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Traf
<center>
<h2>Community</h2>
<img src="images/logos/community.png" width="108" height="108"/>
-</center>
<h4>Be part of Trafodion</h4>
+<div class="customHr">.</div>
+</center>
<ul>
<li>Join project team</li>
<li>Community communication</li>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aeef01ec/docs/src/site/markdown/release-notes-1-3-0.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-3-0.md b/docs/src/site/markdown/release-notes-1-3-0.md
index aa56817..26c4257 100644
--- a/docs/src/site/markdown/release-notes-1-3-0.md
+++ b/docs/src/site/markdown/release-notes-1-3-0.md
@@ -13,8 +13,6 @@
-->
# Release 1.3.0
-There are various ways to download and use this software see the Using the Software page for options.
-
This is the first release of the Apache Trafodion (incubating) project. In addition to including a number of new features and improvements across the project, the focus of this release is to comply with Apache release guidelines.
Build instructions are available [here](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61316378).
@@ -36,6 +34,10 @@ The following platforms are supported in this release.
<td>**Java Version**</td>
<td>JDK 1.7.0_67 or newer</td>
</tr>
+ <tr>
+ <td>**HBase Version**</td>
+ <td>HBase 0.98.x</td>
+ </tr>
</table>
</span>
@@ -52,16 +54,6 @@ This release contains the following new features.
</tr>
<tr>
<td>SQL</td>
- <td>Support native HBase tables as EXTERNAL tables.</td>
- <td>(TRAFODION-1483)</td>
- </tr>
- <tr>
- <td>SQL</td>
- <td>Support pre-splitting of unsalted tables.</td>
- <td>(TRAFODION-50)</td>
- </tr>
- <tr>
- <td>SQL</td>
<td>Support for IDENTITY columns.</td>
<td>(TRAFODION-62)</td>
</tr>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aeef01ec/docs/src/site/markdown/website.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/website.md b/docs/src/site/markdown/website.md
index 5fa6065..4321788 100644
--- a/docs/src/site/markdown/website.md
+++ b/docs/src/site/markdown/website.md
@@ -12,7 +12,11 @@
limitations under the
License.
-->
-# Modify Web Site
+# Making Changes
+
+The Trafodion web site is part of the Trafodion source tree. The following information helps you understand how to make changes to the web-site content.
+
+----
## Technology
@@ -35,24 +39,26 @@ The code is located in the **<code>docs</code>** directory. The code organizatio
**<code>docs/target</code>** contains the generated HTML files after you run a build.
-## Page Management
+## Managing Pages
You add/rename/delete pages in **<code>docs/src/site/markdown</code>**. You make corresponding changes in **<code>docs/src/site.xml</code>** adding/renaming/deleting pages from menus and defining page configuration; for example: removal of the table of contents bar and the special page formatting provided by the Reflow skin. Refer to the [Maven Documentation](http://maven.apache.org/plugins/maven-site-plugin/examples/sitedescriptor.html) for more information.
-## Developing Pages
+## Providing Content
When possible, ensure that you write in active voice and to the point.
Special functions such as buttons etc. can be access by clicking **Preview** in the theme preview. There's a \<\> feature on each function, which allows you to copy the special **<code>\<div\></code>** you need to insert the selected object.
-## Development and Build
+## Development Environment
Typically, you'll use Eclipse to develop and build the website pages. The configuration goal is: **<code>clean site</code>**. The **<code>pom.xml</code>** file in the top-level directory drives the build steps for the web site.
-## Testing
+## Testing Changes
+
+The website files are located in **<code>docs/target</code>**. Open **<code>index.html</code>** from your browser and test your changes. For example, you want to validate the page layout, page navigation, links, and review the overall content on the pages you modified or added/deleted.
-The website files are located in **<code>docs/target</code>**. Open **<code>index.html</code>** from your browser and test your changes.
+----
-## Updating External Website
+# Publishing Web Site
To be written.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aeef01ec/docs/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/css/site.css b/docs/src/site/resources/css/site.css
index b644917..3685589 100644
--- a/docs/src/site/resources/css/site.css
+++ b/docs/src/site/resources/css/site.css
@@ -1,4 +1,27 @@
-.color-highlight {
+/**
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+* @@@ END COPYRIGHT @@@
+ */
+
+ .color-highlight {
color: #225E9B;
}
@@ -26,6 +49,17 @@ h3, h4, h5, h6 {
margin-top: 20px;
}
+.customHr {
+ width: 90%
+ font-size: 1px;
+ color: grey;
+ line-height: 1px;
+
+ background-color: grey;
+ margin-top: -6px;
+ margin-bottom: 10px;
+}
+
.carousel-caption a {
color: white;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aeef01ec/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 83d0960..4703bc0 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -94,38 +94,65 @@
<body />
</sections>
</index>
+ <architecture-overview><shortTitle>Architecture Overview</shortTitle></architecture-overview>
+ <contribute>
+ <shortTitle>How to Contribute</shortTitle>
+ <toc>false</toc>
+ <sections>
+ <body />
+ <columns>2</columns>
+ <body />
+ </sections>
+ </contribute>
+ <develop>
+ <shortTitle>How to Develop</shortTitle>
+ <sections>
+ <body />
+ </sections>
+ </develop>
+ <faq>
+ <toc>top</toc>
+ <shortTitle>Frequently Asked Questions</shortTitle>
+ <tocTopFlatten>false</tocTopFlatten>
+ </faq>
<issue-tracking><toc>false</toc></issue-tracking>
<license><toc>false</toc></license>
<mail-lists><toc>false</toc></mail-lists>
<release-notes><toc>false</toc></release-notes>
- <website><markPageHeader>false</markPageHeader></website>
+ <website>
+ <shortTitle>How to Update Web Site</shortTitle>
+ <tocTopFlatten>false</tocTopFlatten>
+ <sections>
+ <body />
+ <columns>2</columns>
+ <body />
+ </sections>
+ </website>
+ <wiki><toc>false</toc></wiki>
</pages>
</reflowSkin>
</custom>
<body>
- <!--
<breadcrumbs>
<item name="Trafodion" href="index.html"/>
</breadcrumbs>
- -->
<menu name="About">
- <item href="index.html" name="Overview"/>
+ <item href="index.html" name="Project Overview"/>
<item href="new-features.html" name="New Features"/>
<item href="roadmap.html" name="Roadmap"/>
<item href="performance.html" name="Performance"/>
+ <item href="http:divider" name=""/>
<item href="team-list.html" name="Team"/>
<item href="presentations.html" name="Presentations"/>
<item href="mail-lists.html" name="Mailing List"/>
+ <item href="http:divider" name=""/>
<item href="source-repository.html" name="Source Repository"/>
<item href="issue-tracking.html" name="Issue Tracking"/>
+ <item href="license.html" name="License"/>
+ <item href="http:divider" name=""/>
<item href="download.html" name="Download"/>
<item href="install.html" name="Install"/>
- <item href="http:divider" name=""/>
- <item href="license.html" name="License"/>
- <item href="http://www.apache.org/foundation/sponsorship.html" name="Sponsorship" target="_blank"/>
- <item href="http://www.apache.org/foundation/thanks.html" name="Thanks" target="_blank"/>
- <item href="http://www.apache.org/security/" name="Security" target="_blank"/>
</menu>
<menu name="Using">
<item href="faq.html" name="F.A.Q."/>
@@ -156,12 +183,22 @@
<menu name="Contributing">
<item href="contribute.html" name="How to Contribute"/>
<item href="develop.html" name="How to Develop"/>
- <item href="website.html" name="How to Update Website"/>
<item href="release.html" name="How to Test"/>
<item href="release.html" name="How to Release"/>
+ <item href="website.html" name="How to Update Web Site"/>
+ <item href="wiki.html" name="How to Update Wiki Pages"/>
<item href="http:divider" name=""/>
<item href="design-papers.html" name="Design Paper Template"/>
</menu>
+ <menu name="Apache">
+ <item href="http://incubator.apache.org/projects/trafodion.html" name="Status Page" target="_blank"/>
+ <item href="http://www.apache.org/foundation/how-it-works.html" name="Apache Foundation" target="_blank"/>
+ <item href="http://www.apache.org/licenses/" name="Apache License" target="_blank"/>
+ <item href="http://www.apache.org/security/" name="Apache Security" target="_blank"/>
+ <item href="http:divider" name=""/>
+ <item href="http://www.apache.org/foundation/sponsorship.html" name="Sponsorship" target="_blank"/>
+ <item href="http://www.apache.org/foundation/thanks.html" name="Thanks" target="_blank"/>
+ </menu>
<footer>
<hr />
<div class="row span16">