http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerService.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerService.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerService.html
index 24b771d..391dc2c 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerService.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerService.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">
@@ -182,3 +183,185 @@
 <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.master.listener.ListenerService的使用 
(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.master.listener.ListenerService\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/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/ListenerService.html"
 target="_top">框架</a></li>
+<li><a href="ListenerService.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.master.listener.ListenerService 的使用" 
class="title">ç±» 
org.trafodion.dcs.master.listener.ListenerService<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/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</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.master">org.trafodion.dcs.master</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.master.listener">org.trafodion.dcs.master.listener</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.master">
+<!--   -->
+</a>
+<h3><a 
href="../../../../../../org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</a>中<a
 
href="../../../../../../org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表方法和解释">
+<caption><span>返回<a 
href="../../../../../../org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</a>的<a 
href="../../../../../../org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</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/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</a></code></td>
+<td class="colLast"><span class="strong">DcsMaster.</span><code><strong><a 
href="../../../../../../org/trafodion/dcs/master/DcsMaster.html#getListenerService()">getListenerService</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.master.listener">
+<!--   -->
+</a>
+<h3><a 
href="../../../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</a>中<a
 
href="../../../../../../org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表方法和解释">
+<caption><span>参数类型为<a 
href="../../../../../../org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</a>的<a 
href="../../../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</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">ListenerWorker.</span><code><strong><a 
href="../../../../../../org/trafodion/dcs/master/listener/ListenerWorker.html#processData(org.trafodion.dcs.master.listener.ListenerService,%20java.nio.channels.SelectionKey)">processData</a></strong>(<a
 
href="../../../../../../org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</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/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/ListenerService.html"
 target="_top">框架</a></li>
+<li><a href="ListenerService.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/master/listener/class-use/ListenerWorker.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerWorker.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerWorker.html
index 6597a75..5319a04 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerWorker.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/ListenerWorker.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.master.listener.ListenerWorker的使用 
(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.master.listener.ListenerWorker\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/master/listener/ListenerWorker.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/ListenerWorker.html"
 target="_top">框架</a></li>
+<li><a href="ListenerWorker.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.master.listener.ListenerWorker 的使用" 
class="title">ç±» 
org.trafodion.dcs.master.listener.ListenerWorker<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.master.listener.ListenerWorker的用法</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/master/listener/ListenerWorker.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/ListenerWorker.html"
 target="_top">框架</a></li>
+<li><a href="ListenerWorker.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/master/listener/class-use/RequestCancelQuery.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestCancelQuery.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestCancelQuery.html
index a5c727c..be4ee0b 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestCancelQuery.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestCancelQuery.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.master.listener.RequestCancelQuery的使用 
(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.master.listener.RequestCancelQuery\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/master/listener/RequestCancelQuery.html"
 title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/RequestCancelQuery.html"
 target="_top">框架</a></li>
+<li><a href="RequestCancelQuery.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.master.listener.RequestCancelQuery 的使用" 
class="title">ç±» 
org.trafodion.dcs.master.listener.RequestCancelQuery<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.master.listener.RequestCancelQuery的用法</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/master/listener/RequestCancelQuery.html"
 title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/RequestCancelQuery.html"
 target="_top">框架</a></li>
+<li><a href="RequestCancelQuery.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/master/listener/class-use/RequestGetObjectRef.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestGetObjectRef.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestGetObjectRef.html
index 515342d..ae66ad7 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestGetObjectRef.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestGetObjectRef.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.master.listener.RequestGetObjectRef的使用 
(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.master.listener.RequestGetObjectRef\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/master/listener/RequestGetObjectRef.html"
 title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/RequestGetObjectRef.html"
 target="_top">框架</a></li>
+<li><a href="RequestGetObjectRef.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.master.listener.RequestGetObjectRef 
的使用" class="title">类 
org.trafodion.dcs.master.listener.RequestGetObjectRef<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.master.listener.RequestGetObjectRef的用法</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/master/listener/RequestGetObjectRef.html"
 title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/RequestGetObjectRef.html"
 target="_top">框架</a></li>
+<li><a href="RequestGetObjectRef.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/master/listener/class-use/RequestUnknown.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestUnknown.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestUnknown.html
index df1c710..3f0c376 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestUnknown.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/RequestUnknown.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.master.listener.RequestUnknown的使用 
(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.master.listener.RequestUnknown\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/master/listener/RequestUnknown.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/RequestUnknown.html"
 target="_top">框架</a></li>
+<li><a href="RequestUnknown.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.master.listener.RequestUnknown 的使用" 
class="title">ç±» 
org.trafodion.dcs.master.listener.RequestUnknown<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.master.listener.RequestUnknown的用法</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/master/listener/RequestUnknown.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/RequestUnknown.html"
 target="_top">框架</a></li>
+<li><a href="RequestUnknown.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/master/listener/class-use/Util.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/Util.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/Util.html
index 3ac5b4b..19ac275 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/Util.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/class-use/Util.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.master.listener.Util的使用 (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.master.listener.Util\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/master/listener/Util.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/Util.html"
 target="_top">框架</a></li>
+<li><a href="Util.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.master.listener.Util 的使用" 
class="title">类 org.trafodion.dcs.master.listener.Util<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.master.listener.Util的用法</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/master/listener/Util.html" 
title="org.trafodion.dcs.master.listener中的类">类</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/master/listener/class-use/Util.html"
 target="_top">框架</a></li>
+<li><a href="Util.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/master/listener/package-frame.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-frame.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-frame.html
index 838a921..62e6c25 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-frame.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/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">
@@ -26,3 +27,33 @@
 </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.master.listener (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/master/listener/package-summary.html" 
target="classFrame">org.trafodion.dcs.master.listener</a></h1>
+<div class="indexContainer">
+<h2 title="ç±»">ç±»</h2>
+<ul title="ç±»">
+<li><a href="ClientData.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">ClientData</a></li>
+<li><a href="ListenerConstants.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">ListenerConstants</a></li>
+<li><a href="ListenerMetrics.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">ListenerMetrics</a></li>
+<li><a href="ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">ListenerService</a></li>
+<li><a href="ListenerWorker.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">ListenerWorker</a></li>
+<li><a href="RequestCancelQuery.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">RequestCancelQuery</a></li>
+<li><a href="RequestGetObjectRef.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">RequestGetObjectRef</a></li>
+<li><a href="RequestUnknown.html" 
title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">RequestUnknown</a></li>
+<li><a href="Util.html" title="org.trafodion.dcs.master.listener中的类" 
target="classFrame">Util</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/master/listener/package-summary.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-summary.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-summary.html
index aee4708..c772b4b 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-summary.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/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">
@@ -169,3 +170,172 @@
 <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.master.listener (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.master.listener (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/master/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/script/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/master/listener/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.master.listener</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/master/listener/ClientData.html" 
title="org.trafodion.dcs.master.listener中的类">ClientData</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerConstants.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerConstants</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerMetrics.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerMetrics</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerService</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerWorker.html" 
title="org.trafodion.dcs.master.listener中的类">ListenerWorker</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/RequestCancelQuery.html" 
title="org.trafodion.dcs.master.listener中的类">RequestCancelQuery</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/RequestGetObjectRef.html"
 title="org.trafodion.dcs.master.listener中的类">RequestGetObjectRef</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/RequestUnknown.html" 
title="org.trafodion.dcs.master.listener中的类">RequestUnknown</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/master/listener/Util.html" 
title="org.trafodion.dcs.master.listener中的类">Util</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/master/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/script/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/master/listener/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/master/listener/package-tree.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-tree.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-tree.html
index 1fbd3f1..c7fc0f7 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-tree.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/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">
@@ -144,3 +145,147 @@
 <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.master.listener 类分层结构 (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.master.listener 
\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/master/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/script/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/master/listener/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.master.listener的分层结构</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.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/ClientData.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ClientData</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerConstants.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerConstants</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerMetrics.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerMetrics</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/RequestCancelQuery.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">RequestCancelQuery</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/RequestGetObjectRef.html"
 title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">RequestGetObjectRef</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/RequestUnknown.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">RequestUnknown</span></a></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.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerService</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/ListenerWorker.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerWorker</span></a></li>
+</ul>
+</li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="../../../../../org/trafodion/dcs/master/listener/Util.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">Util</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>ç±»</li>
+<li>使用</li>
+<li class="navBarCell1Rev">树</li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a 
href="../../../../../org/trafodion/dcs/master/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/script/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/master/listener/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/master/listener/package-use.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-use.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-use.html
index 6f7662d..b6ecc57 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/package-use.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/listener/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">
@@ -171,3 +172,174 @@
 <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.master.listener的使用 (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.master.listener\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/master/listener/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.master.listener 的使用" 
class="title">程序包 org.trafodion.dcs.master.listener<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/master/listener/package-summary.html">org.trafodion.dcs.master.listener</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.master">org.trafodion.dcs.master</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.master.listener">org.trafodion.dcs.master.listener</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.master">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span><a 
href="../../../../../org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</a>使用的<a
 
href="../../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</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/master/listener/class-use/ListenerService.html#org.trafodion.dcs.master">ListenerService</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.master.listener">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span><a 
href="../../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</a>使用的<a
 
href="../../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</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/master/listener/class-use/ListenerService.html#org.trafodion.dcs.master.listener">ListenerService</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/master/listener/package-use.html"
 target="_top">框架</a></li>
+<li><a href="package-use.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-frame.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-frame.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-frame.html
index cc7c91f..398de48 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-frame.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/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">
@@ -28,3 +29,35 @@
 </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.master (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/master/package-summary.html" 
target="classFrame">org.trafodion.dcs.master</a></h1>
+<div class="indexContainer">
+<h2 title="ç±»">ç±»</h2>
+<ul title="ç±»">
+<li><a href="DcsMaster.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">DcsMaster</a></li>
+<li><a href="FloatingIp.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">FloatingIp</a></li>
+<li><a href="MasterLeaderElection.html" 
title="org.trafodion.dcs.master中的类" 
target="classFrame">MasterLeaderElection</a></li>
+<li><a href="MasterStatusServlet.html" 
title="org.trafodion.dcs.master中的类" 
target="classFrame">MasterStatusServlet</a></li>
+<li><a href="Metrics.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">Metrics</a></li>
+<li><a href="QueryPlanModel.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">QueryPlanModel</a></li>
+<li><a href="QueryPlanResponse.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">QueryPlanResponse</a></li>
+<li><a href="RegisteredServer.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">RegisteredServer</a></li>
+<li><a href="RunningServer.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">RunningServer</a></li>
+<li><a href="ServerItem.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">ServerItem</a></li>
+<li><a href="ServerManager.html" title="org.trafodion.dcs.master中的类" 
target="classFrame">ServerManager</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/master/package-summary.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-summary.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-summary.html
index 81b39ff..b12d849 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-summary.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/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">
@@ -95,6 +96,101 @@
 <tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/trafodion/dcs/master/MasterStatusServlet.html" 
title="class in org.trafodion.dcs.master">MasterStatusServlet</a></td>
 <td class="colLast">
+=======
+<!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.master (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.master (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/http/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../org/trafodion/dcs/master/listener/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/master/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.master</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/master/DcsMaster.html" 
title="org.trafodion.dcs.master中的类">DcsMaster</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/trafodion/dcs/master/FloatingIp.html" 
title="org.trafodion.dcs.master中的类">FloatingIp</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../org/trafodion/dcs/master/MasterLeaderElection.html" 
title="org.trafodion.dcs.master中的类">MasterLeaderElection</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/trafodion/dcs/master/MasterStatusServlet.html" 
title="org.trafodion.dcs.master中的类">MasterStatusServlet</a></td>
+<td class="colLast">
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">The servlet responsible for rendering the index page of the
  master.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-tree.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-tree.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-tree.html
index 803f53a..0c9ec0c 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/package-tree.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/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">
@@ -152,3 +153,155 @@
 <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.master 类分层结构 (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.master 
\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/http/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../org/trafodion/dcs/master/listener/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/master/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.master的分层结构</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.master.<a 
href="../../../../org/trafodion/dcs/master/DcsMaster.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">DcsMaster</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>)</li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/FloatingIp.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">FloatingIp</span></a></li>
+<li type="circle">javax.servlet.GenericServlet (implements java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true";
 title="java.io中的类或接口">Serializable</a>, javax.servlet.Servlet, 
javax.servlet.ServletConfig)
+<ul>
+<li type="circle">javax.servlet.http.HttpServlet (implements java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true";
 title="java.io中的类或接口">Serializable</a>)
+<ul>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/MasterStatusServlet.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">MasterStatusServlet</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/MasterLeaderElection.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">MasterLeaderElection</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/Metrics.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">Metrics</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/QueryPlanModel.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanModel</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/QueryPlanModel.PlanSummaryInfo.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanModel.PlanSummaryInfo</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanModel.QueryPlanData</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/QueryPlanResponse.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanResponse</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/RegisteredServer.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">RegisteredServer</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/RunningServer.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">RunningServer</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/ServerItem.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">ServerItem</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="../../../../org/trafodion/dcs/master/ServerManager.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">ServerManager</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>
+</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/http/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../org/trafodion/dcs/master/listener/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/master/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*

Reply via email to