http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecDirect.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecDirect.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecDirect.html
index 2bb3c4f..b73f5ba 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecDirect.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecDirect.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.serverHandler.ServerApiSqlExecDirect的使用 
(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.serverHandler.ServerApiSqlExecDirect\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/serverHandler/ServerApiSqlExecDirect.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlExecDirect.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlExecDirect.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.serverHandler.ServerApiSqlExecDirect 
的使用" class="title">类 
org.trafodion.dcs.servermt.serverHandler.ServerApiSqlExecDirect<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.servermt.serverHandler.ServerApiSqlExecDirect的用法</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/serverHandler/ServerApiSqlExecDirect.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlExecDirect.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlExecDirect.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/class-use/ServerApiSqlExecute.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecute.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecute.html
index 21a3e1c..a9363b1 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecute.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlExecute.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.serverHandler.ServerApiSqlExecute的使用 
(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.serverHandler.ServerApiSqlExecute\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/serverHandler/ServerApiSqlExecute.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlExecute.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlExecute.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.serverHandler.ServerApiSqlExecute 
的使用" class="title">类 
org.trafodion.dcs.servermt.serverHandler.ServerApiSqlExecute<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.servermt.serverHandler.ServerApiSqlExecute的用法</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/serverHandler/ServerApiSqlExecute.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlExecute.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlExecute.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/class-use/ServerApiSqlFetch.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlFetch.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlFetch.html
index fea32d9..6fee046 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlFetch.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlFetch.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.serverHandler.ServerApiSqlFetch的使用 
(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.serverHandler.ServerApiSqlFetch\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/serverHandler/ServerApiSqlFetch.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlFetch.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlFetch.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.serverHandler.ServerApiSqlFetch 
的使用" class="title">类 
org.trafodion.dcs.servermt.serverHandler.ServerApiSqlFetch<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.servermt.serverHandler.ServerApiSqlFetch的用法</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/serverHandler/ServerApiSqlFetch.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlFetch.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlFetch.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/class-use/ServerApiSqlPrepare.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlPrepare.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlPrepare.html
index 4f09f06..5e19c92 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlPrepare.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlPrepare.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.serverHandler.ServerApiSqlPrepare的使用 
(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.serverHandler.ServerApiSqlPrepare\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/serverHandler/ServerApiSqlPrepare.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlPrepare.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlPrepare.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.serverHandler.ServerApiSqlPrepare 
的使用" class="title">类 
org.trafodion.dcs.servermt.serverHandler.ServerApiSqlPrepare<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.servermt.serverHandler.ServerApiSqlPrepare的用法</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/serverHandler/ServerApiSqlPrepare.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlPrepare.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlPrepare.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/class-use/ServerApiSqlSetConnectAttr.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlSetConnectAttr.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlSetConnectAttr.html
index 6c70a83..a2244c0 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlSetConnectAttr.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerApiSqlSetConnectAttr.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.serverHandler.ServerApiSqlSetConnectAttr的使用 
(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.serverHandler.ServerApiSqlSetConnectAttr\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/serverHandler/ServerApiSqlSetConnectAttr.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlSetConnectAttr.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlSetConnectAttr.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.serverHandler.ServerApiSqlSetConnectAttr 的使用" 
class="title">ç±» 
org.trafodion.dcs.servermt.serverHandler.ServerApiSqlSetConnectAttr<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.servermt.serverHandler.ServerApiSqlSetConnectAttr的用法</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/serverHandler/ServerApiSqlSetConnectAttr.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerApiSqlSetConnectAttr.html"
 target="_top">框架</a></li>
+<li><a href="ServerApiSqlSetConnectAttr.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/class-use/ServerHandler.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerHandler.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerHandler.html
index caf4942..ef62c8d 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerHandler.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerHandler.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">
@@ -181,3 +182,184 @@
 <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.serverHandler.ServerHandler的使用 
(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.serverHandler.ServerHandler\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/serverHandler/ServerHandler.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerHandler.html"
 target="_top">框架</a></li>
+<li><a href="ServerHandler.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.serverHandler.ServerHandler 
的使用" class="title">类 
org.trafodion.dcs.servermt.serverHandler.ServerHandler<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/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</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">org.trafodion.dcs.servermt</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.servermt.serverHandler">org.trafodion.dcs.servermt.serverHandler</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">
+<!--   -->
+</a>
+<h3><a 
href="../../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>中<a
 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表构造器和解释">
+<caption><span>参数类型为<a 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a>的<a
 
href="../../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</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/ServerUtils.html#ServerUtils(org.trafodion.dcs.servermt.serverHandler.ServerHandler,%20org.trafodion.dcs.zookeeper.ZkClient)">ServerUtils</a></strong>(<a
 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a>&nbsp;server,
+           <a 
href="../../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" 
title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverHandler">
+<!--   -->
+</a>
+<h3><a 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>中<a
 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表方法和解释">
+<caption><span>参数类型为<a 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a>的<a
 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</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">ServerWorker.</span><code><strong><a 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/ServerWorker.html#processData(org.trafodion.dcs.servermt.serverHandler.ServerHandler,%20java.nio.channels.SelectionKey)">processData</a></strong>(<a
 
href="../../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a>&nbsp;server,
+           <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/channels/SelectionKey.html?is-external=true";
 
title="java.nio.channels中的类或接口">SelectionKey</a>&nbsp;key)</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/serverHandler/ServerHandler.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerHandler.html"
 target="_top">框架</a></li>
+<li><a href="ServerHandler.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/class-use/ServerWorker.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerWorker.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerWorker.html
index f947093..5b802c2 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerWorker.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/class-use/ServerWorker.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.serverHandler.ServerWorker的使用 
(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.serverHandler.ServerWorker\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/serverHandler/ServerWorker.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerWorker.html"
 target="_top">框架</a></li>
+<li><a href="ServerWorker.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.serverHandler.ServerWorker 
的使用" class="title">类 
org.trafodion.dcs.servermt.serverHandler.ServerWorker<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.servermt.serverHandler.ServerWorker的用法</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/serverHandler/ServerWorker.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">类</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/serverHandler/class-use/ServerWorker.html"
 target="_top">框架</a></li>
+<li><a href="ServerWorker.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/package-frame.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-frame.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-frame.html
index 78b8a34..667d8e8 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-frame.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/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">
@@ -30,3 +31,37 @@
 </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.serverHandler (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/serverHandler/package-summary.html"
 target="classFrame">org.trafodion.dcs.servermt.serverHandler</a></h1>
+<div class="indexContainer">
+<h2 title="ç±»">ç±»</h2>
+<ul title="ç±»">
+<li><a href="ClientData.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ClientData</a></li>
+<li><a href="ServerApiGetCatalogs.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiGetCatalogs</a></li>
+<li><a href="ServerApiSqlClose.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlClose</a></li>
+<li><a href="ServerApiSqlConnect.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlConnect</a></li>
+<li><a href="ServerApiSqlDisconnect.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlDisconnect</a></li>
+<li><a href="ServerApiSqlEndTransact.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlEndTransact</a></li>
+<li><a href="ServerApiSqlExecDirect.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlExecDirect</a></li>
+<li><a href="ServerApiSqlExecute.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlExecute</a></li>
+<li><a href="ServerApiSqlFetch.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlFetch</a></li>
+<li><a href="ServerApiSqlPrepare.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlPrepare</a></li>
+<li><a href="ServerApiSqlSetConnectAttr.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerApiSqlSetConnectAttr</a></li>
+<li><a href="ServerHandler.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerHandler</a></li>
+<li><a href="ServerWorker.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类" 
target="classFrame">ServerWorker</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/serverHandler/package-summary.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-summary.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-summary.html
index b306334..012257b 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-summary.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/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">
@@ -185,3 +186,188 @@
 <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.serverHandler (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.serverHandler 
(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/serverDriverInputOutput/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/servermt/serverSql/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/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.serverHandler</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/serverHandler/ClientData.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类">ClientData</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiGetCatalogs</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlClose</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlConnect</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlDisconnect</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlEndTransact</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlExecDirect</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlExecute</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlFetch</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlPrepare</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerApiSqlSetConnectAttr</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 
title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerWorker.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类">ServerWorker</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/serverDriverInputOutput/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/servermt/serverSql/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/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/serverHandler/package-tree.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-tree.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-tree.html
index 30e2c0e..b6eb292 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-tree.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/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">
@@ -148,3 +149,151 @@
 <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.serverHandler 类分层结构 (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.serverHandler 
\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/serverDriverInputOutput/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/servermt/serverSql/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/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.serverHandler的分层结构</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.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ClientData.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ClientData</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiGetCatalogs</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlClose</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlConnect</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlDisconnect</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlEndTransact</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlExecDirect</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlExecute</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlFetch</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlPrepare</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlSetConnectAttr</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerHandler</span></a> (implements java.util.concurrent.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Callable.html?is-external=true";
 title="java.util.concurrent中的类或接口">Callable</a>&lt;V&gt;)</li>
+<li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Thread.html?is-external=true";
 title="java.lang中的类或接口"><span class="strong">Thread</span></a> 
(implements java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true";
 title="java.lang中的类或接口">Runnable</a>)
+<ul>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerWorker.html"
 title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerWorker</span></a></li>
+</ul>
+</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/serverDriverInputOutput/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/servermt/serverSql/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/servermt/serverHandler/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/serverHandler/package-use.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-use.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-use.html
index f410123..a095eb6 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/package-use.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/serverHandler/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">
@@ -190,3 +191,193 @@
 <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.serverHandler的使用 (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.serverHandler\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/serverHandler/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.serverHandler 的使用" 
class="title">程序包 
org.trafodion.dcs.servermt.serverHandler<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/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</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">org.trafodion.dcs.servermt</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.servermt.serverHandler">org.trafodion.dcs.servermt.serverHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<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"><a name="org.trafodion.dcs.servermt">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span><a 
href="../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>使用的<a
 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</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/serverHandler/class-use/ServerHandler.html#org.trafodion.dcs.servermt">ServerHandler</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverHandler">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span><a 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>使用的<a
 
href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</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/serverHandler/class-use/ServerHandler.html#org.trafodion.dcs.servermt.serverHandler">ServerHandler</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/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</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/serverHandler/class-use/ClientData.html#org.trafodion.dcs.servermt.serverSql">ClientData</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/serverHandler/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*

Reply via email to