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 © 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>æ¦è¦: </li>
+<li>åµå¥ | </li>
+<li>åæ®µ | </li>
+<li><a href="#constructor_summary">æé å¨</a> | </li>
+<li><a href="#method_summary">æ¹æ³</a></li>
+</ul>
+<ul class="subNavList">
+<li>详ç»èµæ: </li>
+<li>åæ®µ | </li>
+<li><a href="#constructor_detail">æé å¨</a> | </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"> </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> </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"> </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> </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> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!-- -->
+</a>
+<h3>ä»ç±»ç»§æ¿çæ¹æ³ 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 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 <a
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"
title="java.langä¸çç±»ææ¥å£">String</a> getLoad()</pre>
+</li>
+</ul>
+<a name="toString()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"
title="java.langä¸çç±»ææ¥å£">String</a> 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> å¨ç±»ä¸ <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>æ¦è¦: </li>
+<li>åµå¥ | </li>
+<li>åæ®µ | </li>
+<li><a href="#constructor_summary">æé å¨</a> | </li>
+<li><a href="#method_summary">æ¹æ³</a></li>
+</ul>
+<ul class="subNavList">
+<li>详ç»èµæ: </li>
+<li>åæ®µ | </li>
+<li><a href="#constructor_detail">æé å¨</a> | </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 © 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*