http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/SqlUtils.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/SqlUtils.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/SqlUtils.html
index 64a9e83..5d5bf00 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/SqlUtils.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/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">
@@ -535,3 +536,538 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>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="SqlUtils (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/SqlUtils.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/util/RetryCounterFactory.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/Strings.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/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>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">字段</a>&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li><a href="#field_detail">字段</a>&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.util</div>
+<h2 title="ç±» SqlUtils" class="title">ç±» SqlUtils</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.util.SqlUtils</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">SqlUtils</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_summary">
+<!--   -->
+</a>
+<h3>字段概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="字段概要表, 列表字段和解释">
+<caption><span>字段</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">字段和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#SQLCHARSET_ISO88591">SQLCHARSET_ISO88591</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#SQLCHARSET_UNICODE">SQLCHARSET_UNICODE</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#SQLCHARSETCODE_ISO88591">SQLCHARSETCODE_ISO88591</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#SQLCHARSETCODE_SJIS">SQLCHARSETCODE_SJIS</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#SQLCHARSETCODE_UNICODE">SQLCHARSETCODE_UNICODE</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#SQLCHARSETCODE_UTF8">SQLCHARSETCODE_UTF8</a></strong></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/math/BigDecimal.html?is-external=true";
 title="java.math中的类或接口">BigDecimal</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#convertSQLBigNumToBigDecimal(java.nio.ByteBuffer,%20int,%20int,%20boolean)">convertSQLBigNumToBigDecimal</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;sourceData,
+                            int&nbsp;len,
+                            int&nbsp;scale,
+                            boolean&nbsp;isUnSigned)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static byte[]</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#formatSqlT4Output(org.trafodion.dcs.servermt.serverDriverInputOutput.Descriptor2,%20byte[],%20long,%20byte[],%20java.nio.ByteOrder)">formatSqlT4Output</a></strong>(<a
 
href="../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.html"
 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Descriptor2</a>&nbsp;dsc,
+                 byte[]&nbsp;sqlarray,
+                 long&nbsp;curOutPos,
+                 byte[]&nbsp;outValues,
+                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteOrder.html?is-external=true";
 title="java.nio中的类或接口">ByteOrder</a>&nbsp;bo)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/math/BigDecimal.html?is-external=true";
 title="java.math中的类或接口">BigDecimal</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#getBigDecimalValue(java.lang.Object)">getBigDecimalValue</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 
title="java.lang中的类或接口">Object</a>&nbsp;paramValue)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getCharsetName(int)">getCharsetName</a></strong>(int&nbsp;charset)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#getCharsetValue(java.lang.String)">getCharsetValue</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;charset)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getComponentId(int)">getComponentId</a></strong>(int&nbsp;componentId)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getDataType(int)">getDataType</a></strong>(int&nbsp;dataType)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getSqlAttrType(int)">getSqlAttrType</a></strong>(int&nbsp;code)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getSqlCharsetName(int)">getSqlCharsetName</a></strong>(int&nbsp;code)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getSqlDataType(int)">getSqlDataType</a></strong>(int&nbsp;code)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getSqlError(int)">getSqlError</a></strong>(int&nbsp;retcode)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getSqlQueryStatementType(int)">getSqlQueryStatementType</a></strong>(int&nbsp;stmtType)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/util/SqlUtils.html#getSqlStatementType(short)">getSqlStatementType</a></strong>(short&nbsp;stmtType)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#getSqlStmtType(int)">getSqlStmtType</a></strong>(int&nbsp;stmtType)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static short</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html#getSqlStmtType(java.lang.String)">getSqlStmtType</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;str)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()"
 title="java.lang中的类或接口">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)"
 title="java.lang中的类或接口">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()"
 title="java.lang中的类或接口">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()"
 title="java.lang中的类或接口">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()"
 title="java.lang中的类或接口">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()"
 title="java.lang中的类或接口">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()"
 title="java.lang中的类或接口">toString</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">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_detail">
+<!--   -->
+</a>
+<h3>字段详细资料</h3>
+<a name="SQLCHARSETCODE_ISO88591">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SQLCHARSETCODE_ISO88591</h4>
+<pre>public static final&nbsp;int SQLCHARSETCODE_ISO88591</pre>
+<dl><dt><span class="strong">另请参阅:</span></dt><dd><a 
href="../../../../constant-values.html#org.trafodion.dcs.util.SqlUtils.SQLCHARSETCODE_ISO88591">常量字段值</a></dd></dl>
+</li>
+</ul>
+<a name="SQLCHARSET_ISO88591">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SQLCHARSET_ISO88591</h4>
+<pre>public static final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a> SQLCHARSET_ISO88591</pre>
+<dl><dt><span class="strong">另请参阅:</span></dt><dd><a 
href="../../../../constant-values.html#org.trafodion.dcs.util.SqlUtils.SQLCHARSET_ISO88591">常量字段值</a></dd></dl>
+</li>
+</ul>
+<a name="SQLCHARSETCODE_UNICODE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SQLCHARSETCODE_UNICODE</h4>
+<pre>public static final&nbsp;int SQLCHARSETCODE_UNICODE</pre>
+<dl><dt><span class="strong">另请参阅:</span></dt><dd><a 
href="../../../../constant-values.html#org.trafodion.dcs.util.SqlUtils.SQLCHARSETCODE_UNICODE">常量字段值</a></dd></dl>
+</li>
+</ul>
+<a name="SQLCHARSET_UNICODE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SQLCHARSET_UNICODE</h4>
+<pre>public static final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a> SQLCHARSET_UNICODE</pre>
+<dl><dt><span class="strong">另请参阅:</span></dt><dd><a 
href="../../../../constant-values.html#org.trafodion.dcs.util.SqlUtils.SQLCHARSET_UNICODE">常量字段值</a></dd></dl>
+</li>
+</ul>
+<a name="SQLCHARSETCODE_SJIS">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SQLCHARSETCODE_SJIS</h4>
+<pre>public static final&nbsp;int SQLCHARSETCODE_SJIS</pre>
+<dl><dt><span class="strong">另请参阅:</span></dt><dd><a 
href="../../../../constant-values.html#org.trafodion.dcs.util.SqlUtils.SQLCHARSETCODE_SJIS">常量字段值</a></dd></dl>
+</li>
+</ul>
+<a name="SQLCHARSETCODE_UTF8">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SQLCHARSETCODE_UTF8</h4>
+<pre>public static final&nbsp;int SQLCHARSETCODE_UTF8</pre>
+<dl><dt><span class="strong">另请参阅:</span></dt><dd><a 
href="../../../../constant-values.html#org.trafodion.dcs.util.SqlUtils.SQLCHARSETCODE_UTF8">常量字段值</a></dd></dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="getCharsetName(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCharsetName</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getCharsetName(int&nbsp;charset)</pre>
+</li>
+</ul>
+<a name="getCharsetValue(java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCharsetValue</h4>
+<pre>public static&nbsp;int&nbsp;getCharsetValue(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;charset)</pre>
+</li>
+</ul>
+<a name="getComponentId(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getComponentId</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getComponentId(int&nbsp;componentId)</pre>
+</li>
+</ul>
+<a name="getSqlStmtType(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlStmtType</h4>
+<pre>public static&nbsp;int&nbsp;getSqlStmtType(int&nbsp;stmtType)</pre>
+</li>
+</ul>
+<a name="getSqlStmtType(java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlStmtType</h4>
+<pre>public static&nbsp;short&nbsp;getSqlStmtType(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;str)</pre>
+</li>
+</ul>
+<a name="getSqlCharsetName(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlCharsetName</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getSqlCharsetName(int&nbsp;code)</pre>
+</li>
+</ul>
+<a name="getSqlError(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlError</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getSqlError(int&nbsp;retcode)</pre>
+</li>
+</ul>
+<a name="getSqlStatementType(short)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlStatementType</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getSqlStatementType(short&nbsp;stmtType)</pre>
+</li>
+</ul>
+<a name="getSqlQueryStatementType(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlQueryStatementType</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getSqlQueryStatementType(int&nbsp;stmtType)</pre>
+</li>
+</ul>
+<a name="getSqlAttrType(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlAttrType</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getSqlAttrType(int&nbsp;code)</pre>
+</li>
+</ul>
+<a name="getSqlDataType(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSqlDataType</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getSqlDataType(int&nbsp;code)</pre>
+</li>
+</ul>
+<a name="getDataType(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDataType</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;getDataType(int&nbsp;dataType)</pre>
+</li>
+</ul>
+<a name="getBigDecimalValue(java.lang.Object)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getBigDecimalValue</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/math/BigDecimal.html?is-external=true";
 title="java.math中的类或接口">BigDecimal</a>&nbsp;getBigDecimalValue(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a>&nbsp;paramValue)
+                                     throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/sql/SQLException.html?is-external=true";
 title="java.sql中的类或接口">SQLException</a></pre>
+<dl><dt><span class="strong">抛出:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/sql/SQLException.html?is-external=true";
 title="java.sql中的类或接口">SQLException</a></code></dd></dl>
+</li>
+</ul>
+<a name="convertSQLBigNumToBigDecimal(java.nio.ByteBuffer, int, int, boolean)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convertSQLBigNumToBigDecimal</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/math/BigDecimal.html?is-external=true";
 
title="java.math中的类或接口">BigDecimal</a>&nbsp;convertSQLBigNumToBigDecimal(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;sourceData,
+                                      int&nbsp;len,
+                                      int&nbsp;scale,
+                                      boolean&nbsp;isUnSigned)</pre>
+</li>
+</ul>
+<a 
name="formatSqlT4Output(org.trafodion.dcs.servermt.serverDriverInputOutput.Descriptor2,
 byte[], long, byte[], java.nio.ByteOrder)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>formatSqlT4Output</h4>
+<pre>public static&nbsp;byte[]&nbsp;formatSqlT4Output(<a 
href="../../../../org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.html"
 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Descriptor2</a>&nbsp;dsc,
+                       byte[]&nbsp;sqlarray,
+                       long&nbsp;curOutPos,
+                       byte[]&nbsp;outValues,
+                       <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteOrder.html?is-external=true";
 title="java.nio中的类或接口">ByteOrder</a>&nbsp;bo)
+                                throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/UnsupportedEncodingException.html?is-external=true";
 title="java.io中的类或接口">UnsupportedEncodingException</a></pre>
+<dl><dt><span class="strong">抛出:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/UnsupportedEncodingException.html?is-external=true";
 
title="java.io中的类或接口">UnsupportedEncodingException</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/SqlUtils.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/util/RetryCounterFactory.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/Strings.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/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>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">字段</a>&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li><a href="#field_detail">字段</a>&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Strings.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Strings.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Strings.html
index d3ab787..71d49d4 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Strings.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/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">
@@ -183,6 +184,189 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/Strings.html#domainNamePointerToHostName(java.lang.String)">domainNamePointerToHostName</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;dnPtr)</code>
+=======
+<!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>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="Strings (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/Strings.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/util/SqlUtils.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/VersionInfo.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/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>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li><a href="#field_detail">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.util</div>
+<h2 title="ç±» Strings" class="title">ç±» Strings</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.util.Strings</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">Strings</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>
+<div class="block">Utility for Strings.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_summary">
+<!--   -->
+</a>
+<h3>字段概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="字段概要表, 列表字段和解释">
+<caption><span>字段</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">字段和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/util/Strings.html#DEFAULT_KEYVALUE_SEPARATOR">DEFAULT_KEYVALUE_SEPARATOR</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/util/Strings.html#DEFAULT_SEPARATOR">DEFAULT_SEPARATOR</a></strong></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/util/Strings.html#Strings()">Strings</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true";
 title="java.lang中的类或接口">StringBuilder</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/Strings.html#appendKeyValue(java.lang.StringBuilder,%20java.lang.String,%20java.lang.Object)">appendKeyValue</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true";
 title="java.lang中的类或接口">StringBuilder</a>&nbsp;sb,
+              <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;key,
+              <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a>&nbsp;value)</code>
+<div class="block">Append to a StringBuilder a key/value.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true";
 title="java.lang中的类或接口">StringBuilder</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/Strings.html#appendKeyValue(java.lang.StringBuilder,%20java.lang.String,%20java.lang.Object,%20java.lang.String,%20java.lang.String)">appendKeyValue</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true";
 title="java.lang中的类或接口">StringBuilder</a>&nbsp;sb,
+              <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;key,
+              <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a>&nbsp;value,
+              <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;separator,
+              <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;keyValueSeparator)</code>
+<div class="block">Append to a StringBuilder a key/value.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/util/Strings.html#domainNamePointerToHostName(java.lang.String)">domainNamePointerToHostName</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;dnPtr)</code>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Given a PTR string generated via reverse DNS lookup, return 
everything
  except the trailing period.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/VersionInfo.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/VersionInfo.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/VersionInfo.html
index 6cce75b..5074eb0 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/VersionInfo.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/VersionInfo.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">
@@ -103,6 +104,109 @@
 <br>
 <pre>public class <span class="strong">VersionInfo</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+=======
+<!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>VersionInfo (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="VersionInfo (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/VersionInfo.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/util/Strings.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li>下一个类</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/VersionInfo.html" 
target="_top">框架</a></li>
+<li><a href="VersionInfo.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.util</div>
+<h2 title="ç±» VersionInfo" class="title">ç±» VersionInfo</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.util.VersionInfo</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">VersionInfo</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>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">This class finds the package info for dcs and the 
VersionAnnotation
  information.  Taken from hadoop.  Only name of annotation is different.</div>
 </li>

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/Base64.Base64InputStream.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64InputStream.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64InputStream.html
index 211f9ea..717e560 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64InputStream.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64InputStream.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.Base64.Base64InputStream的使用 (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.Base64.Base64InputStream\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/Base64.Base64InputStream.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/Base64.Base64InputStream.html"
 target="_top">框架</a></li>
+<li><a href="Base64.Base64InputStream.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.Base64.Base64InputStream 的使用" 
class="title">ç±» 
org.trafodion.dcs.util.Base64.Base64InputStream<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.Base64.Base64InputStream的用法</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/Base64.Base64InputStream.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/Base64.Base64InputStream.html"
 target="_top">框架</a></li>
+<li><a href="Base64.Base64InputStream.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/Base64.Base64OutputStream.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64OutputStream.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64OutputStream.html
index 01a8e21..3666cbd 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64OutputStream.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.Base64OutputStream.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.Base64.Base64OutputStream的使用 
(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.Base64.Base64OutputStream\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/Base64.Base64OutputStream.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/Base64.Base64OutputStream.html"
 target="_top">框架</a></li>
+<li><a href="Base64.Base64OutputStream.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.Base64.Base64OutputStream 的使用" 
class="title">ç±» 
org.trafodion.dcs.util.Base64.Base64OutputStream<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.Base64.Base64OutputStream的用法</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/Base64.Base64OutputStream.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/Base64.Base64OutputStream.html"
 target="_top">框架</a></li>
+<li><a href="Base64.Base64OutputStream.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/Base64.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.html
index c131938..3d92c7c 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Base64.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.Base64的使用 (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.Base64\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/Base64.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/Base64.html" 
target="_top">框架</a></li>
+<li><a href="Base64.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.Base64 的使用" class="title">类 
org.trafodion.dcs.util.Base64<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.Base64的用法</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/Base64.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/Base64.html" 
target="_top">框架</a></li>
+<li><a href="Base64.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/ByteBufferUtils.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/ByteBufferUtils.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/ByteBufferUtils.html
index 4a4965a..3d15d68 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/ByteBufferUtils.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/ByteBufferUtils.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.ByteBufferUtils的使用 (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.ByteBufferUtils\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/ByteBufferUtils.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/ByteBufferUtils.html"
 target="_top">框架</a></li>
+<li><a href="ByteBufferUtils.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.ByteBufferUtils 的使用" 
class="title">类 org.trafodion.dcs.util.ByteBufferUtils<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.ByteBufferUtils的用法</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/ByteBufferUtils.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/ByteBufferUtils.html"
 target="_top">框架</a></li>
+<li><a href="ByteBufferUtils.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/Bytes.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Bytes.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Bytes.html
index 9fad8a2..3e94a78 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Bytes.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/Bytes.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.Bytes的使用 (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.Bytes\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/Bytes.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/Bytes.html" 
target="_top">框架</a></li>
+<li><a href="Bytes.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.Bytes 的使用" class="title">类 
org.trafodion.dcs.util.Bytes<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.Bytes的用法</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/Bytes.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/Bytes.html" 
target="_top">框架</a></li>
+<li><a href="Bytes.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/DcsConfTool.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfTool.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfTool.html
index 27a5024..37ca21d 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfTool.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfTool.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.DcsConfTool的使用 (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.DcsConfTool\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/DcsConfTool.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/DcsConfTool.html"
 target="_top">框架</a></li>
+<li><a href="DcsConfTool.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.DcsConfTool 的使用" class="title">类 
org.trafodion.dcs.util.DcsConfTool<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.DcsConfTool的用法</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/DcsConfTool.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/DcsConfTool.html"
 target="_top">框架</a></li>
+<li><a href="DcsConfTool.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/DcsConfiguration.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfiguration.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfiguration.html
index 02a401c..e42d42f 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfiguration.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/DcsConfiguration.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.DcsConfiguration的使用 (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.DcsConfiguration\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/DcsConfiguration.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/DcsConfiguration.html"
 target="_top">框架</a></li>
+<li><a href="DcsConfiguration.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.DcsConfiguration 的使用" 
class="title">类 org.trafodion.dcs.util.DcsConfiguration<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.DcsConfiguration的用法</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/DcsConfiguration.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/DcsConfiguration.html"
 target="_top">框架</a></li>
+<li><a href="DcsConfiguration.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

Reply via email to