trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From li...@apache.org
Subject [22/51] [abbrv] [partial] trafodion-site git commit: Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
Date Fri, 06 Jul 2018 03:59:00 GMT
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html
index 75f75ed..4adc5aa 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -209,3 +210,212 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.servermt.serverDriverInputOutput.VersionList的使用 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="\u7C7B org.trafodion.dcs.servermt.serverDriverInputOutput.VersionList\u7684\u4F7F\u7528 (Trafodion Database Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html" target="_top">框架</a></li>
+<li><a href="VersionList.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.servermt.serverDriverInputOutput.VersionList 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.VersionList<br>的使用</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表程序包和解释">
+<caption><span>使用<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>的程序包</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">程序包</th>
+<th class="colLast" scope="col">说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverDriverInputOutput">org.trafodion.dcs.servermt.serverDriverInputOutput</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverSql">org.trafodion.dcs.servermt.serverSql</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverDriverInputOutput">
+<!--   -->
+</a>
+<h3><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>中<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>的<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>中的方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a></code></td>
+<td class="colLast"><span class="strong">ConnectionContext.</span><code><strong><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.html#getClientVersionList()">getClientVersionList</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a></code></td>
+<td class="colLast"><span class="strong">OutConnectionContext.</span><code><strong><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.html#getVersionList()">getVersionList</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>的<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html#VersionList(org.trafodion.dcs.servermt.serverDriverInputOutput.VersionList)">VersionList</a></strong>(<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>&nbsp;vl)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverSql">
+<!--   -->
+</a>
+<h3><a href="../../../../../../org/trafodion/dcs/servermt/serverSql/package-summary.html">org.trafodion.dcs.servermt.serverSql</a>中<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>的<a href="../../../../../../org/trafodion/dcs/servermt/serverSql/package-summary.html">org.trafodion.dcs.servermt.serverSql</a>中的方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a></code></td>
+<td class="colLast"><span class="strong">TrafConnection.</span><code><strong><a href="../../../../../../org/trafodion/dcs/servermt/serverSql/TrafConnection.html#getClientVersionList()">getClientVersionList</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>参数类型为<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>的<a href="../../../../../../org/trafodion/dcs/servermt/serverSql/package-summary.html">org.trafodion.dcs.servermt.serverSql</a>中的方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">TrafConnection.</span><code><strong><a href="../../../../../../org/trafodion/dcs/servermt/serverSql/TrafConnection.html#setClientVersionList(org.trafodion.dcs.servermt.serverDriverInputOutput.VersionList)">setClientVersionList</a></strong>(<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a>&nbsp;clientVersionList)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html" target="_top">框架</a></li>
+<li><a href="VersionList.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-frame.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-frame.html
index badf935..4894edf 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-frame.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-frame.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -35,3 +36,42 @@
 </div>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>org.trafodion.dcs.servermt.serverDriverInputOutput (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<h1 class="bar"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html" target="classFrame">org.trafodion.dcs.servermt.serverDriverInputOutput</a></h1>
+<div class="indexContainer">
+<h2 title="类">类</h2>
+<ul title="类">
+<li><a href="Close.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">Close</a></li>
+<li><a href="ConnectionContext.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">ConnectionContext</a></li>
+<li><a href="Descriptor2.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">Descriptor2</a></li>
+<li><a href="Descriptor2List.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">Descriptor2List</a></li>
+<li><a href="ErrorDesc.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">ErrorDesc</a></li>
+<li><a href="ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">ErrorDescList</a></li>
+<li><a href="Header.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">Header</a></li>
+<li><a href="OutConnectionContext.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">OutConnectionContext</a></li>
+<li><a href="ServerException.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">ServerException</a></li>
+<li><a href="SetConnectionOption.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">SetConnectionOption</a></li>
+<li><a href="SQLDataValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">SQLDataValue</a></li>
+<li><a href="SQLValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">SQLValue</a></li>
+<li><a href="SQLValueList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">SQLValueList</a></li>
+<li><a href="SQLWarningOrError.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">SQLWarningOrError</a></li>
+<li><a href="SQLWarningOrErrorList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">SQLWarningOrErrorList</a></li>
+<li><a href="UserDesc.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">UserDesc</a></li>
+<li><a href="Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">Version</a></li>
+<li><a href="VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类" target="classFrame">VersionList</a></li>
+</ul>
+</div>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html
index 25c3267..d614603 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -205,3 +206,208 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>org.trafodion.dcs.servermt.serverDriverInputOutput (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="org.trafodion.dcs.servermt.serverDriverInputOutput (Trafodion Database Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li class="navBarCell1Rev">程序包</li>
+<li>类</li>
+<li><a href="package-use.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">上一个程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">下一个程序包</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html" target="_top">框架</a></li>
+<li><a href="package-summary.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="程序包" class="title">程序包&nbsp;org.trafodion.dcs.servermt.serverDriverInputOutput</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="类概要表, 列表类和解释">
+<caption><span>类概要</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">类</th>
+<th class="colLast" scope="col">说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Close.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Close</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ConnectionContext</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Descriptor2</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Descriptor2List</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDesc</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDescList</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Header.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Header</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">OutConnectionContext</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ServerException</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SetConnectionOption</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLDataValue</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValue</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValueList</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLWarningOrError</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLWarningOrErrorList</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">UserDesc</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Version</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">VersionList</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li class="navBarCell1Rev">程序包</li>
+<li>类</li>
+<li><a href="package-use.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">上一个程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">下一个程序包</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html" target="_top">框架</a></li>
+<li><a href="package-summary.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html
index 7e90fa1..d6ca136 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -149,3 +150,152 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>org.trafodion.dcs.servermt.serverDriverInputOutput 类分层结构 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="org.trafodion.dcs.servermt.serverDriverInputOutput \u7C7B\u5206\u5C42\u7ED3\u6784 (Trafodion Database Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>类</li>
+<li>使用</li>
+<li class="navBarCell1Rev">树</li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/package-tree.html">上一个</a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html" target="_top">框架</a></li>
+<li><a href="package-tree.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">程序包org.trafodion.dcs.servermt.serverDriverInputOutput的分层结构</h1>
+<span class="strong">程序包分层结构:</span>
+<ul class="horizontal">
+<li><a href="../../../../../overview-tree.html">所有程序包</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="类分层结构">类分层结构</h2>
+<ul>
+<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口"><span class="strong">Object</span></a>
+<ul>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Close.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">Close</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">ConnectionContext</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">Descriptor2</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">Descriptor2List</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">ErrorDesc</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">ErrorDescList</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Header.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">Header</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">OutConnectionContext</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">ServerException</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">SetConnectionOption</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">SQLDataValue</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">SQLValue</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">SQLValueList</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">SQLWarningOrError</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">SQLWarningOrErrorList</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">UserDesc</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">Version</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span class="strong">VersionList</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>类</li>
+<li>使用</li>
+<li class="navBarCell1Rev">树</li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/package-tree.html">上一个</a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html" target="_top">框架</a></li>
+<li><a href="package-tree.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-use.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-use.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-use.html
index 83c6b16..24eecda 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-use.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/package-use.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -217,3 +218,220 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>程序包 org.trafodion.dcs.servermt.serverDriverInputOutput的使用 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="\u7A0B\u5E8F\u5305 org.trafodion.dcs.servermt.serverDriverInputOutput\u7684\u4F7F\u7528 (Trafodion Database Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>类</li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/package-use.html" target="_top">框架</a></li>
+<li><a href="package-use.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="程序包 org.trafodion.dcs.servermt.serverDriverInputOutput 的使用" class="title">程序包 org.trafodion.dcs.servermt.serverDriverInputOutput<br>的使用</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表程序包和解释">
+<caption><span>使用<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>的程序包</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">程序包</th>
+<th class="colLast" scope="col">说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverDriverInputOutput">org.trafodion.dcs.servermt.serverDriverInputOutput</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverSql">org.trafodion.dcs.servermt.serverSql</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.util">org.trafodion.dcs.util</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverDriverInputOutput">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表类和解释">
+<caption><span><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>使用的<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>中的类</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">类和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Descriptor2.html#org.trafodion.dcs.servermt.serverDriverInputOutput">Descriptor2</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Descriptor2List.html#org.trafodion.dcs.servermt.serverDriverInputOutput">Descriptor2List</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ErrorDesc.html#org.trafodion.dcs.servermt.serverDriverInputOutput">ErrorDesc</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ErrorDescList.html#org.trafodion.dcs.servermt.serverDriverInputOutput">ErrorDescList</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValue.html#org.trafodion.dcs.servermt.serverDriverInputOutput">SQLValue</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValueList.html#org.trafodion.dcs.servermt.serverDriverInputOutput">SQLValueList</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Version.html#org.trafodion.dcs.servermt.serverDriverInputOutput">Version</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html#org.trafodion.dcs.servermt.serverDriverInputOutput">VersionList</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverSql">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表类和解释">
+<caption><span><a href="../../../../../org/trafodion/dcs/servermt/serverSql/package-summary.html">org.trafodion.dcs.servermt.serverSql</a>使用的<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>中的类</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">类和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ConnectionContext.html#org.trafodion.dcs.servermt.serverSql">ConnectionContext</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Descriptor2List.html#org.trafodion.dcs.servermt.serverSql">Descriptor2List</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/VersionList.html#org.trafodion.dcs.servermt.serverSql">VersionList</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.util">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表类和解释">
+<caption><span><a href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</a>使用的<a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>中的类</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">类和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Descriptor2.html#org.trafodion.dcs.util">Descriptor2</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>类</li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverDriverInputOutput/package-use.html" target="_top">框架</a></li>
+<li><a href="package-use.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ClientData.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ClientData.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ClientData.html
index ebbfae5..9d24fa7 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ClientData.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ClientData.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -226,3 +227,229 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ClientData (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ClientData (Trafodion Database Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/ClientData.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个类</li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/ClientData.html" target="_top">框架</a></li>
+<li><a href="ClientData.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.servermt.serverHandler</div>
+<h2 title="类 ClientData" class="title">类 ClientData</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.servermt.serverHandler.ClientData</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ClientData</span>
+extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">Object</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ClientData.html#getConf()">getConf</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()" title="java.lang中的类或接口">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="java.lang中的类或接口">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()" title="java.lang中的类或接口">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()" title="java.lang中的类或接口">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="java.lang中的类或接口">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()" title="java.lang中的类或接口">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()" title="java.lang中的类或接口">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()" title="java.lang中的类或接口">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)" title="java.lang中的类或接口">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)" title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="getConf()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getConf</h4>
+<pre>public&nbsp;org.apache.hadoop.conf.Configuration&nbsp;getConf()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/ClientData.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个类</li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/ClientData.html" target="_top">框架</a></li>
+<li><a href="ClientData.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html
index 05b656e..bbe452a 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -192,3 +193,195 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ServerApiGetCatalogs (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ServerApiGetCatalogs (Trafodion Database Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/ServerApiGetCatalogs.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ClientData.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">上一个类</span></a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html" target="_top">框架</a></li>
+<li><a href="ServerApiGetCatalogs.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li>方法</li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.servermt.serverHandler</div>
+<h2 title="类 ServerApiGetCatalogs" class="title">类 ServerApiGetCatalogs</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.servermt.serverHandler.ServerApiGetCatalogs</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ServerApiGetCatalogs</span>
+extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">Object</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()" title="java.lang中的类或接口">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="java.lang中的类或接口">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()" title="java.lang中的类或接口">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()" title="java.lang中的类或接口">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="java.lang中的类或接口">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()" title="java.lang中的类或接口">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()" title="java.lang中的类或接口">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()" title="java.lang中的类或接口">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)" title="java.lang中的类或接口">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)" title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/ServerApiGetCatalogs.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ClientData.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">上一个类</span></a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html" target="_top">框架</a></li>
+<li><a href="ServerApiGetCatalogs.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li>方法</li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html
index 3442e60..f6202ff 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -192,3 +193,195 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ServerApiSqlClose (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ServerApiSqlClose (Trafodion Database Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/ServerApiSqlClose.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">上一个类</span></a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html" target="_top">框架</a></li>
+<li><a href="ServerApiSqlClose.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li>方法</li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.servermt.serverHandler</div>
+<h2 title="类 ServerApiSqlClose" class="title">类 ServerApiSqlClose</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.servermt.serverHandler.ServerApiSqlClose</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ServerApiSqlClose</span>
+extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">Object</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()" title="java.lang中的类或接口">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="java.lang中的类或接口">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()" title="java.lang中的类或接口">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()" title="java.lang中的类或接口">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="java.lang中的类或接口">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()" title="java.lang中的类或接口">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()" title="java.lang中的类或接口">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()" title="java.lang中的类或接口">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)" title="java.lang中的类或接口">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)" title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/ServerApiSqlClose.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">上一个类</span></a></li>
+<li><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.html" title="org.trafodion.dcs.servermt.serverHandler中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html" target="_top">框架</a></li>
+<li><a href="ServerApiSqlClose.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li>方法</li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*


Mime
View raw message