trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From li...@apache.org
Subject [23/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:01 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/ErrorDescList.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ErrorDescList.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ErrorDescList.html
index b5dd665..0a01690 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ErrorDescList.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ErrorDescList.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">
@@ -172,3 +173,175 @@
 <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.ErrorDescList的使用 (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.ErrorDescList\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/ErrorDescList.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/ErrorDescList.html" target="_top">框架</a></li>
+<li><a href="ErrorDescList.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.ErrorDescList 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.ErrorDescList<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/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDescList</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>
+</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/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDescList</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>参数类型为<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDescList</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>void</code></td>
+<td class="colLast"><span class="strong">ServerException.</span><code><strong><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.html#setServerException(int,%20int,%20org.trafodion.dcs.servermt.serverDriverInputOutput.ErrorDescList)">setServerException</a></strong>(int&nbsp;exception_nr,
+                  int&nbsp;exception_detail,
+                  <a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDescList</a>&nbsp;errorDescList)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDescList</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/ErrorDescList.html#ErrorDescList(org.trafodion.dcs.servermt.serverDriverInputOutput.ErrorDescList)">ErrorDescList</a></strong>(<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">ErrorDescList</a>&nbsp;edl)</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/ErrorDescList.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/ErrorDescList.html" target="_top">框架</a></li>
+<li><a href="ErrorDescList.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/class-use/Header.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Header.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Header.html
index dbde327..c9ff57f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Header.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Header.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">
@@ -119,3 +120,122 @@
 <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.Header的使用 (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.Header\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/Header.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/Header.html" target="_top">框架</a></li>
+<li><a href="Header.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.Header 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.Header<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.Header的用法</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/Header.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/Header.html" target="_top">框架</a></li>
+<li><a href="Header.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/class-use/OutConnectionContext.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/OutConnectionContext.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/OutConnectionContext.html
index 6600910..5604281 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/OutConnectionContext.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/OutConnectionContext.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">
@@ -119,3 +120,122 @@
 <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.OutConnectionContext的使用 (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.OutConnectionContext\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/OutConnectionContext.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/OutConnectionContext.html" target="_top">框架</a></li>
+<li><a href="OutConnectionContext.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.OutConnectionContext 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.OutConnectionContext<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.OutConnectionContext的用法</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/OutConnectionContext.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/OutConnectionContext.html" target="_top">框架</a></li>
+<li><a href="OutConnectionContext.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/class-use/SQLDataValue.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLDataValue.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLDataValue.html
index c242159..060b177 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLDataValue.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLDataValue.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">
@@ -119,3 +120,122 @@
 <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.SQLDataValue的使用 (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.SQLDataValue\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/SQLDataValue.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/SQLDataValue.html" target="_top">框架</a></li>
+<li><a href="SQLDataValue.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.SQLDataValue 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.SQLDataValue<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.SQLDataValue的用法</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/SQLDataValue.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/SQLDataValue.html" target="_top">框架</a></li>
+<li><a href="SQLDataValue.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/class-use/SQLValue.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValue.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValue.html
index 1868788..0731b77 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValue.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValue.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">
@@ -157,3 +158,160 @@
 <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.SQLValue的使用 (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.SQLValue\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/SQLValue.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/SQLValue.html" target="_top">框架</a></li>
+<li><a href="SQLValue.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.SQLValue 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.SQLValue<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/SQLValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValue</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>
+</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/SQLValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValue</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValue</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/SQLValue.html#SQLValue(org.trafodion.dcs.servermt.serverDriverInputOutput.SQLValue)">SQLValue</a></strong>(<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValue</a>&nbsp;sv)</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/SQLValue.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/SQLValue.html" target="_top">框架</a></li>
+<li><a href="SQLValue.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/class-use/SQLValueList.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValueList.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValueList.html
index 3a1e71f..500cbe6 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValueList.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLValueList.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">
@@ -157,3 +158,160 @@
 <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.SQLValueList的使用 (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.SQLValueList\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/SQLValueList.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/SQLValueList.html" target="_top">框架</a></li>
+<li><a href="SQLValueList.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.SQLValueList 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.SQLValueList<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/SQLValueList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValueList</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>
+</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/SQLValueList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValueList</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValueList</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/SQLValueList.html#SQLValueList(org.trafodion.dcs.servermt.serverDriverInputOutput.SQLValueList)">SQLValueList</a></strong>(<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">SQLValueList</a>&nbsp;svl)</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/SQLValueList.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/SQLValueList.html" target="_top">框架</a></li>
+<li><a href="SQLValueList.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/class-use/SQLWarningOrError.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrError.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrError.html
index 0e205c5..aae6292 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrError.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrError.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">
@@ -119,3 +120,122 @@
 <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.SQLWarningOrError的使用 (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.SQLWarningOrError\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/SQLWarningOrError.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/SQLWarningOrError.html" target="_top">框架</a></li>
+<li><a href="SQLWarningOrError.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.SQLWarningOrError 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.SQLWarningOrError<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.SQLWarningOrError的用法</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/SQLWarningOrError.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/SQLWarningOrError.html" target="_top">框架</a></li>
+<li><a href="SQLWarningOrError.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/class-use/SQLWarningOrErrorList.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrErrorList.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrErrorList.html
index adc4ab5..b8e1e26 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrErrorList.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SQLWarningOrErrorList.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">
@@ -119,3 +120,122 @@
 <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.SQLWarningOrErrorList的使用 (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.SQLWarningOrErrorList\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/SQLWarningOrErrorList.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/SQLWarningOrErrorList.html" target="_top">框架</a></li>
+<li><a href="SQLWarningOrErrorList.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.SQLWarningOrErrorList 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.SQLWarningOrErrorList<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.SQLWarningOrErrorList的用法</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/SQLWarningOrErrorList.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/SQLWarningOrErrorList.html" target="_top">框架</a></li>
+<li><a href="SQLWarningOrErrorList.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/class-use/ServerException.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ServerException.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ServerException.html
index 1868c79..966826a 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ServerException.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/ServerException.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">
@@ -119,3 +120,122 @@
 <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.ServerException的使用 (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.ServerException\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/ServerException.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/ServerException.html" target="_top">框架</a></li>
+<li><a href="ServerException.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.ServerException 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.ServerException<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.ServerException的用法</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/ServerException.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/ServerException.html" target="_top">框架</a></li>
+<li><a href="ServerException.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/class-use/SetConnectionOption.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SetConnectionOption.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SetConnectionOption.html
index 90f023f..f5eb3fd 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SetConnectionOption.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/SetConnectionOption.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">
@@ -119,3 +120,122 @@
 <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.SetConnectionOption的使用 (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.SetConnectionOption\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/SetConnectionOption.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/SetConnectionOption.html" target="_top">框架</a></li>
+<li><a href="SetConnectionOption.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.SetConnectionOption 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.SetConnectionOption<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.SetConnectionOption的用法</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/SetConnectionOption.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/SetConnectionOption.html" target="_top">框架</a></li>
+<li><a href="SetConnectionOption.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/class-use/UserDesc.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/UserDesc.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/UserDesc.html
index bb9e979..afb40f2 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/UserDesc.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/UserDesc.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">
@@ -119,3 +120,122 @@
 <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.UserDesc的使用 (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.UserDesc\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/UserDesc.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/UserDesc.html" target="_top">框架</a></li>
+<li><a href="UserDesc.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.UserDesc 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.UserDesc<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.servermt.serverDriverInputOutput.UserDesc的用法</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/UserDesc.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/UserDesc.html" target="_top">框架</a></li>
+<li><a href="UserDesc.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/class-use/Version.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Version.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Version.html
index 3085fb3..a56075a 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Version.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverDriverInputOutput/class-use/Version.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">
@@ -170,3 +171,173 @@
 <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.Version的使用 (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.Version\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/Version.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/Version.html" target="_top">框架</a></li>
+<li><a href="Version.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.Version 的使用" class="title">类 org.trafodion.dcs.servermt.serverDriverInputOutput.Version<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/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Version</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>
+</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/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Version</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Version</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/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Version</a>[]</code></td>
+<td class="colLast"><span class="strong">VersionList.</span><code><strong><a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html#getList()">getList</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/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Version</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/Version.html#Version(org.trafodion.dcs.servermt.serverDriverInputOutput.Version)">Version</a></strong>(<a href="../../../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Version.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Version</a>&nbsp;v)</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/Version.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/Version.html" target="_top">框架</a></li>
+<li><a href="Version.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*


Mime
View raw message