trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From li...@apache.org
Subject [13/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*
Date Fri, 06 Jul 2018 03:58:51 GMT
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsNetworkConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsNetworkConfiguration.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsNetworkConfiguration.html
index d82536e..7cb4fd1 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsNetworkConfiguration.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsNetworkConfiguration.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">
@@ -316,3 +317,319 @@
 <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.util.DcsNetworkConfiguration的使用 (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.util.DcsNetworkConfiguration\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/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/DcsNetworkConfiguration.html" target="_top">框架</a></li>
+<li><a href="DcsNetworkConfiguration.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.util.DcsNetworkConfiguration 的使用" class="title">类 org.trafodion.dcs.util.DcsNetworkConfiguration<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/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</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>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.server">org.trafodion.dcs.server</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt">org.trafodion.dcs.servermt</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverHandler">org.trafodion.dcs.servermt.serverHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.util">org.trafodion.dcs.util</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/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</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/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a></code></td>
+<td class="colLast"><span class="strong">DcsMaster.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/DcsMaster.html#getNetConf()">getNetConf</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</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/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</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>
+<li class="blockList"><a name="org.trafodion.dcs.server">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</a>中<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的<a href="../../../../../org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</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/server/ServerManager.html#ServerManager(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20java.lang.String,%20int,%20int)">ServerManager</a></strong>(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,
+             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;instance,
+             int&nbsp;infoPort,
+             int&nbsp;childServers)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>中<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的<a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/servermt/ServerManager.html#ServerManager(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20java.lang.String,%20int,%20int)">ServerManager</a></strong>(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,
+             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;instance,
+             int&nbsp;infoPort,
+             int&nbsp;serverThreads)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverHandler">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>中<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的<a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html#ServerHandler(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20int,%20int,%20java.lang.String,%20org.trafodion.dcs.util.RetryCounterFactory,%20int,%20byte[],%20int)">ServerHandler</a></strong>(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,
+             int&nbsp;instance,
+             int&nbsp;infoPort,
+             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;masterHostName,
+             <a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">RetryCounterFactory</a>&nbsp;retryCounterFactory,
+             int&nbsp;assignedPort,
+             byte[]&nbsp;cert,
+             int&nbsp;serverThread)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.util">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</a>中<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的<a href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</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">JdbcT4Util.</span><code><strong><a href="../../../../../org/trafodion/dcs/util/JdbcT4Util.html#init(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.util.DcsNetworkConfiguration)">init</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+    <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>的<a href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</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/util/JdbcT4Util.html#JdbcT4Util(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.util.DcsNetworkConfiguration)">JdbcT4Util</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+          <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf)</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/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/DcsNetworkConfiguration.html" target="_top">框架</a></li>
+<li><a href="DcsNetworkConfiguration.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/util/class-use/GetJavaProperty.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/GetJavaProperty.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/GetJavaProperty.html
index 4a3c77c..368e5f8 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/GetJavaProperty.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/GetJavaProperty.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.util.GetJavaProperty的使用 (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.util.GetJavaProperty\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/util/GetJavaProperty.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/GetJavaProperty.html" target="_top">框架</a></li>
+<li><a href="GetJavaProperty.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.util.GetJavaProperty 的使用" class="title">类 org.trafodion.dcs.util.GetJavaProperty<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.util.GetJavaProperty的用法</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/util/GetJavaProperty.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/GetJavaProperty.html" target="_top">框架</a></li>
+<li><a href="GetJavaProperty.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/util/class-use/InfoServer.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/InfoServer.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/InfoServer.html
index 3578933..62e8e1f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/InfoServer.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/InfoServer.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="en">
@@ -181,3 +182,184 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.util.InfoServer的使用 (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.util.InfoServer\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/util/InfoServer.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/InfoServer.html" target="_top">框架</a></li>
+<li><a href="InfoServer.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.util.InfoServer 的使用" class="title">类 org.trafodion.dcs.util.InfoServer<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/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</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.server">org.trafodion.dcs.server</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt">org.trafodion.dcs.servermt</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.server">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</a>中<a href="../../../../../org/trafodion/dcs/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</a>的<a href="../../../../../org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</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/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</a></code></td>
+<td class="colLast"><span class="strong">DcsServer.</span><code><strong><a href="../../../../../org/trafodion/dcs/server/DcsServer.html#getInfoServer()">getInfoServer</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>中<a href="../../../../../org/trafodion/dcs/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</a>的<a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>中的方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/trafodion/dcs/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</a></code></td>
+<td class="colLast"><span class="strong">DcsServer.</span><code><strong><a href="../../../../../org/trafodion/dcs/servermt/DcsServer.html#getInfoServer()">getInfoServer</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/util/InfoServer.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/InfoServer.html" target="_top">框架</a></li>
+<li><a href="InfoServer.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/util/class-use/JdbcT2Util.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT2Util.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT2Util.html
index f6a597f..a403641 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT2Util.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT2Util.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.util.JdbcT2Util的使用 (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.util.JdbcT2Util\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/util/JdbcT2Util.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/JdbcT2Util.html" target="_top">框架</a></li>
+<li><a href="JdbcT2Util.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.util.JdbcT2Util 的使用" class="title">类 org.trafodion.dcs.util.JdbcT2Util<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.util.JdbcT2Util的用法</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/util/JdbcT2Util.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/JdbcT2Util.html" target="_top">框架</a></li>
+<li><a href="JdbcT2Util.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/util/class-use/JdbcT4Util.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT4Util.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT4Util.html
index e85a389..042bf46 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT4Util.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/JdbcT4Util.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">
@@ -180,3 +181,183 @@
 <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.util.JdbcT4Util的使用 (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.util.JdbcT4Util\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/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/JdbcT4Util.html" target="_top">框架</a></li>
+<li><a href="JdbcT4Util.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.util.JdbcT4Util 的使用" class="title">类 org.trafodion.dcs.util.JdbcT4Util<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/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">JdbcT4Util</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/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">JdbcT4Util</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">JdbcT4Util</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/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">JdbcT4Util</a></code></td>
+<td class="colLast"><span class="strong">ServerManager.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/ServerManager.html#getJdbcT4Util()">getJdbcT4Util</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">JdbcT4Util</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#GeneratePlan(org.trafodion.dcs.util.JdbcT4Util,%20java.lang.String,%20java.lang.String)">GeneratePlan</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>
+<tr class="rowColor">
+<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>
+</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/util/JdbcT4Util.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/JdbcT4Util.html" target="_top">框架</a></li>
+<li><a href="JdbcT4Util.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/util/class-use/Log4jUtils.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Log4jUtils.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Log4jUtils.html
index 3aba1e4..00bbc53 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Log4jUtils.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Log4jUtils.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.util.Log4jUtils的使用 (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.util.Log4jUtils\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/util/Log4jUtils.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/Log4jUtils.html" target="_top">框架</a></li>
+<li><a href="Log4jUtils.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.util.Log4jUtils 的使用" class="title">类 org.trafodion.dcs.util.Log4jUtils<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.util.Log4jUtils的用法</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/util/Log4jUtils.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/Log4jUtils.html" target="_top">框架</a></li>
+<li><a href="Log4jUtils.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/util/class-use/RetryCounter.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounter.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounter.html
index 1c96281..960e216 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounter.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounter.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">
@@ -170,3 +171,173 @@
 <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.util.RetryCounter的使用 (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.util.RetryCounter\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/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/RetryCounter.html" target="_top">框架</a></li>
+<li><a href="RetryCounter.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.util.RetryCounter 的使用" class="title">类 org.trafodion.dcs.util.RetryCounter<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/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">RetryCounter</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.util">org.trafodion.dcs.util</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.util">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</a>中<a href="../../../../../org/trafodion/dcs/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">RetryCounter</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">RetryCounter</a>的<a href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</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/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">RetryCounter</a></code></td>
+<td class="colLast"><span class="strong">RetryCounterFactory.</span><code><strong><a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html#create()">create</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/trafodion/dcs/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">RetryCounter</a></code></td>
+<td class="colLast"><span class="strong">RetryCounterFactory.</span><code><strong><a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html#create(int,%20int)">create</a></strong>(int&nbsp;maxRetries,
+      int&nbsp;retryIntervalMillis)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/trafodion/dcs/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">RetryCounter</a></code></td>
+<td class="colLast"><span class="strong">RetryCounterFactory.</span><code><strong><a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html#create(int,%20int,%20java.util.concurrent.TimeUnit)">create</a></strong>(int&nbsp;maxRetries,
+      int&nbsp;retryInterval,
+      <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/TimeUnit.html?is-external=true" title="java.util.concurrent中的类或接口">TimeUnit</a>&nbsp;timeUnit)</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/util/RetryCounter.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/RetryCounter.html" target="_top">框架</a></li>
+<li><a href="RetryCounter.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/util/class-use/RetryCounterFactory.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounterFactory.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounterFactory.html
index 6843c40..87e9253 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounterFactory.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/RetryCounterFactory.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">
@@ -166,3 +167,169 @@
 <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.util.RetryCounterFactory的使用 (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.util.RetryCounterFactory\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/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/RetryCounterFactory.html" target="_top">框架</a></li>
+<li><a href="RetryCounterFactory.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.util.RetryCounterFactory 的使用" class="title">类 org.trafodion.dcs.util.RetryCounterFactory<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/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">RetryCounterFactory</a>的程序包</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">程序包</th>
+<th class="colLast" scope="col">说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverHandler">org.trafodion.dcs.servermt.serverHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverHandler">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>中<a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">RetryCounterFactory</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">RetryCounterFactory</a>的<a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html#ServerHandler(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20int,%20int,%20java.lang.String,%20org.trafodion.dcs.util.RetryCounterFactory,%20int,%20byte[],%20int)">ServerHandler</a></strong>(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,
+             int&nbsp;instance,
+             int&nbsp;infoPort,
+             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;masterHostName,
+             <a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">RetryCounterFactory</a>&nbsp;retryCounterFactory,
+             int&nbsp;assignedPort,
+             byte[]&nbsp;cert,
+             int&nbsp;serverThread)</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/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/RetryCounterFactory.html" target="_top">框架</a></li>
+<li><a href="RetryCounterFactory.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/util/class-use/SqlUtils.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/SqlUtils.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/SqlUtils.html
index 18baeca..a8a1a00 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/SqlUtils.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/SqlUtils.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.util.SqlUtils的使用 (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.util.SqlUtils\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/util/SqlUtils.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/SqlUtils.html" target="_top">框架</a></li>
+<li><a href="SqlUtils.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.util.SqlUtils 的使用" class="title">类 org.trafodion.dcs.util.SqlUtils<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.util.SqlUtils的用法</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/util/SqlUtils.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/SqlUtils.html" target="_top">框架</a></li>
+<li><a href="SqlUtils.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/util/class-use/Strings.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Strings.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Strings.html
index c251fd0..92f49d7 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Strings.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Strings.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.util.Strings的使用 (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.util.Strings\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/util/Strings.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/Strings.html" target="_top">框架</a></li>
+<li><a href="Strings.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.util.Strings 的使用" class="title">类 org.trafodion.dcs.util.Strings<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.util.Strings的用法</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/util/Strings.html" title="org.trafodion.dcs.util中的类">类</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/util/class-use/Strings.html" target="_top">框架</a></li>
+<li><a href="Strings.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*


Mime
View raw message