You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/09/25 23:13:22 UTC

[09/13] incubator-trafodion git commit: Merge remote branch 'origin/master' into lob_work_files2

Merge remote branch 'origin/master' into lob_work_files2


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cff5dda8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cff5dda8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cff5dda8

Branch: refs/heads/master
Commit: cff5dda83faa8eaf03283cbaed1c532f4c6b1800
Parents: a718b1b a982a5c
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Sep 21 21:05:11 2015 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Sep 21 21:05:11 2015 +0000

----------------------------------------------------------------------
 core/conn/jdbc_type2/native/jdbcUtil.cpp        |   1 -
 .../src/main/java/JdbcMxLobAdmin.java           |   3 +-
 .../jdbc/t4/HPT4ConnectionPoolDataSource.java   |   2 +-
 .../src/org/trafodion/jdbc/t4/T4Driver.java     |   2 +-
 .../src/org/trafodion/jdbc/t4/T4Properties.java |   2 +-
 core/conn/jdbc_type4/test/RunAllTests.java      |  36 ++-
 .../test/org/trafodion/jdbc/t4/BaseTest.java    |  36 ++-
 .../org/trafodion/jdbc/t4/T4DriverTest.java     |  36 ++-
 .../odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC  |   4 +-
 core/dbsecurity/scripts/sqcertgen               |   7 +-
 core/rest/bin/rest                              |  33 ++-
 core/rest/bin/rest-config.sh                    |  33 ++-
 core/rest/bin/rest-daemon.sh                    |  33 ++-
 core/rest/bin/scripts/sys_shell.py              |  33 ++-
 core/rest/bin/start-rest.sh                     |  33 ++-
 core/rest/bin/stop-rest.sh                      |  33 ++-
 core/rest/conf/rest-env.sh                      |  33 ++-
 core/rest/conf/rest-site.xml                    |  33 ++-
 core/rest/pom.xml                               |  37 +--
 core/rest/src/assembly/all.xml                  |  36 ++-
 core/rest/src/main/asciidoc/_chapters/apis.adoc |  33 ++-
 .../appendix_contributing_to_documentation.adoc |  33 ++-
 .../main/asciidoc/_chapters/architecture.adoc   |  33 ++-
 .../main/asciidoc/_chapters/configuration.adoc  |  33 ++-
 .../asciidoc/_chapters/getting_started.adoc     |  33 ++-
 .../src/main/asciidoc/_chapters/preface.adoc    |  33 ++-
 .../asciidoc/_chapters/troubleshooting.adoc     |  33 ++-
 core/rest/src/main/asciidoc/index.adoc          |  59 ++--
 core/rest/src/main/asciidoc/rest.css            |  33 ++-
 .../main/java/org/trafodion/rest/Constants.java |  33 ++-
 .../org/trafodion/rest/GetStatusResponse.java   |  34 ++-
 .../java/org/trafodion/rest/RESTServlet.java    |  33 ++-
 .../org/trafodion/rest/RegisteredServer.java    |  33 ++-
 .../java/org/trafodion/rest/ResourceBase.java   |  34 ++-
 .../java/org/trafodion/rest/ResourceConfig.java |  34 ++-
 .../java/org/trafodion/rest/RestConstants.java  |  33 ++-
 .../java/org/trafodion/rest/RootResource.java   |  34 ++-
 .../java/org/trafodion/rest/RunningServer.java  |  33 ++-
 .../java/org/trafodion/rest/ServerResource.java |  59 ++--
 .../java/org/trafodion/rest/TrafodionRest.java  |  33 ++-
 .../trafodion/rest/TransactionsResource.java    |  42 +--
 .../org/trafodion/rest/VersionAnnotation.java   |  41 +--
 .../org/trafodion/rest/VersionResource.java     |  62 +++--
 .../java/org/trafodion/rest/client/Client.java  |  33 ++-
 .../java/org/trafodion/rest/client/Cluster.java |  33 ++-
 .../org/trafodion/rest/client/Response.java     |  33 ++-
 .../org/trafodion/rest/model/VersionModel.java  |  33 ++-
 .../rest/provider/JAXBContextResolver.java      |  61 ++--
 .../producer/PlainTextMessageBodyProducer.java  |  61 ++--
 .../trafodion/rest/script/ScriptContext.java    |  33 ++-
 .../trafodion/rest/script/ScriptManager.java    |  33 ++-
 .../rest/script/ScriptManagerWatcher.java       |  33 ++-
 .../java/org/trafodion/rest/util/Base64.java    |  33 ++-
 .../java/org/trafodion/rest/util/Bytes.java     |  33 ++-
 .../java/org/trafodion/rest/util/ConfTool.java  |  33 ++-
 .../trafodion/rest/util/GetJavaProperty.java    |  33 ++-
 .../org/trafodion/rest/util/JdbcT2Util.java     |  33 ++-
 .../org/trafodion/rest/util/JdbcT4Util.java     |  33 ++-
 .../rest/util/NetworkConfiguration.java         |  33 ++-
 .../trafodion/rest/util/RestConfiguration.java  |  33 ++-
 .../org/trafodion/rest/util/RetryCounter.java   |  33 ++-
 .../rest/util/RetryCounterFactory.java          |  33 ++-
 .../java/org/trafodion/rest/util/Strings.java   |  33 ++-
 .../org/trafodion/rest/util/VersionInfo.java    |  33 ++-
 .../org/trafodion/rest/version/util/VerGen.java |  33 ++-
 .../org/trafodion/rest/zookeeper/ZKConfig.java  |  33 ++-
 .../trafodion/rest/zookeeper/ZKServerTool.java  |  33 ++-
 .../org/trafodion/rest/zookeeper/ZkClient.java  |  33 ++-
 .../trafodion/rest/zookeeper/ZkQuorumPeer.java  |  33 ++-
 .../org/trafodion/rest/zookeeper/ZkUtil.java    |  33 ++-
 .../rest/zookeeper/ZooKeeperMainServerArg.java  |  33 ++-
 core/rest/src/main/resources/rest-default.xml   |  38 +--
 .../xslt/configuration_to_asciidoc_chapter.xsl  |  67 +++--
 core/rest/src/saveVersion.sh                    |  40 +--
 .../org/trafodion/rest/IntegrationTests.java    |  33 ++-
 .../java/org/trafodion/rest/LargeTests.java     |  33 ++-
 .../java/org/trafodion/rest/MediumTests.java    |  33 ++-
 .../org/trafodion/rest/ResourceChecker.java     |  33 ++-
 .../rest/ResourceCheckerJUnitRule.java          |  33 ++-
 .../java/org/trafodion/rest/SmallTests.java     |  33 ++-
 core/rest/src/test/resources/rest-default.xml   |  33 ++-
 core/sqf/sqenvcom.sh                            |   2 +-
 .../transactional/TrxRegionObserver.java        |  40 +--
 core/sqf/src/tm/tmddlrequests.cpp               |  36 ++-
 core/sql/bin/vprocmxlobsrvr.cpp                 |   4 +-
 core/sql/comexe/ComTdbHbaseAccess.cpp           |  12 +-
 core/sql/comexe/ComTdbHbaseAccess.h             |   6 +-
 core/sql/executor/ExHbaseAccess.cpp             |  10 +-
 core/sql/executor/ExHbaseAccess.h               |   6 +-
 core/sql/executor/ExHbaseIUD.cpp                |  14 +-
 core/sql/generator/GenPreCode.cpp               |  16 +-
 core/sql/generator/GenRelUpdate.cpp             |  16 +-
 core/sql/optimizer/BindRelExpr.cpp              |  64 +++--
 core/sql/optimizer/ImplRule.cpp                 |   3 +-
 core/sql/optimizer/Inlining.cpp                 |  57 ++--
 core/sql/optimizer/NormRelExpr.cpp              |  18 +-
 core/sql/optimizer/RelExpr.cpp                  |  37 ++-
 core/sql/optimizer/RelUpdate.h                  |  33 ++-
 core/sql/regress/executor/EXPECTED015.SB        | 275 +++++++++++++++++--
 core/sql/regress/executor/TEST015               |  36 ++-
 core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C |  16 --
 core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N |  15 -
 core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640  |  15 -
 core/sql/regress/newregr/mvs/BIG/TESTMV215C     |  15 -
 core/sql/regress/newregr/mvs/BIG/TESTMV640      |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215      |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215IR    |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215_DE   |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215_RU   |  15 -
 .../mvs/BIG/TestMV215_With_RefreshUtilty        |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215b     |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215e     |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215g     |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215h     |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215j     |  15 -
 core/sql/regress/newregr/mvs/BIG/TestMV215n     |  15 -
 core/sql/regress/newregr/mvs/BIG/Testmv215m     |  15 -
 core/sql/regress/newregr/mvs/BIG/expectedMV215e |  15 -
 core/sql/regress/newregr/mvs/BIG/expectedMV215g |  15 -
 core/sql/regress/newregr/mvs/BIG/expectedMV215h |  15 -
 core/sql/regress/newregr/mvs/BIG/expectedmv215  |  15 -
 .../sql/regress/newregr/mvs/BIG/expectedmv215IR |  15 -
 .../regress/newregr/mvs/BIG/expectedmv215_DE    |  15 -
 .../regress/newregr/mvs/BIG/expectedmv215_RU    |  15 -
 core/sql/regress/newregr/mvs/BIG/expectedmv215b |  15 -
 core/sql/regress/newregr/mvs/BIG/expectedmv215m |  15 -
 core/sql/regress/newregr/rowsets/teste001.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste005.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste011.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste015.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste021.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste025.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste041.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste045.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste051.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste055.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste061.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste065.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste071.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste075.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste081.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste085.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste091.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste101.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste105.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste111.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste121.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste135.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste140.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste141.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste145.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste201.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste205.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste211.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste215.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste221.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste225.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste232.sql   |   4 -
 core/sql/regress/newregr/rowsets/teste235.sql   |   4 -
 .../sql/regress/newregr/triggers/etest_14_1.sql |   4 -
 .../sql/regress/newregr/triggers/etest_14_2.sql |   4 -
 .../sql/regress/newregr/triggers/etest_14_3.sql |   4 -
 .../sql/regress/newregr/triggers/etest_14_4.sql |   4 -
 .../sql/regress/newregr/triggers/etest_14_5.sql |   4 -
 .../sql/regress/newregr/triggers/etest_14_6.sql |   4 -
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   2 +-
 core/sql/sqlcomp/DefaultConstants.h             |   1 +
 core/sql/sqlcomp/nadefaults.cpp                 |   3 +
 core/sql/sqludr/SqlUdrPredefLogReader.cpp       |  18 +-
 core/sql/ustat/hs_globals.cpp                   |   3 -
 core/sql/ustat/hs_parser.cpp                    |   1 -
 dcs/bin/dcs                                     |  33 ++-
 dcs/bin/dcs-config.sh                           |  33 ++-
 dcs/bin/dcs-daemon.sh                           |  33 ++-
 dcs/bin/dcs-daemons.sh                          |  33 ++-
 dcs/bin/local-servers.sh                        |  33 ++-
 dcs/bin/scripts/dcsbind.sh                      |  33 ++-
 dcs/bin/scripts/sys_shell.py                    |  35 ++-
 dcs/conf/dcs-env.sh                             |  53 ++--
 dcs/conf/dcs-site.xml                           |  63 ++---
 dcs/pom.xml                                     |  56 ++--
 dcs/src/assembly/all.xml                        |  21 +-
 .../appendix_contributing_to_documentation.adoc |   3 +-
 .../main/asciidoc/_chapters/architecture.adoc   |  32 ++-
 .../main/asciidoc/_chapters/configuration.adoc  |  34 +--
 .../main/asciidoc/_chapters/external_apis.adoc  |   3 +-
 dcs/src/main/asciidoc/_chapters/faq.adoc        |   3 +-
 .../asciidoc/_chapters/getting_started.adoc     |  34 +--
 dcs/src/main/asciidoc/_chapters/ops_mgt.adoc    |   3 +-
 .../main/asciidoc/_chapters/performance.adoc    |   3 +-
 dcs/src/main/asciidoc/_chapters/preface.adoc    |  32 ++-
 .../asciidoc/_chapters/troubleshooting.adoc     |   3 +-
 dcs/src/main/asciidoc/dcs.css                   |  33 ++-
 dcs/src/main/asciidoc/index.adoc                |  61 ++--
 .../dcs/tmpl/master/MasterStatusTmpl.jamon      |  50 ++--
 .../dcs/tmpl/server/ServerStatusTmpl.jamon      |  51 ++--
 .../dcs/tmpl/servermt/ServerStatusTmpl.jamon    |  51 ++--
 .../main/java/org/trafodion/dcs/Constants.java  |  53 ++--
 .../org/trafodion/dcs/VersionAnnotation.java    |  22 +-
 .../org/trafodion/dcs/http/FilterContainer.java |  33 ++-
 .../org/trafodion/dcs/http/HtmlQuoting.java     |  33 ++-
 .../java/org/trafodion/dcs/http/HttpServer.java |  33 ++-
 .../org/trafodion/dcs/master/DcsMaster.java     |  33 ++-
 .../org/trafodion/dcs/master/FloatingIp.java    |  33 ++-
 .../dcs/master/MasterLeaderElection.java        |  33 ++-
 .../dcs/master/MasterStatusServlet.java         |  33 ++-
 .../java/org/trafodion/dcs/master/Metrics.java  |  33 ++-
 .../trafodion/dcs/master/RegisteredServer.java  |  33 ++-
 .../org/trafodion/dcs/master/RunningServer.java |  33 ++-
 .../org/trafodion/dcs/master/ServerItem.java    |  33 ++-
 .../org/trafodion/dcs/master/ServerManager.java |  33 ++-
 .../dcs/master/listener/ClientData.java         |  33 ++-
 .../dcs/master/listener/ConnectReply.java       |  33 ++-
 .../dcs/master/listener/ConnectionContext.java  |  33 ++-
 .../dcs/master/listener/DataEvent.java          |  33 ++-
 .../dcs/master/listener/GetObjRefException.java |  33 ++-
 .../trafodion/dcs/master/listener/Header.java   |  33 ++-
 .../dcs/master/listener/ListenerConstants.java  |  33 ++-
 .../dcs/master/listener/ListenerMetrics.java    |  33 ++-
 .../dcs/master/listener/ListenerService.java    |  33 ++-
 .../dcs/master/listener/ListenerWorker.java     |  33 ++-
 .../dcs/master/listener/PendingRequest.java     |  33 ++-
 .../dcs/master/listener/RequestCancelQuery.java |  33 ++-
 .../master/listener/RequestGetObjectRef.java    |  33 ++-
 .../dcs/master/listener/RequestUnknown.java     |  33 ++-
 .../trafodion/dcs/master/listener/UserDesc.java |  33 ++-
 .../org/trafodion/dcs/master/listener/Util.java |  33 ++-
 .../trafodion/dcs/master/listener/Version.java  |  33 ++-
 .../dcs/master/listener/VersionList.java        |  33 ++-
 .../java/org/trafodion/dcs/rest/DcsRest.java    |  33 ++-
 .../trafodion/dcs/rest/GetStatusResponse.java   |  54 ++--
 .../org/trafodion/dcs/rest/RESTServlet.java     |  33 ++-
 .../org/trafodion/dcs/rest/ResourceBase.java    |  54 ++--
 .../org/trafodion/dcs/rest/ResourceConfig.java  |  54 ++--
 .../org/trafodion/dcs/rest/RestConstants.java   |  33 ++-
 .../org/trafodion/dcs/rest/RootResource.java    |  54 ++--
 .../org/trafodion/dcs/rest/ServerConnector.java |  33 ++-
 .../org/trafodion/dcs/rest/ServerResource.java  |  22 +-
 .../org/trafodion/dcs/rest/VersionResource.java |  25 +-
 .../trafodion/dcs/rest/WorkloadResource.java    |  22 +-
 .../org/trafodion/dcs/rest/client/Client.java   |  33 ++-
 .../org/trafodion/dcs/rest/client/Cluster.java  |  33 ++-
 .../org/trafodion/dcs/rest/client/Response.java |  33 ++-
 .../trafodion/dcs/rest/model/ServerModel.java   |  54 ++--
 .../trafodion/dcs/rest/model/VersionModel.java  |  33 ++-
 .../dcs/rest/model/WorkloadListModel.java       |  21 +-
 .../trafodion/dcs/rest/model/WorkloadModel.java |  21 +-
 .../dcs/rest/provider/JAXBContextResolver.java  |  24 +-
 .../producer/PlainTextMessageBodyProducer.java  |  24 +-
 .../org/trafodion/dcs/script/ScriptManager.java |  33 ++-
 .../dcs/script/ScriptManagerWatcher.java        |  33 ++-
 .../org/trafodion/dcs/server/DcsServer.java     |  33 ++-
 .../java/org/trafodion/dcs/server/Metrics.java  |  33 ++-
 .../dcs/server/ServerStatusServlet.java         |  33 ++-
 .../org/trafodion/dcs/servermt/DcsServer.java   |  33 ++-
 .../org/trafodion/dcs/servermt/Metrics.java     |  33 ++-
 .../trafodion/dcs/servermt/ServerConstants.java |  33 ++-
 .../trafodion/dcs/servermt/ServerManager.java   |  33 ++-
 .../dcs/servermt/ServerStatusServlet.java       |  33 ++-
 .../org/trafodion/dcs/servermt/ServerUtils.java |  33 ++-
 .../servermt/serverDriverInputOutput/Close.java |  33 ++-
 .../ConnectionContext.java                      |  33 ++-
 .../serverDriverInputOutput/Descriptor2.java    |  33 ++-
 .../Descriptor2List.java                        |  33 ++-
 .../serverDriverInputOutput/ErrorDesc.java      |  33 ++-
 .../serverDriverInputOutput/ErrorDescList.java  |  33 ++-
 .../serverDriverInputOutput/Header.java         |  33 ++-
 .../OutConnectionContext.java                   |  33 ++-
 .../serverDriverInputOutput/SQLDataValue.java   |  33 ++-
 .../serverDriverInputOutput/SQLValue.java       |  33 ++-
 .../serverDriverInputOutput/SQLValueList.java   |  33 ++-
 .../SQLWarningOrError.java                      |  33 ++-
 .../SQLWarningOrErrorList.java                  |  33 ++-
 .../ServerException.java                        |  33 ++-
 .../SetConnectionOption.java                    |  33 ++-
 .../serverDriverInputOutput/UserDesc.java       |  33 ++-
 .../serverDriverInputOutput/Version.java        |  33 ++-
 .../serverDriverInputOutput/VersionList.java    |  33 ++-
 .../dcs/servermt/serverHandler/ClientData.java  |  33 ++-
 .../dcs/servermt/serverHandler/DataEvent.java   |  33 ++-
 .../servermt/serverHandler/PendingRequest.java  |  33 ++-
 .../serverHandler/ServerApiGetCatalogs.java     |  33 ++-
 .../serverHandler/ServerApiSqlClose.java        |  33 ++-
 .../serverHandler/ServerApiSqlConnect.java      |  33 ++-
 .../serverHandler/ServerApiSqlDisconnect.java   |  33 ++-
 .../serverHandler/ServerApiSqlEndTransact.java  |  33 ++-
 .../serverHandler/ServerApiSqlExecDirect.java   |  33 ++-
 .../serverHandler/ServerApiSqlExecute.java      |  33 ++-
 .../serverHandler/ServerApiSqlFetch.java        |  33 ++-
 .../serverHandler/ServerApiSqlPrepare.java      |  33 ++-
 .../ServerApiSqlSetConnectAttr.java             |  33 ++-
 .../servermt/serverHandler/ServerHandler.java   |  33 ++-
 .../servermt/serverHandler/ServerWorker.java    |  33 ++-
 .../dcs/servermt/serverSql/TrafConnection.java  |  33 ++-
 .../dcs/servermt/serverSql/TrafStatement.java   |  33 ++-
 .../java/org/trafodion/dcs/util/Base64.java     |  14 -
 .../main/java/org/trafodion/dcs/util/Bytes.java |  14 -
 .../org/trafodion/dcs/util/DcsConfTool.java     |  14 -
 .../trafodion/dcs/util/DcsConfiguration.java    |  14 -
 .../org/trafodion/dcs/util/GetJavaProperty.java |  14 -
 .../java/org/trafodion/dcs/util/InfoServer.java |  14 -
 .../org/trafodion/dcs/util/RetryCounter.java    |  14 -
 .../trafodion/dcs/util/RetryCounterFactory.java |  14 -
 .../java/org/trafodion/dcs/util/Strings.java    |  14 -
 .../org/trafodion/dcs/util/VersionInfo.java     |  14 -
 .../org/trafodion/dcs/version/util/VerGen.java  |  33 ++-
 .../trafodion/dcs/zookeeper/DcsQuorumPeer.java  |  33 ++-
 .../org/trafodion/dcs/zookeeper/ZKConfig.java   |  33 ++-
 .../trafodion/dcs/zookeeper/ZKServerTool.java   |  33 ++-
 .../org/trafodion/dcs/zookeeper/ZkClient.java   |  33 ++-
 .../org/trafodion/dcs/zookeeper/ZkUtil.java     |  33 ++-
 .../dcs/zookeeper/ZooKeeperMainServerArg.java   |  33 ++-
 dcs/src/main/resources/dcs-default.xml          |  56 ++--
 .../dcs-webapps/master/aggr_querystats.html     |  33 ++-
 .../dcs-webapps/master/aggr_querystats.jsp      |  31 ++-
 .../dcs-webapps/master/css/Spacetree.css        |  33 ++-
 .../resources/dcs-webapps/master/css/base.css   |  33 ++-
 .../dcs-webapps/master/executeQuery.jsp         |  31 ++-
 .../resources/dcs-webapps/master/explain.html   |  33 ++-
 .../resources/dcs-webapps/master/index.html     |  14 -
 .../dcs-webapps/master/js/ExplainPlanView.js    |  33 ++-
 .../main/resources/dcs-webapps/master/logs.html |  33 ++-
 .../resources/dcs-webapps/master/master.jsp     |  14 -
 .../resources/dcs-webapps/master/queryPlan.jsp  |  31 ++-
 .../dcs-webapps/master/querystats.html          |  33 ++-
 .../resources/dcs-webapps/master/querystats.jsp |  35 +--
 .../resources/dcs-webapps/master/repository.jsp |  31 ++-
 .../resources/dcs-webapps/master/servers.jsp    |  30 +-
 .../resources/dcs-webapps/master/sessions.html  |  33 ++-
 .../resources/dcs-webapps/master/sessions.jsp   |  36 +--
 .../resources/dcs-webapps/server/index.html     |  14 -
 .../resources/dcs-webapps/server/server.jsp     |  14 -
 .../main/resources/dcs-webapps/static/dcs.css   |  14 -
 dcs/src/saveVersion.sh                          |  49 ++--
 .../trafodion/dcs/IntegrationTestEndurance.java |  33 ++-
 .../org/trafodion/dcs/IntegrationTests.java     |  33 ++-
 .../test/java/org/trafodion/dcs/LargeTests.java |  33 ++-
 .../java/org/trafodion/dcs/MediumTests.java     |  33 ++-
 .../org/trafodion/dcs/ReposPublicationTest.java |  33 ++-
 .../org/trafodion/dcs/ReposTableAccessTest.java |  33 ++-
 .../java/org/trafodion/dcs/ResourceChecker.java |  33 ++-
 .../trafodion/dcs/ResourceCheckerJUnitRule.java |  33 ++-
 .../test/java/org/trafodion/dcs/SmallTests.java |  33 ++-
 dcs/src/test/jdbc_test/README.rst               |  38 +--
 dcs/src/test/jdbc_test/jdbc_test.py             |  39 +--
 dcs/src/test/jdbc_test/pom.xml.template         |   4 -
 .../java/org/trafodion/jdbc_test/PropTest.java  |  53 ++--
 .../java/org/trafodion/jdbc_test/TestBasic.java |  77 ++++--
 .../java/org/trafodion/jdbc_test/TestBatch.java |  77 ++++--
 .../org/trafodion/jdbc_test/TestBigCol.java     |  79 ++++--
 .../trafodion/jdbc_test/TestBigColumnSize.java  |  53 ++--
 .../java/org/trafodion/jdbc_test/TestCat.java   |  53 ++--
 .../java/org/trafodion/jdbc_test/TestMisc.java  |  53 ++--
 .../java/org/trafodion/jdbc_test/TestTrx.java   |  77 ++++--
 .../java/org/trafodion/jdbc_test/Utils.java     |  53 ++--
 dcs/src/test/pytests/test-requirements.txt      |   2 +-
 dcs/src/test/pytests/test_p2.py                 |  35 ++-
 dcs/src/test/resources/dcs-default.xml          |  35 ++-
 install/installer/tools/cloudera_setup          |  18 +-
 pom.xml                                         |  35 ++-
 tests/phx/pom.xml.template                      |   4 -
 win-odbc64/Common/Compression.cpp               |  27 +-
 win-odbc64/Common/Compression.h                 |  33 ++-
 win-odbc64/Common/DrvrSrvr.h                    |  25 +-
 win-odbc64/Common/ExpConvMxcs.cpp               |  25 +-
 win-odbc64/Common/NLSFunctions.cpp              |  25 +-
 win-odbc64/Common/NLSFunctions.h                |  25 +-
 win-odbc64/Common/OdbcMsg.cpp                   |  25 +-
 win-odbc64/Common/OdbcMsg.h                     |  25 +-
 win-odbc64/Common/RegValues.h                   |  25 +-
 win-odbc64/Common/TCPIPSystemDrvr.cpp           |  33 ++-
 win-odbc64/Common/TCPIPSystemDrvr.h             |  25 +-
 win-odbc64/Common/TransportBase.cpp             |  25 +-
 win-odbc64/Common/TransportBase.h               |  25 +-
 win-odbc64/Common/inoutparams.h                 |  25 +-
 win-odbc64/Common/iputils.h                     |  25 +-
 win-odbc64/Common/marshaling.cpp                |  25 +-
 win-odbc64/Common/marshaling.h                  |  25 +-
 win-odbc64/Common/marshalingdrvr_drvr.cpp       |  25 +-
 win-odbc64/Common/marshalingdrvr_drvr.h         |  25 +-
 win-odbc64/Common/nskieee.cpp                   |  25 +-
 win-odbc64/Common/nskieee.h                     |  25 +-
 win-odbc64/Common/odbcMxSecurity.h              |  25 +-
 win-odbc64/Common/ping.cpp                      |  25 +-
 win-odbc64/Common/ping.h                        |  25 +-
 win-odbc64/Common/swap.cpp                      |  25 +-
 win-odbc64/Common/swap.h                        |  25 +-
 .../SetCertificateDirReg/SetCertDirDlg.cpp      |  25 +-
 .../SetCertificateDirReg/SetCertDirDlg.h        |  25 +-
 .../SetCertificateDirReg.cpp                    |  25 +-
 .../SetCertificateDirReg/SetCertificateDirReg.h |  25 +-
 .../SetCertificateDirReg/resource.h             |  25 +-
 .../SetCertificateDirReg/stdafx.cpp             |  25 +-
 .../SetCertificateDirReg/stdafx.h               |  25 +-
 .../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp   |  25 +-
 .../Install/UpdateDSN/UpdateDSN/stdafx.cpp      |  25 +-
 win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h |  25 +-
 win-odbc64/odbcclient/DSNConverter/DSList.cpp   |  25 +-
 win-odbc64/odbcclient/DSNConverter/DSList.h     |  25 +-
 .../odbcclient/DSNConverter/DSNConverter.cpp    |  25 +-
 .../odbcclient/DSNConverter/DSNConverter.def    |  33 ++-
 .../odbcclient/DSNConverter/DSNConverter.h      |  25 +-
 .../odbcclient/DSNConverter/ODBCMXAttribs.h     |  25 +-
 win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp   |  25 +-
 win-odbc64/odbcclient/DSNConverter/OdbcDS.h     |  25 +-
 win-odbc64/odbcclient/DSNConverter/StdAfx.cpp   |  25 +-
 win-odbc64/odbcclient/DSNConverter/StdAfx.h     |  25 +-
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp   |  25 +-
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def   |  33 ++-
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h     |  25 +-
 win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp      |  25 +-
 win-odbc64/odbcclient/Drvr35Res/StdAfx.h        |  25 +-
 win-odbc64/odbcclient/README.txt                |  33 ++-
 win-odbc64/odbcclient/TranslationDll/StdAfx.cpp |  25 +-
 win-odbc64/odbcclient/TranslationDll/StdAfx.h   |  25 +-
 .../TranslationDll/TranslationDll.cpp           |  25 +-
 .../TranslationDll/TranslationDll.def           |  33 ++-
 .../odbcclient/TranslationDll/TranslationDll.h  |  25 +-
 win-odbc64/odbcclient/build_os.bat              |  33 ++-
 .../odbcclient/drvr35/Interface/Transport.cpp   |  25 +-
 .../odbcclient/drvr35/Interface/Transport.h     |  25 +-
 .../odbcclient/drvr35/Interface/odbcas_drvr.cpp |  25 +-
 .../odbcclient/drvr35/Interface/odbcas_drvr.h   |  25 +-
 .../odbcclient/drvr35/Interface/odbcs_drvr.cpp  |  25 +-
 .../odbcclient/drvr35/Interface/odbcs_drvr.h    |  25 +-
 win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp |  25 +-
 win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h   |  25 +-
 .../odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp       |  25 +-
 .../odbcclient/drvr35/TCPIPV4/TCPIPV4.def       |  21 +-
 win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h  |  25 +-
 win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp |  25 +-
 win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h   |  25 +-
 .../odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp       |  25 +-
 .../odbcclient/drvr35/TCPIPV6/TCPIPV6.def       |  21 +-
 win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h  |  25 +-
 win-odbc64/odbcclient/drvr35/cconnect.cpp       |  33 ++-
 win-odbc64/odbcclient/drvr35/cconnect.h         |  25 +-
 win-odbc64/odbcclient/drvr35/cdatasource.cpp    |  33 ++-
 win-odbc64/odbcclient/drvr35/cdatasource.h      |  25 +-
 win-odbc64/odbcclient/drvr35/cdesc.cpp          |  25 +-
 win-odbc64/odbcclient/drvr35/cdesc.h            |  25 +-
 win-odbc64/odbcclient/drvr35/cdiag.cpp          |  25 +-
 win-odbc64/odbcclient/drvr35/cdiag.h            |  25 +-
 win-odbc64/odbcclient/drvr35/cenv.cpp           |  25 +-
 win-odbc64/odbcclient/drvr35/cenv.h             |  25 +-
 win-odbc64/odbcclient/drvr35/chandle.cpp        |  25 +-
 win-odbc64/odbcclient/drvr35/chandle.h          |  25 +-
 win-odbc64/odbcclient/drvr35/charsetconv.cpp    |  25 +-
 win-odbc64/odbcclient/drvr35/charsetconv.h      |  25 +-
 win-odbc64/odbcclient/drvr35/cstmt.h            |  25 +-
 win-odbc64/odbcclient/drvr35/ctosqlconv.cpp     |  25 +-
 win-odbc64/odbcclient/drvr35/ctosqlconv.h       |  25 +-
 win-odbc64/odbcclient/drvr35/diagfunctions.cpp  |  25 +-
 win-odbc64/odbcclient/drvr35/diagfunctions.h    |  25 +-
 win-odbc64/odbcclient/drvr35/drvr35.def         |  21 +-
 win-odbc64/odbcclient/drvr35/drvrglobal.cpp     |  25 +-
 win-odbc64/odbcclient/drvr35/drvrglobal.h       |  25 +-
 win-odbc64/odbcclient/drvr35/drvrnet.cpp        |  25 +-
 win-odbc64/odbcclient/drvr35/drvrnet.h          |  25 +-
 win-odbc64/odbcclient/drvr35/netcommon.cpp      |  25 +-
 win-odbc64/odbcclient/drvr35/netconnect.cpp     |  25 +-
 win-odbc64/odbcclient/drvr35/netstmt.cpp        |  25 +-
 win-odbc64/odbcclient/drvr35/sqlconnect.cpp     |  25 +-
 win-odbc64/odbcclient/drvr35/sqlconnect.h       |  25 +-
 win-odbc64/odbcclient/drvr35/sqldesc.cpp        |  25 +-
 win-odbc64/odbcclient/drvr35/sqldesc.h          |  25 +-
 win-odbc64/odbcclient/drvr35/sqlenv.cpp         |  25 +-
 win-odbc64/odbcclient/drvr35/sqlenv.h           |  25 +-
 win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp  |  25 +-
 win-odbc64/odbcclient/drvr35/sqlhandle.cpp      |  25 +-
 win-odbc64/odbcclient/drvr35/sqlhandle.h        |  25 +-
 win-odbc64/odbcclient/drvr35/sqlstmt.cpp        |  25 +-
 win-odbc64/odbcclient/drvr35/sqlstmt.h          |  25 +-
 win-odbc64/odbcclient/drvr35/sqltocconv.cpp     |  33 ++-
 win-odbc64/odbcclient/drvr35/sqltocconv.h       |  25 +-
 win-odbc64/odbcclient/drvr35/sqltrace.h         |  25 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp   |  25 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.def   |  21 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.h     |  25 +-
 win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp  |  25 +-
 win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h    |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagegeneral.h   |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagelocaltr.h   |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp |  33 ++-
 win-odbc64/odbcclient/drvr35adm/pagenetwork.h   |  25 +-
 win-odbc64/odbcclient/drvr35adm/pageoptions.cpp |  25 +-
 win-odbc64/odbcclient/drvr35adm/pageoptions.h   |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagetesting.h   |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagetracing.cpp |  25 +-
 win-odbc64/odbcclient/drvr35adm/pagetracing.h   |  25 +-
 win-odbc64/odbcclient/drvr35adm/propsheet.cpp   |  25 +-
 win-odbc64/odbcclient/drvr35adm/propsheet.h     |  25 +-
 win-odbc64/odbcclient/drvr35adm/stdafx.cpp      |  25 +-
 win-odbc64/odbcclient/drvr35adm/stdafx.h        |  25 +-
 .../odbcclient/drvr35adm/tabpagegeneral.cpp     |  25 +-
 .../odbcclient/drvr35adm/tabpagegeneral.h       |  25 +-
 .../odbcclient/drvr35adm/tabpagelocaltr.cpp     |  25 +-
 .../odbcclient/drvr35adm/tabpagelocaltr.h       |  25 +-
 .../odbcclient/drvr35adm/tabpagenetwork.cpp     |  33 ++-
 .../odbcclient/drvr35adm/tabpagenetwork.h       |  25 +-
 .../odbcclient/drvr35adm/tabpageoptions.cpp     |  25 +-
 .../odbcclient/drvr35adm/tabpageoptions.h       |  25 +-
 .../odbcclient/drvr35adm/tabpagetesting.cpp     |  25 +-
 .../odbcclient/drvr35adm/tabpagetesting.h       |  25 +-
 .../odbcclient/drvr35adm/tabpagetracing.cpp     |  25 +-
 .../odbcclient/drvr35adm/tabpagetracing.h       |  25 +-
 win-odbc64/odbcclient/drvr35adm/testdialog.cpp  |  25 +-
 win-odbc64/odbcclient/drvr35adm/testdialog.h    |  25 +-
 win-odbc64/odbcclient/inc/trafsqlext.h          |  25 +-
 win-odbc64/odbcclient/pkg.bat                   |  33 ++-
 .../security_dll/native/common/clientErrCode.h  |  25 +-
 .../security_dll/native/common/secdefsCommon.h  |  25 +-
 win-odbc64/security_dll/native/common/timeval.h |  25 +-
 win-odbc64/security_dll/native/common/utils.h   |  25 +-
 win-odbc64/security_dll/native/header/Cipher.h  |  25 +-
 win-odbc64/security_dll/native/header/Key.h     |  25 +-
 .../security_dll/native/header/MessageDigest.h  |  25 +-
 .../security_dll/native/header/StaticLocking.h  |  25 +-
 win-odbc64/security_dll/native/header/secpwd.h  |  25 +-
 .../security_dll/native/header/security.h       |  25 +-
 .../native/header/securityException.h           |  25 +-
 .../security_dll/native/source/Cipher.cpp       |  25 +-
 win-odbc64/security_dll/native/source/Key.cpp   |  25 +-
 .../native/source/MessageDigest.cpp             |  25 +-
 .../security_dll/native/source/Security.cpp     |  25 +-
 .../native/source/StaticLocking.cpp             |  25 +-
 .../native/source/securityException.cpp         |  25 +-
 win-odbc64/security_dll/native/source/utils.cpp |  25 +-
 .../security_dll/native/source/version.cpp      |  25 +-
 win-odbc64/sql/cli/sqlcli.h                     |  25 +-
 win-odbc64/sql/common/Platform.h                |  25 +-
 win-odbc64/sql/common/UCS_jp_data.c             |  25 +-
 win-odbc64/sql/common/UCS_ko_data.c             |  25 +-
 win-odbc64/sql/common/UCS_zb_data.c             |  25 +-
 win-odbc64/sql/common/UCS_zs_data.c             |  25 +-
 win-odbc64/sql/common/csconvert.cpp             |  25 +-
 win-odbc64/sql/common/csconvert.h               |  25 +-
 win-odbc64/sql/common/fcconv.h                  |  25 +-
 win-odbc64/sql/common/from_GB18030.c            |  25 +-
 win-odbc64/sql/common/from_GB2312.c             |  25 +-
 win-odbc64/sql/common/from_GBK.c                |  25 +-
 win-odbc64/sql/common/gb18030_data.c            |  25 +-
 win-odbc64/sql/common/iconv_gen.c               |  25 +-
 win-odbc64/sql/common/mb_iconv.c                |  25 +-
 win-odbc64/sql/common/mb_lconv.c                |  25 +-
 win-odbc64/sql/common/multi-byte.h              |  33 ++-
 wms/bin/local-servers.sh                        |  33 ++-
 wms/bin/scripts/sys_shell.py                    |  33 ++-
 wms/bin/servers.sh                              |  33 ++-
 wms/bin/start-wms.sh                            |  50 ++--
 wms/bin/stop-wms.sh                             |  50 ++--
 wms/bin/wms                                     |  49 ++--
 wms/bin/wms-config.sh                           |  50 ++--
 wms/bin/wms-daemon.sh                           |  50 ++--
 wms/bin/wms-daemons.sh                          |  50 ++--
 wms/bin/zookeepers.sh                           |  50 ++--
 wms/conf/wms-env.sh                             |  50 ++--
 wms/conf/wms-site.xml                           |  50 ++--
 wms/pom.xml                                     |  17 --
 wms/src/assembly/all.xml                        |  53 ++--
 .../wms/tmpl/master/MasterStatusTmpl.jamon      |  18 +-
 .../wms/tmpl/server/ServerStatusTmpl.jamon      |  18 +-
 .../main/java/org/trafodion/wms/Constants.java  |  52 ++--
 .../org/trafodion/wms/http/FilterContainer.java |  51 ++--
 .../org/trafodion/wms/http/HtmlQuoting.java     |  51 ++--
 .../java/org/trafodion/wms/http/HttpServer.java |  53 ++--
 .../wms/master/MasterStatusServlet.java         |  53 ++--
 .../java/org/trafodion/wms/master/Metrics.java  |  33 ++-
 .../org/trafodion/wms/master/ServerManager.java |  33 ++-
 .../org/trafodion/wms/master/WmsMaster.java     |  33 ++-
 .../org/trafodion/wms/script/ScriptContext.java |  33 ++-
 .../org/trafodion/wms/script/ScriptManager.java |  33 ++-
 .../wms/script/ScriptManagerWatcher.java        |  33 ++-
 .../java/org/trafodion/wms/server/Metrics.java  |  33 ++-
 .../wms/server/ServerStatusServlet.java         |  33 ++-
 .../java/org/trafodion/wms/util/InfoServer.java |  53 ++--
 .../org/trafodion/wms/util/VersionInfo.java     |  53 ++--
 .../trafodion/wms/util/WmsConfiguration.java    |  53 ++--
 .../org/trafodion/wms/version/util/VerGen.java  |  53 ++--
 .../trafodion/wms/zookeeper/WmsQuorumPeer.java  |  33 ++-
 .../org/trafodion/wms/zookeeper/ZKConfig.java   |  53 ++--
 .../trafodion/wms/zookeeper/ZKServerTool.java   |  53 ++--
 .../org/trafodion/wms/zookeeper/ZkClient.java   |  53 ++--
 .../wms/zookeeper/ZooKeeperMainServerArg.java   |  53 ++--
 wms/src/main/resources/wms-default.xml          |  54 ++--
 .../resources/wms-webapps/master/index.html     |  48 ++--
 .../resources/wms-webapps/master/master.jsp     |  48 ++--
 .../resources/wms-webapps/server/index.html     |  48 ++--
 .../resources/wms-webapps/server/server.jsp     |  48 ++--
 .../main/resources/wms-webapps/static/wms.css   |  48 ++--
 592 files changed, 9176 insertions(+), 7684 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cff5dda8/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cff5dda8/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------