http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/allclasses-noframe.html
b/docs/2.3.0/dcs_reference/apidocs/allclasses-noframe.html
index 6ff4f71..f52d14b 100644
--- a/docs/2.3.0/dcs_reference/apidocs/allclasses-noframe.html
+++ b/docs/2.3.0/dcs_reference/apidocs/allclasses-noframe.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,126 @@
</div>
</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>ææç±» (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>
+<h1 class="bar">ææç±»</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="org/trafodion/dcs/util/Base64.html"
title="org.trafodion.dcs.utilä¸çç±»">Base64</a></li>
+<li><a href="org/trafodion/dcs/util/Base64.Base64InputStream.html"
title="org.trafodion.dcs.utilä¸çç±»">Base64.Base64InputStream</a></li>
+<li><a href="org/trafodion/dcs/util/Base64.Base64OutputStream.html"
title="org.trafodion.dcs.utilä¸çç±»">Base64.Base64OutputStream</a></li>
+<li><a href="org/trafodion/dcs/util/ByteBufferUtils.html"
title="org.trafodion.dcs.utilä¸çç±»">ByteBufferUtils</a></li>
+<li><a href="org/trafodion/dcs/util/Bytes.html"
title="org.trafodion.dcs.utilä¸çç±»">Bytes</a></li>
+<li><a href="org/trafodion/dcs/master/listener/ClientData.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">ClientData</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverHandler/ClientData.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ClientData</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverDriverInputOutput/Close.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">Close</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">ConnectionContext</a></li>
+<li><a href="org/trafodion/dcs/Constants.html"
title="org.trafodion.dcsä¸çç±»">Constants</a></li>
+<li><a href="org/trafodion/dcs/util/DcsConfiguration.html"
title="org.trafodion.dcs.utilä¸çç±»">DcsConfiguration</a></li>
+<li><a href="org/trafodion/dcs/util/DcsConfTool.html"
title="org.trafodion.dcs.utilä¸çç±»">DcsConfTool</a></li>
+<li><a href="org/trafodion/dcs/master/DcsMaster.html"
title="org.trafodion.dcs.masterä¸çç±»">DcsMaster</a></li>
+<li><a href="org/trafodion/dcs/util/DcsNetworkConfiguration.html"
title="org.trafodion.dcs.utilä¸çç±»">DcsNetworkConfiguration</a></li>
+<li><a href="org/trafodion/dcs/zookeeper/DcsQuorumPeer.html"
title="org.trafodion.dcs.zookeeperä¸çç±»">DcsQuorumPeer</a></li>
+<li><a href="org/trafodion/dcs/server/DcsServer.html"
title="org.trafodion.dcs.serverä¸çç±»">DcsServer</a></li>
+<li><a href="org/trafodion/dcs/servermt/DcsServer.html"
title="org.trafodion.dcs.servermtä¸çç±»">DcsServer</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">Descriptor2</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">Descriptor2List</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">ErrorDesc</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">ErrorDescList</a></li>
+<li><a href="org/trafodion/dcs/http/FilterContainer.html"
title="org.trafodion.dcs.httpä¸çæ¥å£"><i>FilterContainer</i></a></li>
+<li><a href="org/trafodion/dcs/master/FloatingIp.html"
title="org.trafodion.dcs.masterä¸çç±»">FloatingIp</a></li>
+<li><a href="org/trafodion/dcs/util/GetJavaProperty.html"
title="org.trafodion.dcs.utilä¸çç±»">GetJavaProperty</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverDriverInputOutput/Header.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">Header</a></li>
+<li><a href="org/trafodion/dcs/http/HtmlQuoting.html"
title="org.trafodion.dcs.httpä¸çç±»">HtmlQuoting</a></li>
+<li><a href="org/trafodion/dcs/http/HttpServer.html"
title="org.trafodion.dcs.httpä¸çç±»">HttpServer</a></li>
+<li><a href="org/trafodion/dcs/http/HttpServer.DummyServletFilter.html"
title="org.trafodion.dcs.httpä¸çç±»">HttpServer.DummyServletFilter</a></li>
+<li><a
href="org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html"
title="org.trafodion.dcs.httpä¸çç±»">HttpServer.DummyServletFilter.RequestChecker</a></li>
+<li><a href="org/trafodion/dcs/http/HttpServer.QuotingInputFilter.html"
title="org.trafodion.dcs.httpä¸çç±»">HttpServer.QuotingInputFilter</a></li>
+<li><a
href="org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html"
title="org.trafodion.dcs.httpä¸çç±»">HttpServer.QuotingInputFilter.RequestQuoter</a></li>
+<li><a href="org/trafodion/dcs/http/HttpServer.StackServlet.html"
title="org.trafodion.dcs.httpä¸çç±»">HttpServer.StackServlet</a></li>
+<li><a href="org/trafodion/dcs/util/InfoServer.html"
title="org.trafodion.dcs.utilä¸çç±»">InfoServer</a></li>
+<li><a href="org/trafodion/dcs/util/JdbcT2Util.html"
title="org.trafodion.dcs.utilä¸çç±»">JdbcT2Util</a></li>
+<li><a href="org/trafodion/dcs/util/JdbcT4Util.html"
title="org.trafodion.dcs.utilä¸çç±»">JdbcT4Util</a></li>
+<li><a href="org/trafodion/dcs/master/listener/ListenerConstants.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">ListenerConstants</a></li>
+<li><a href="org/trafodion/dcs/master/listener/ListenerMetrics.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">ListenerMetrics</a></li>
+<li><a href="org/trafodion/dcs/master/listener/ListenerService.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">ListenerService</a></li>
+<li><a href="org/trafodion/dcs/master/listener/ListenerWorker.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">ListenerWorker</a></li>
+<li><a href="org/trafodion/dcs/util/Log4jUtils.html"
title="org.trafodion.dcs.utilä¸çç±»">Log4jUtils</a></li>
+<li><a href="org/trafodion/dcs/master/MasterLeaderElection.html"
title="org.trafodion.dcs.masterä¸çç±»">MasterLeaderElection</a></li>
+<li><a href="org/trafodion/dcs/master/MasterStatusServlet.html"
title="org.trafodion.dcs.masterä¸çç±»">MasterStatusServlet</a></li>
+<li><a href="org/trafodion/dcs/master/Metrics.html"
title="org.trafodion.dcs.masterä¸çç±»">Metrics</a></li>
+<li><a href="org/trafodion/dcs/server/Metrics.html"
title="org.trafodion.dcs.serverä¸çç±»">Metrics</a></li>
+<li><a href="org/trafodion/dcs/servermt/Metrics.html"
title="org.trafodion.dcs.servermtä¸çç±»">Metrics</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">OutConnectionContext</a></li>
+<li><a href="org/trafodion/dcs/master/QueryPlanModel.html"
title="org.trafodion.dcs.masterä¸çç±»">QueryPlanModel</a></li>
+<li><a href="org/trafodion/dcs/master/QueryPlanResponse.html"
title="org.trafodion.dcs.masterä¸çç±»">QueryPlanResponse</a></li>
+<li><a href="org/trafodion/dcs/master/RegisteredServer.html"
title="org.trafodion.dcs.masterä¸çç±»">RegisteredServer</a></li>
+<li><a href="org/trafodion/dcs/master/listener/RequestCancelQuery.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">RequestCancelQuery</a></li>
+<li><a href="org/trafodion/dcs/master/listener/RequestGetObjectRef.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">RequestGetObjectRef</a></li>
+<li><a href="org/trafodion/dcs/master/listener/RequestUnknown.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">RequestUnknown</a></li>
+<li><a href="org/trafodion/dcs/util/RetryCounter.html"
title="org.trafodion.dcs.utilä¸çç±»">RetryCounter</a></li>
+<li><a href="org/trafodion/dcs/util/RetryCounterFactory.html"
title="org.trafodion.dcs.utilä¸çç±»">RetryCounterFactory</a></li>
+<li><a href="org/trafodion/dcs/master/RunningServer.html"
title="org.trafodion.dcs.masterä¸çç±»">RunningServer</a></li>
+<li><a href="org/trafodion/dcs/script/ScriptContext.html"
title="org.trafodion.dcs.scriptä¸çç±»">ScriptContext</a></li>
+<li><a href="org/trafodion/dcs/script/ScriptManager.html"
title="org.trafodion.dcs.scriptä¸çç±»">ScriptManager</a></li>
+<li><a href="org/trafodion/dcs/script/ScriptManagerWatcher.html"
title="org.trafodion.dcs.scriptä¸çç±»">ScriptManagerWatcher</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiGetCatalogs</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlClose</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlConnect</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlDisconnect</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlEndTransact</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlExecDirect</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlExecute</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlFetch</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlPrepare</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerApiSqlSetConnectAttr</a></li>
+<li><a href="org/trafodion/dcs/servermt/ServerConstants.html"
title="org.trafodion.dcs.servermtä¸çç±»">ServerConstants</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">ServerException</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverHandler/ServerHandler.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerHandler</a></li>
+<li><a href="org/trafodion/dcs/master/ServerItem.html"
title="org.trafodion.dcs.masterä¸çç±»">ServerItem</a></li>
+<li><a href="org/trafodion/dcs/master/ServerManager.html"
title="org.trafodion.dcs.masterä¸çç±»">ServerManager</a></li>
+<li><a href="org/trafodion/dcs/server/ServerManager.html"
title="org.trafodion.dcs.serverä¸çç±»">ServerManager</a></li>
+<li><a href="org/trafodion/dcs/servermt/ServerManager.html"
title="org.trafodion.dcs.servermtä¸çç±»">ServerManager</a></li>
+<li><a href="org/trafodion/dcs/server/ServerStatusServlet.html"
title="org.trafodion.dcs.serverä¸çç±»">ServerStatusServlet</a></li>
+<li><a href="org/trafodion/dcs/servermt/ServerStatusServlet.html"
title="org.trafodion.dcs.servermtä¸çç±»">ServerStatusServlet</a></li>
+<li><a href="org/trafodion/dcs/servermt/ServerUtils.html"
title="org.trafodion.dcs.servermtä¸çç±»">ServerUtils</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverHandler/ServerWorker.html"
title="org.trafodion.dcs.servermt.serverHandlerä¸çç±»">ServerWorker</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">SetConnectionOption</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">SQLDataValue</a></li>
+<li><a href="org/trafodion/dcs/util/SqlUtils.html"
title="org.trafodion.dcs.utilä¸çç±»">SqlUtils</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">SQLValue</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">SQLValueList</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">SQLWarningOrError</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">SQLWarningOrErrorList</a></li>
+<li><a href="org/trafodion/dcs/util/Strings.html"
title="org.trafodion.dcs.utilä¸çç±»">Strings</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverSql/TrafConnection.html"
title="org.trafodion.dcs.servermt.serverSqlä¸çç±»">TrafConnection</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverSql/TrafResultSet.html"
title="org.trafodion.dcs.servermt.serverSqlä¸çç±»">TrafResultSet</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverSql/TrafStatement.html"
title="org.trafodion.dcs.servermt.serverSqlä¸çç±»">TrafStatement</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">UserDesc</a></li>
+<li><a href="org/trafodion/dcs/master/listener/Util.html"
title="org.trafodion.dcs.master.listenerä¸çç±»">Util</a></li>
+<li><a href="org/trafodion/dcs/version/util/VerGen.html"
title="org.trafodion.dcs.version.utilä¸çç±»">VerGen</a></li>
+<li><a href="org/trafodion/dcs/version/util/VerGen.Version.html"
title="org.trafodion.dcs.version.utilä¸çç±»">VerGen.Version</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverDriverInputOutput/Version.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">Version</a></li>
+<li><a href="org/trafodion/dcs/VersionAnnotation.html"
title="org.trafodion.dcsä¸ç注é">VersionAnnotation</a></li>
+<li><a href="org/trafodion/dcs/util/VersionInfo.html"
title="org.trafodion.dcs.utilä¸çç±»">VersionInfo</a></li>
+<li><a
href="org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html"
title="org.trafodion.dcs.servermt.serverDriverInputOutputä¸çç±»">VersionList</a></li>
+<li><a href="org/trafodion/dcs/zookeeper/ZkClient.html"
title="org.trafodion.dcs.zookeeperä¸çç±»">ZkClient</a></li>
+<li><a href="org/trafodion/dcs/zookeeper/ZKConfig.html"
title="org.trafodion.dcs.zookeeperä¸çç±»">ZKConfig</a></li>
+<li><a href="org/trafodion/dcs/zookeeper/ZKServerTool.html"
title="org.trafodion.dcs.zookeeperä¸çç±»">ZKServerTool</a></li>
+<li><a href="org/trafodion/dcs/zookeeper/ZkUtil.html"
title="org.trafodion.dcs.zookeeperä¸çç±»">ZkUtil</a></li>
+<li><a href="org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html"
title="org.trafodion.dcs.zookeeperä¸çç±»">ZooKeeperMainServerArg</a></li>
+</ul>
+</div>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*