You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/07/06 03:59:17 UTC

[39/51] [abbrv] [partial] trafodion-site git commit: Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/FloatingIp.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/FloatingIp.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/FloatingIp.html
index 2f635da..8bc9951 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/FloatingIp.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/FloatingIp.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">
@@ -159,3 +160,162 @@
 <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.FloatingIp的使用 (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.FloatingIp\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/FloatingIp.html" title="org.trafodion.dcs.master中的类">类</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/class-use/FloatingIp.html" target="_top">框架</a></li>
+<li><a href="FloatingIp.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.FloatingIp 的使用" class="title">类 org.trafodion.dcs.master.FloatingIp<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/FloatingIp.html" title="org.trafodion.dcs.master中的类">FloatingIp</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>
+</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/FloatingIp.html" title="org.trafodion.dcs.master中的类">FloatingIp</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/master/FloatingIp.html" title="org.trafodion.dcs.master中的类">FloatingIp</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>static <a href="../../../../../org/trafodion/dcs/master/FloatingIp.html" title="org.trafodion.dcs.master中的类">FloatingIp</a></code></td>
+<td class="colLast"><span class="strong">FloatingIp.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/FloatingIp.html#getInstance(org.trafodion.dcs.master.DcsMaster)">getInstance</a></strong>(<a href="../../../../../org/trafodion/dcs/master/DcsMaster.html" title="org.trafodion.dcs.master中的类">DcsMaster</a>&nbsp;master)</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/FloatingIp.html" title="org.trafodion.dcs.master中的类">类</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/class-use/FloatingIp.html" target="_top">框架</a></li>
+<li><a href="FloatingIp.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/class-use/MasterLeaderElection.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterLeaderElection.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterLeaderElection.html
index 04313aa..6ca4e07 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterLeaderElection.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterLeaderElection.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.MasterLeaderElection的使用 (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.MasterLeaderElection\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/MasterLeaderElection.html" title="org.trafodion.dcs.master中的类">类</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/class-use/MasterLeaderElection.html" target="_top">框架</a></li>
+<li><a href="MasterLeaderElection.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.MasterLeaderElection 的使用" class="title">类 org.trafodion.dcs.master.MasterLeaderElection<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.master.MasterLeaderElection的用法</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/MasterLeaderElection.html" title="org.trafodion.dcs.master中的类">类</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/class-use/MasterLeaderElection.html" target="_top">框架</a></li>
+<li><a href="MasterLeaderElection.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/class-use/MasterStatusServlet.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterStatusServlet.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterStatusServlet.html
index d316ea9..3546afd 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterStatusServlet.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/MasterStatusServlet.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.MasterStatusServlet的使用 (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.MasterStatusServlet\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/MasterStatusServlet.html" title="org.trafodion.dcs.master中的类">类</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/class-use/MasterStatusServlet.html" target="_top">框架</a></li>
+<li><a href="MasterStatusServlet.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.MasterStatusServlet 的使用" class="title">类 org.trafodion.dcs.master.MasterStatusServlet<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.master.MasterStatusServlet的用法</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/MasterStatusServlet.html" title="org.trafodion.dcs.master中的类">类</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/class-use/MasterStatusServlet.html" target="_top">框架</a></li>
+<li><a href="MasterStatusServlet.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/class-use/Metrics.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/Metrics.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/Metrics.html
index 53e70bc..83cc40c 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/Metrics.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/Metrics.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">
@@ -202,3 +203,205 @@
 <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.Metrics的使用 (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.Metrics\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/Metrics.html" title="org.trafodion.dcs.master中的类">类</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/class-use/Metrics.html" target="_top">框架</a></li>
+<li><a href="Metrics.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.Metrics 的使用" class="title">类 org.trafodion.dcs.master.Metrics<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/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</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/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</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="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/master/ServerManager.html#ServerManager(org.trafodion.dcs.master.DcsMaster,%20org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20long,%20org.trafodion.dcs.master.Metrics)">ServerManager</a></strong>(<a href="../../../../../org/trafodion/dcs/master/DcsMaster.html" title="org.trafodion.dcs.master中的类">DcsMaster</a>&nbsp;master,
+             org.apache.hadoop.conf.Configuration&nbsp;conf,
+             <a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc,
+             <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf,
+             long&nbsp;startupTimestamp,
+             <a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</a>&nbsp;metrics)</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/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表字段和解释">
+<caption><span>声明为<a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</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><a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</a></code></td>
+<td class="colLast"><span class="strong">ListenerService.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/listener/ListenerService.html#metrics">metrics</a></strong></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</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="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/master/listener/ListenerService.html#ListenerService(org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20int,%20int,%20int,%20int,%20org.trafodion.dcs.master.Metrics,%20java.lang.String)">ListenerService</a></strong>(<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc,
+               <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf,
+               int&nbsp;port,
+               int&nbsp;portRange,
+               int&nbsp;requestTimeout,
+               int&nbsp;selectorTimeout,
+               <a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</a>&nbsp;metrics,
+               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;parentZnode)</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/Metrics.html" title="org.trafodion.dcs.master中的类">类</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/class-use/Metrics.html" target="_top">框架</a></li>
+<li><a href="Metrics.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/class-use/QueryPlanModel.PlanSummaryInfo.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.PlanSummaryInfo.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.PlanSummaryInfo.html
index e67e4a0..4100700 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.PlanSummaryInfo.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.PlanSummaryInfo.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -172,3 +173,175 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.master.QueryPlanModel.PlanSummaryInfo的使用 (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.QueryPlanModel.PlanSummaryInfo\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/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanModel.PlanSummaryInfo.html" target="_top">框架</a></li>
+<li><a href="QueryPlanModel.PlanSummaryInfo.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.QueryPlanModel.PlanSummaryInfo 的使用" class="title">类 org.trafodion.dcs.master.QueryPlanModel.PlanSummaryInfo<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/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.PlanSummaryInfo</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>
+</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/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.PlanSummaryInfo</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.PlanSummaryInfo</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/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.PlanSummaryInfo</a></code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#getPlanSummaryInfo()">getPlanSummaryInfo</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.PlanSummaryInfo</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>void</code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#setPlanSummaryInfo(org.trafodion.dcs.master.QueryPlanModel.PlanSummaryInfo)">setPlanSummaryInfo</a></strong>(<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.PlanSummaryInfo</a>&nbsp;_planSummaryInfo)</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/QueryPlanModel.PlanSummaryInfo.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanModel.PlanSummaryInfo.html" target="_top">框架</a></li>
+<li><a href="QueryPlanModel.PlanSummaryInfo.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/class-use/QueryPlanModel.QueryPlanData.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.QueryPlanData.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.QueryPlanData.html
index 43772de..5d7030c 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.QueryPlanData.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.QueryPlanData.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">
@@ -221,3 +222,224 @@
 <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.QueryPlanModel.QueryPlanData的使用 (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.QueryPlanModel.QueryPlanData\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/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanModel.QueryPlanData.html" target="_top">框架</a></li>
+<li><a href="QueryPlanModel.QueryPlanData.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.QueryPlanModel.QueryPlanData 的使用" class="title">类 org.trafodion.dcs.master.QueryPlanModel.QueryPlanData<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/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</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>
+</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/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表字段和解释">
+<caption><span>类型参数类型为<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</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="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="java.util中的类或接口">ArrayList</a>&lt;<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a>&gt;</code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#QueryPlanArray">QueryPlanArray</a></strong></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</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/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a></code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#getQueryPlanData()">getQueryPlanData</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a></code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#getRootPlan()">getRootPlan</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回变量类型为<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</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="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="java.util中的类或接口">ArrayList</a>&lt;<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a>&gt;</code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#GetPlan(org.trafodion.dcs.util.JdbcT4Util,%20java.lang.String,%20java.lang.String)">GetPlan</a></strong>(<a href="../../../../../org/trafodion/dcs/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">JdbcT4Util</a>&nbsp;jdbcT4Util,
+       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;queryText,
+       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;controlStmts)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</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>void</code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#setQueryPlanData(org.trafodion.dcs.master.QueryPlanModel.QueryPlanData)">setQueryPlanData</a></strong>(<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a>&nbsp;_queryPlanData)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#setRootPlan(org.trafodion.dcs.master.QueryPlanModel.QueryPlanData)">setRootPlan</a></strong>(<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a>&nbsp;_rootPlan)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>类型变量类型为<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</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>void</code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#CreateSummary(java.util.ArrayList)">CreateSummary</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="java.util中的类或接口">ArrayList</a>&lt;<a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">QueryPlanModel.QueryPlanData</a>&gt;&nbsp;qpa)</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/QueryPlanModel.QueryPlanData.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanModel.QueryPlanData.html" target="_top">框架</a></li>
+<li><a href="QueryPlanModel.QueryPlanData.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/class-use/QueryPlanModel.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.html
index 395e682..4512a3f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanModel.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.QueryPlanModel的使用 (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.QueryPlanModel\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/QueryPlanModel.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanModel.html" target="_top">框架</a></li>
+<li><a href="QueryPlanModel.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.QueryPlanModel 的使用" class="title">类 org.trafodion.dcs.master.QueryPlanModel<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.master.QueryPlanModel的用法</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/QueryPlanModel.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanModel.html" target="_top">框架</a></li>
+<li><a href="QueryPlanModel.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/class-use/QueryPlanResponse.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanResponse.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanResponse.html
index bbd1471..29e5f29 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanResponse.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/QueryPlanResponse.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.master.QueryPlanResponse的使用 (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.QueryPlanResponse\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/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanResponse.html" target="_top">框架</a></li>
+<li><a href="QueryPlanResponse.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.QueryPlanResponse 的使用" class="title">类 org.trafodion.dcs.master.QueryPlanResponse<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/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</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>
+</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/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/master/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</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/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</a></code></td>
+<td class="colLast"><span class="strong">QueryPlanModel.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanModel.html#getQueryPlanResponse()">getQueryPlanResponse</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回变量类型为<a href="../../../../../org/trafodion/dcs/master/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</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="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="java.util中的类或接口">ArrayList</a>&lt;<a href="../../../../../org/trafodion/dcs/master/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</a>&gt;</code></td>
+<td class="colLast"><span class="strong">QueryPlanResponse.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanResponse.html#getChildren()">getChildren</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>类型变量类型为<a href="../../../../../org/trafodion/dcs/master/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</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>void</code></td>
+<td class="colLast"><span class="strong">QueryPlanResponse.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/QueryPlanResponse.html#setChildren(java.util.ArrayList)">setChildren</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="java.util中的类或接口">ArrayList</a>&lt;<a href="../../../../../org/trafodion/dcs/master/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">QueryPlanResponse</a>&gt;&nbsp;children)</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/QueryPlanResponse.html" title="org.trafodion.dcs.master中的类">类</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/class-use/QueryPlanResponse.html" target="_top">框架</a></li>
+<li><a href="QueryPlanResponse.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/class-use/RegisteredServer.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RegisteredServer.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RegisteredServer.html
index e6e597c..f7b34f0 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RegisteredServer.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RegisteredServer.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -172,3 +173,175 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.master.RegisteredServer的使用 (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.RegisteredServer\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/RegisteredServer.html" title="org.trafodion.dcs.master中的类">类</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/class-use/RegisteredServer.html" target="_top">框架</a></li>
+<li><a href="RegisteredServer.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.RegisteredServer 的使用" class="title">类 org.trafodion.dcs.master.RegisteredServer<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/RegisteredServer.html" title="org.trafodion.dcs.master中的类">RegisteredServer</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>
+</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/RegisteredServer.html" title="org.trafodion.dcs.master中的类">RegisteredServer</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/master/RegisteredServer.html" title="org.trafodion.dcs.master中的类">RegisteredServer</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/RegisteredServer.html" title="org.trafodion.dcs.master中的类">RegisteredServer</a></code></td>
+<td class="colLast"><span class="strong">RunningServer.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/RunningServer.html#getItem(int)">getItem</a></strong>(int&nbsp;index)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回变量类型为<a href="../../../../../org/trafodion/dcs/master/RegisteredServer.html" title="org.trafodion.dcs.master中的类">RegisteredServer</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="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="java.util中的类或接口">ArrayList</a>&lt;<a href="../../../../../org/trafodion/dcs/master/RegisteredServer.html" title="org.trafodion.dcs.master中的类">RegisteredServer</a>&gt;</code></td>
+<td class="colLast"><span class="strong">RunningServer.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/RunningServer.html#getRegistered()">getRegistered</a></strong>()</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/RegisteredServer.html" title="org.trafodion.dcs.master中的类">类</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/class-use/RegisteredServer.html" target="_top">框架</a></li>
+<li><a href="RegisteredServer.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/class-use/RunningServer.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RunningServer.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RunningServer.html
index 2dd7ae6..8ce95e1 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RunningServer.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/master/class-use/RunningServer.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">
@@ -159,3 +160,162 @@
 <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.RunningServer的使用 (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.RunningServer\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/RunningServer.html" title="org.trafodion.dcs.master中的类">类</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/class-use/RunningServer.html" target="_top">框架</a></li>
+<li><a href="RunningServer.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.RunningServer 的使用" class="title">类 org.trafodion.dcs.master.RunningServer<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/RunningServer.html" title="org.trafodion.dcs.master中的类">RunningServer</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>
+</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/RunningServer.html" title="org.trafodion.dcs.master中的类">RunningServer</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回变量类型为<a href="../../../../../org/trafodion/dcs/master/RunningServer.html" title="org.trafodion.dcs.master中的类">RunningServer</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="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="java.util中的类或接口">List</a>&lt;<a href="../../../../../org/trafodion/dcs/master/RunningServer.html" title="org.trafodion.dcs.master中的类">RunningServer</a>&gt;</code></td>
+<td class="colLast"><span class="strong">ServerManager.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/ServerManager.html#getServersList()">getServersList</a></strong>()</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/RunningServer.html" title="org.trafodion.dcs.master中的类">类</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/class-use/RunningServer.html" target="_top">框架</a></li>
+<li><a href="RunningServer.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*