http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/Metrics.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/Metrics.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/Metrics.html
index 3e33aca..8677d61 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/Metrics.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/servermt/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">
@@ -277,3 +278,280 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>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="Metrics (Trafodion Database Connectivity 
Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/Metrics.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/servermt/DcsServer.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/servermt/ServerConstants.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/servermt/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>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.servermt</div>
+<h2 title="ç±» Metrics" class="title">ç±» Metrics</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.servermt.Metrics</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">Metrics</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/servermt/Metrics.html#Metrics()">Metrics</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/servermt/Metrics.html#getLoad()">getLoad</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/servermt/Metrics.html#toString()">toString</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()"
 title="java.lang中的类或接口">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)"
 title="java.lang中的类或接口">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()"
 title="java.lang中的类或接口">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()"
 title="java.lang中的类或接口">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()"
 title="java.lang中的类或接口">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()"
 title="java.lang中的类或接口">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)"
 title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a name="Metrics()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Metrics</h4>
+<pre>public&nbsp;Metrics()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="getLoad()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLoad</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;getLoad()</pre>
+</li>
+</ul>
+<a name="toString()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;toString()</pre>
+<dl>
+<dt><strong>覆盖:</strong></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()"
 
title="java.lang中的类或接口">toString</a></code>&nbsp;在类中&nbsp;<code><a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/Metrics.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/servermt/DcsServer.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/servermt/ServerConstants.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/servermt/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>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

Reply via email to